fix(oma-fetch)!: local file path do not decode url two times (#364)

Author: eatradish

Cargo.lock

@@ -16,7 +16,6 @@ faster-hex = "0.10"
 sha2 = "0.10"
 futures = "0.3"
 async-compression = { version = "0.4", features = ["gzip", "xz", "futures-io", "bzip2", "zstd"] }
-oma-utils = { version = "^0.11", features = ["url-no-escape"] }
 tracing = "0.1"
 tokio-util = { version = "0.7", features = ["compat"] }
 md-5 = "0.10.6"

oma-fetch/Cargo.toml

@@ -11,7 +11,6 @@ use std::{
 use async_compression::futures::bufread::{BzDecoder, GzipDecoder, XzDecoder, ZstdDecoder};
 use bon::Builder;
 use futures::{AsyncRead, TryStreamExt, io::BufReader};
-use oma_utils::url_no_escape::url_no_escape;
 use reqwest::{
     Client, Method, RequestBuilder,
     header::{ACCEPT_RANGES, CONTENT_LENGTH, HeaderValue, RANGE},
@@ -219,33 +218,33 @@ impl SingleDownloader<'_> {
         F: Fn(Event) -> Fut,
         Fut: Future<Output = ()>,
     {
-        let file = self.entry.dir.join(&*self.entry.filename);
-        let file_exist = file.exists();
-        let mut file_size = file.metadata().ok().map(|x| x.len()).unwrap_or(0);
+        let path = self.entry.dir.join(&*self.entry.filename);
+        let file_exist = path.exists();
+        let mut file_size = path.metadata().ok().map(|x| x.len()).unwrap_or(0);
 
-        debug!("{} Exist file size is: {file_size}", file.display());
-        debug!("{} download url is: {}", file.display(), source.url);
+        debug!("{} Exist file size is: {file_size}", path.display());
+        debug!("{} download url is: {}", path.display(), source.url);
         let mut dest = None;
         let mut validator = None;
 
-        if file.is_symlink() {
-            tokio::fs::remove_file(&file).await.context(RemoveSnafu)?;
+        if path.is_symlink() {
+            tokio::fs::remove_file(&path).await.context(RemoveSnafu)?;
         }
 
         // 如果要下载的文件已经存在，则验证 Checksum 是否正确，若正确则添加总进度条的进度，并返回
         // 如果不存在，则继续往下走
-        if file_exist && !file.is_symlink() {
+        if file_exist && !path.is_symlink() {
             debug!("File: {} exists", self.entry.filename);
 
-            self.set_permission_with_path(&file).await?;
+            self.set_permission_with_path(&path).await?;
 
             if let Some(hash) = &self.entry.hash {
                 debug!("Hash exist! It is: {}", hash);
 
                 let mut f = tokio::fs::OpenOptions::new()
                     .write(true)
                     .read(true)
-                    .open(&file)
+                    .open(&path)
                     .await
                     .context(OpenAsWriteModeSnafu)?;
 
@@ -399,7 +398,7 @@ impl SingleDownloader<'_> {
                 self.entry.filename
             );
 
-            let f = match File::create(&file).await {
+            let f = match File::create(&path).await {
                 Ok(f) => f,
                 Err(e) => {
                     callback(Event::ProgressDone(self.download_list_index)).await;
@@ -429,7 +428,7 @@ impl SingleDownloader<'_> {
                 self.entry.filename
             );
 
-            let f = match File::create(&file).await {
+            let f = match File::create(&path).await {
                 Ok(f) => f,
                 Err(e) => {
                     callback(Event::ProgressDone(self.download_list_index)).await;
@@ -599,12 +598,7 @@ impl SingleDownloader<'_> {
         debug!("{:?}", self.entry);
         let msg = self.progress_msg();
 
-        let url = &source.url;
-
-        // 传入的参数不对，应该 panic
-        let url_path = url_no_escape(url.strip_prefix("file:").unwrap());
-
-        let url_path = Path::new(&url_path);
+        let url_path = Path::new(&source.url);
 
         let total_size = tokio::fs::metadata(url_path)
             .await

oma-fetch/src/download.rs

@@ -6,6 +6,7 @@ use oma_fetch::{
     checksum::Checksum, reqwest::Client,
 };
 use oma_pm_operation_type::InstallEntry;
+use oma_utils::url_no_escape::url_no_escape_times;
 use tracing::debug;
 
 use crate::apt::{DownloadConfig, OmaAptError, OmaAptResult};
@@ -48,20 +49,23 @@ where
         let sources = uris
             .iter()
             .map(|x| {
-                let source_type = if x.index_url.starts_with("file:") {
-                    DownloadSourceType::Local(!download_only)
+                let (source_type, url) = if let Some(url) = x.download_url.strip_prefix("file:") {
+                    (
+                        DownloadSourceType::Local(!download_only),
+                        url_no_escape_times(url, 1),
+                    )
                 } else {
                     let auth = auth.and_then(|auth| auth.find(&x.index_url));
 
-                    DownloadSourceType::Http {
-                        auth: auth.map(|x| (x.login.to_owned(), x.password.to_owned())),
-                    }
+                    (
+                        DownloadSourceType::Http {
+                            auth: auth.map(|x| (x.login.to_owned(), x.password.to_owned())),
+                        },
+                        x.index_url.to_string(),
+                    )
                 };
 
-                DownloadSource {
-                    url: x.download_url.clone(),
-                    source_type,
-                }
+                DownloadSource { url, source_type }
             })
             .collect::<Vec<_>>();
 

oma-pm/src/download.rs

@@ -17,3 +17,13 @@ pub fn url_no_escape(s: &str) -> String {
         c += 1;
     }
 }
+
+/// Get escape url for decode times
+pub fn url_no_escape_times(s: &str, times: usize) -> String {
+    let mut tmp = s.to_string();
+    for _ in 1..=times {
+        tmp = url_escape::decode(&tmp).to_string();
+    }
+
+    tmp
+}