fix: lint

src/utils/download_file.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use futures_util::StreamExt;
 use regex::Regex;
-use reqwest::{Client, Response, Url};
+use reqwest::{header::HeaderValue, Client, Response, Url};
 use std::{cmp::min, env, fs::File, io::Write, path::PathBuf};
 
 pub async fn download_file(url: &str, set_process_message: impl Fn(&str)) -> Result<PathBuf> {
@@ -45,54 +45,52 @@ pub async fn download_file(url: &str, set_process_message: impl Fn(&str)) -> Res
 
 fn get_file_name_from_response(response: &Response) -> Result<String> {
     let headers = response.headers();
+    let url = response.url().as_str();
+
     if let Some(content_disposition) = headers.get("content-disposition") {
-        let content_disposition = content_disposition
-            .to_str()
-            .map_err(|err| anyhow::anyhow!("Failed to convert content-disposition header to string. Error: {}", err))?;
-        if content_disposition == "attachment" {
-            get_last_segment_from_url(response.url().as_str())
-        } else {
-            let re = Regex::new(r"filename=([^;]+)").map_err(|err| anyhow::anyhow!("Failed to create regex. Error: {}", err))?;
-            let file_name = re
-                .captures(content_disposition)
-                .ok_or(anyhow::anyhow!("failed to match filename field from content-disposition header"))?
-                .get(1)
-                .ok_or(anyhow::anyhow!("failed to get filename field from content-disposition header"))?
-                .as_str().replace('"', "");
-            Ok(file_name)
-        }
-    } else if let Some(content_type) = headers.get("content-type") {
-        let content_type = content_type
-            .to_str()
-            .map_err(|err| anyhow::anyhow!("Failed to convert content-type header to string. Error: {}", err))?;
-        // for Windows exe file
-        if content_type == "application/x-msdownload" || content_type == "application/vnd.microsoft.portable-executable" {
-            get_last_segment_from_url(response.url().as_str())
-        } else {
-            get_last_segment_from_url(response.url().as_str())
-        }
-    }else {
-        get_last_segment_from_url(response.url().as_str())
+        get_file_name_by_content_disposition(content_disposition, url)
+    } else {
+        get_last_segment_from_url(url)
     }
 }
 
 fn get_last_segment_from_url(url: &str) -> Result<String> {
-    let url = Url::parse(url)
-        .map_err(|err| anyhow::anyhow!("Failed to parse url '{}'. Error: {}", url, err))?;
+    let url = Url::parse(url).map_err(|err| anyhow::anyhow!("Failed to parse url '{}'. Error: {}", url, err))?;
     Ok(url.path_segments().unwrap().last().unwrap().to_string())
 }
 
+fn get_file_name_by_content_disposition(content_disposition: &HeaderValue, url: &str) -> Result<String> {
+    let content_disposition = content_disposition
+        .to_str()
+        .map_err(|err| anyhow::anyhow!("Failed to convert content-disposition header to string. Error: {}", err))?;
+    if content_disposition == "attachment" {
+        get_last_segment_from_url(url)
+    } else {
+        let re =
+            Regex::new(r"filename=([^;]+)").map_err(|err| anyhow::anyhow!("Failed to create regex. Error: {}", err))?;
+        let file_name = re
+            .captures(content_disposition)
+            .ok_or(anyhow::anyhow!(
+                "failed to match filename field from content-disposition header"
+            ))?
+            .get(1)
+            .ok_or(anyhow::anyhow!(
+                "failed to get filename field from content-disposition header"
+            ))?
+            .as_str()
+            .replace('"', "");
+        Ok(file_name)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[tokio::test]
     async fn test_download_file() -> Result<()> {
         // Windows exe file
-        let download_result = download_file(
-            "https://releases.arc.net/windows/ArcInstaller.exe",
-            |_| {}
-        ).await?;
+        let download_result = download_file("https://releases.arc.net/windows/ArcInstaller.exe", |_| {}).await?;
         assert!(download_result.exists());
 
         Ok(())

src/utils/extract_zip.rs

@@ -10,9 +10,9 @@ pub fn extract_zip<T: AsRef<Path>>(zip_path: T, extract_path: &str) -> Result<()
 
 #[cfg(test)]
 mod tests {
-    use std::fs;
-    use crate::download_file;
     pub use super::*;
+    use crate::download_file;
+    use std::fs;
 
     #[cfg(target_os = "macos")]
     #[tokio::test]