aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/http_downloader.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/util/http_downloader.rs')
-rw-r--r--crates/shirabe/src/util/http_downloader.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs
index b1da08f..9279518 100644
--- a/crates/shirabe/src/util/http_downloader.rs
+++ b/crates/shirabe/src/util/http_downloader.rs
@@ -314,9 +314,7 @@ impl HttpDownloader {
r"{^https?://([^:/]+):([^@/]+)@([^/]+)}i",
&request.url,
Some(&mut m),
- )
- .unwrap_or(false)
- {
+ ) {
self.io.borrow_mut().set_authentication(
origin.clone(),
rawurldecode(
@@ -664,7 +662,11 @@ impl HttpDownloader {
) -> Result<()> {
let clean_message = |msg: &str| -> anyhow::Result<String> {
if !io.is_decorated() {
- return Preg::replace(&format!("{{{}{}}}u", chr(27), "\\[[;\\d]*m"), "", msg);
+ return Ok(Preg::replace(
+ &format!("{{{}{}}}u", chr(27), "\\[[;\\d]*m"),
+ "",
+ msg,
+ ));
}
Ok(msg.to_string())
@@ -804,7 +806,7 @@ impl HttpDownloader {
return false;
}
- if !Preg::is_match(r"{^https?://}i", &job.request.url).unwrap_or(false) {
+ if !Preg::is_match(r"{^https?://}i", &job.request.url) {
return false;
}