dist: track progress during unpacking

Author: djc

src/dist/download.rs

@@ -7,7 +7,7 @@ use std::sync::Mutex;
 use std::time::{Duration, Instant};
 
 use anyhow::{Context, Result, anyhow};
-use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle};
+use indicatif::{MultiProgress, ProgressBar, ProgressBarIter, ProgressDrawTarget, ProgressStyle};
 use sha2::{Digest, Sha256};
 use tracing::{debug, info, warn};
 use url::Url;
@@ -390,6 +390,18 @@ impl DownloadStatus {
         );
     }
 
+    pub(crate) fn unpack<T: Read>(&self, inner: T) -> ProgressBarIter<T> {
+        self.progress.reset();
+        self.progress.set_style(
+            ProgressStyle::with_template(
+                "{msg:>12.bold}  unpacking [{bar:20}] {bytes}/{total_bytes} ({bytes_per_sec}, ETA: {eta})",
+            )
+            .unwrap()
+            .progress_chars("## ")
+        );
+        self.progress.wrap_read(inner)
+    }
+
     pub(crate) fn installing(&self) {
         self.progress.set_style(
             ProgressStyle::with_template(

src/dist/manifestation.rs

@@ -685,14 +685,12 @@ impl<'a> ComponentBinary<'a> {
         let short_pkg_name = self.component.short_name_in_manifest();
         let short_name = self.manifest.short_name(&self.component);
 
-        self.status.installing();
-
-        let reader = utils::buffered(&installer_file)?;
         let temp_dir = self.download_cfg.tmp_cx.new_directory()?;
         let io_executor = get_executor(
             unpack_ram(IO_CHUNK_SIZE, self.download_cfg.process.unpack_ram()?),
             self.download_cfg.process.io_thread_count()?,
         );
+        let reader = self.status.unpack(utils::buffered(&installer_file)?);
         let package =
             DirectoryPackage::compressed(reader, self.binary.compression, temp_dir, io_executor)?;
 
@@ -702,6 +700,7 @@ impl<'a> ComponentBinary<'a> {
             return Err(RustupError::CorruptComponent(short_name.to_owned()).into());
         }
 
+        self.status.installing();
         let tx = package.install(
             &manifestation.installation,
             &pkg_name,