dist: simplify DownloadStatus setup

Author: djc

src/dist/download.rs

@@ -23,7 +23,7 @@ const UPDATE_HASH_LEN: usize = 20;
 pub struct DownloadCfg<'a> {
     pub tmp_cx: &'a temp::Context,
     pub download_dir: &'a PathBuf,
-    pub(crate) tracker: DownloadTracker,
+    pub(super) tracker: DownloadTracker,
     pub process: &'a Process,
 }
 
@@ -184,6 +184,24 @@ impl<'a> DownloadCfg<'a> {
 
         Ok(Some((file, partial_hash)))
     }
+
+    pub(crate) fn status_for(&self, component: impl Into<Cow<'static, str>>) -> DownloadStatus {
+        let progress = ProgressBar::hidden();
+        progress.set_style(
+            ProgressStyle::with_template(
+                "{msg:>12.bold}  [{bar:40}] {bytes}/{total_bytes} ({bytes_per_sec}, ETA: {eta})",
+            )
+            .unwrap()
+            .progress_chars("## "),
+        );
+        progress.set_message(component);
+        self.tracker.multi_progress_bars.add(progress.clone());
+
+        DownloadStatus {
+            progress,
+            retry_time: Mutex::new(None),
+        }
+    }
 }
 
 /// Tracks download progress and displays information about it to a terminal.
@@ -208,13 +226,6 @@ impl DownloadTracker {
             multi_progress_bars,
         }
     }
-
-    /// Creates a new ProgressBar for the given component.
-    pub(crate) fn status_for(&self, component: impl Into<Cow<'static, str>>) -> DownloadStatus {
-        let status = DownloadStatus::new(component);
-        self.multi_progress_bars.add(status.progress.clone());
-        status
-    }
 }
 
 pub(crate) struct DownloadStatus {
@@ -223,23 +234,6 @@ pub(crate) struct DownloadStatus {
 }
 
 impl DownloadStatus {
-    fn new(component: impl Into<Cow<'static, str>>) -> Self {
-        let progress = ProgressBar::hidden();
-        progress.set_style(
-            ProgressStyle::with_template(
-                "{msg:>12.bold}  [{bar:40}] {bytes}/{total_bytes} ({bytes_per_sec}, ETA: {eta})",
-            )
-            .unwrap()
-            .progress_chars("## "),
-        );
-        progress.set_message(component);
-
-        Self {
-            progress,
-            retry_time: Mutex::new(None),
-        }
-    }
-
     pub(crate) fn received_length(&self, len: u64) {
         self.progress.reset();
         self.progress.set_length(len);

src/dist/manifestation.rs

@@ -164,9 +164,7 @@ impl Manifestation {
                 res.map(|(component, binary)| ComponentBinary {
                     component,
                     binary,
-                    status: download_cfg
-                        .tracker
-                        .status_for(component.short_name(new_manifest)),
+                    status: download_cfg.status_for(component.short_name(new_manifest)),
                 })
             })
             .collect::<Result<Vec<_>>>()?;
@@ -444,7 +442,7 @@ impl Manifestation {
             .unwrap()
             .replace(DEFAULT_DIST_SERVER, dl_cfg.tmp_cx.dist_server.as_str());
 
-        let status = dl_cfg.tracker.status_for("rust");
+        let status = dl_cfg.status_for("rust");
         let dl = dl_cfg
             .download_and_check(&url, update_hash, Some(&status), ".tar.gz")
             .await?;