refactor(oma-fetch)!: move render download message progress to outside (#579)

Author: eatradish

oma-fetch/src/download.rs

@@ -39,7 +39,7 @@ pub enum BuilderError {
 pub(crate) struct SingleDownloader<'a> {
     client: &'a Client,
     pub entry: &'a DownloadEntry,
-    progress: (usize, usize),
+    total: usize,
     retry_times: usize,
     msg: Option<Cow<'static, str>>,
     download_list_index: usize,
@@ -98,7 +98,7 @@ impl<'a> SingleDownloader<'a> {
     pub(crate) fn new(
         client: &'a Client,
         entry: &'a DownloadEntry,
-        progress: (usize, usize),
+        total: usize,
         retry_times: usize,
         msg: Option<Cow<'static, str>>,
         download_list_index: usize,
@@ -114,7 +114,7 @@ impl<'a> SingleDownloader<'a> {
         Ok(Self {
             client,
             entry,
-            progress,
+            total,
             retry_times,
             msg,
             download_list_index,
@@ -296,10 +296,10 @@ impl<'a> SingleDownloader<'a> {
             }
         }
 
-        let msg = self.progress_msg();
         callback(Event::NewProgressSpinner {
             index: self.download_list_index,
-            msg: msg.clone(),
+            msg: self.download_message(),
+            total: self.total,
         })
         .await;
 
@@ -385,7 +385,8 @@ impl<'a> SingleDownloader<'a> {
 
         callback(Event::NewProgressBar {
             index: self.download_list_index,
-            msg,
+            msg: self.download_message(),
+            total: self.total,
             size: total_size,
         })
         .await;
@@ -566,14 +567,6 @@ impl<'a> SingleDownloader<'a> {
         req
     }
 
-    fn progress_msg(&self) -> String {
-        let (count, len) = &self.progress;
-        let msg = self.msg.as_deref().unwrap_or(&self.entry.filename);
-        let msg = format!("({count}/{len}) {msg}");
-
-        msg
-    }
-
     /// Download local source file
     async fn download_local(
         &self,
@@ -582,7 +575,6 @@ impl<'a> SingleDownloader<'a> {
         callback: &impl AsyncFn(Event),
     ) -> Result<bool, SingleDownloadError> {
         debug!("{:?}", self.entry);
-        let msg = self.progress_msg();
 
         let url = source.url.strip_prefix("file:").unwrap();
 
@@ -612,7 +604,8 @@ impl<'a> SingleDownloader<'a> {
 
         callback(Event::NewProgressBar {
             index: self.download_list_index,
-            msg,
+            total: self.total,
+            msg: self.download_message(),
             size: total_size,
         })
         .await;
@@ -699,6 +692,13 @@ impl<'a> SingleDownloader<'a> {
 
         Ok(())
     }
+
+    fn download_message(&self) -> String {
+        self.msg
+            .as_deref()
+            .unwrap_or(&self.entry.filename)
+            .to_string()
+    }
 }
 
 async fn checksum(

oma-fetch/src/lib.rs

@@ -156,10 +156,12 @@ pub enum Event {
     ProgressDone(usize),
     NewProgressSpinner {
         index: usize,
+        total: usize,
         msg: String,
     },
     NewProgressBar {
         index: usize,
+        total: usize,
         msg: String,
         size: u64,
     },
@@ -235,7 +237,7 @@ impl DownloadManager<'_> {
                 .maybe_msg(msg)
                 .download_list_index(i)
                 .entry(c)
-                .progress((i + 1, self.download_list.len()))
+                .total(self.download_list.len())
                 .retry_times(self.retry_times)
                 .file_type(c.file_type)
                 .timeout(self.timeout)

oma-refresh/src/sourceslist.rs

@@ -388,7 +388,8 @@ impl MirrorSource<'_> {
 
         callback(Event::DownloadEvent(oma_fetch::Event::NewProgressSpinner {
             index,
-            msg: format!("({index}/{total}) {msg}"),
+            total,
+            msg,
         }))
         .await;
 
@@ -497,12 +498,8 @@ impl MirrorSource<'_> {
 
         callback(Event::DownloadEvent(oma_fetch::Event::NewProgressBar {
             index,
-            msg: format!(
-                "({}/{}) {}",
-                index,
-                total,
-                self.get_human_download_message(Some(file_name)).unwrap(),
-            ),
+            total,
+            msg: self.get_human_download_message(Some(file_name)).unwrap(),
             size: total_size,
         }))
         .await;
@@ -556,7 +553,8 @@ impl MirrorSource<'_> {
 
         callback(Event::DownloadEvent(oma_fetch::Event::NewProgressSpinner {
             index,
-            msg: format!("({index}/{total}) {msg}"),
+            total,
+            msg,
         }))
         .await;
 

src/pb.rs

@@ -259,21 +259,26 @@ impl OmaMultiProgressBar {
                     pb.finish_and_clear();
                 }
             }
-            Event::NewProgressSpinner { index, msg } => {
+            Event::NewProgressSpinner { index, total, msg } => {
                 let (sty, inv) = spinner_style();
                 let pb = self
                     .mb
                     .insert(index + 1, ProgressBar::new_spinner().with_style(sty));
-                pb.set_message(msg);
+                pb.set_message(format!("({}/{total}) {msg}", index + 1));
                 pb.enable_steady_tick(inv);
                 self.pb_map.insert(index + 1, pb);
             }
-            Event::NewProgressBar { index, msg, size } => {
+            Event::NewProgressBar {
+                index,
+                total,
+                msg,
+                size,
+            } => {
                 let sty = progress_bar_style(&WRITER);
                 let pb = self
                     .mb
                     .insert(index + 1, ProgressBar::new(size).with_style(sty));
-                pb.set_message(msg);
+                pb.set_message(format!("({}/{total}) {msg}", index + 1));
                 self.pb_map.insert(index + 1, pb);
             }
             Event::ProgressInc { index, size } => {