feat(installations): add a new notification for the progress bar to show a component was installed

Author: FranciscoTGouveia

src/cli/download_tracker.rs

@@ -68,10 +68,14 @@ impl DownloadTracker {
                 self.retrying_download(url);
                 true
             }
-            Notification::Install(In::InstallingComponent(component, _, _)) => {
+            Notification::InstallingComponent(component, _, _) => {
                 self.installing_component(component);
                 true
             }
+            Notification::ComponentInstalled(component, _, _) => {
+                self.component_installed(component);
+                true
+            }
             _ => false,
         }
     }
@@ -127,7 +131,6 @@ impl DownloadTracker {
             ProgressStyle::with_template("{msg:>12.bold}  downloaded {total_bytes} in {elapsed}")
                 .unwrap(),
         );
-        pb.finish();
     }
 
     /// Notifies self that the download has failed.
@@ -151,7 +154,7 @@ impl DownloadTracker {
         pb.set_style(ProgressStyle::with_template("{msg:>12.bold}  retrying download").unwrap());
     }
 
-    /// Notifies that the downloaded component is being installed.
+    /// Notifies self that the component is being installed.
     pub(crate) fn installing_component(&mut self, component: &str) {
         let key = self
             .file_progress_bars
@@ -163,7 +166,28 @@ impl DownloadTracker {
         {
             pb.set_style(
                 ProgressStyle::with_template(
-                    "{msg:>12.bold}  downloaded {total_bytes} in {elapsed} installing now...",
+                    "{msg:>12.bold}  downloaded {total_bytes} in {elapsed} installing now {spinner:.green}",
+                )
+                .unwrap()
+                .tick_chars(r"|/-\ "),
+            );
+            pb.enable_steady_tick(Duration::from_millis(100));
+        }
+    }
+
+    /// Notifies self that the component has been installed.
+    pub(crate) fn component_installed(&mut self, component: &str) {
+        let key = self
+            .file_progress_bars
+            .keys()
+            .find(|comp| comp.contains(component))
+            .cloned();
+        if let Some(key) = key
+            && let Some((pb, _)) = self.file_progress_bars.get(&key)
+        {
+            pb.set_style(
+                ProgressStyle::with_template(
+                    "{msg:>12.bold}  downloaded {total_bytes} and installed",
                 )
                 .unwrap(),
             );

src/dist/manifestation.rs

@@ -271,6 +271,7 @@ impl Manifestation {
                     && let Some(message) = download_rx.recv().await
                 {
                     let (component_bin, installer_file) = message?;
+                    let short_name = component_bin.component.short_name(new_manifest);
                     current_tx = self.install_component(
                         component_bin,
                         installer_file,
@@ -279,6 +280,11 @@ impl Manifestation {
                         new_manifest,
                         current_tx,
                     )?;
+                    (download_cfg.notify_handler)(Notification::ComponentInstalled(
+                        &short_name,
+                        &self.target_triple,
+                        Some(&self.target_triple),
+                    ));
                     counter += 1;
                 }
                 Ok::<_, Error>(current_tx)

src/notifications.rs

@@ -26,6 +26,7 @@ pub enum Notification<'a> {
     /// The URL of the download is passed as the last argument, to allow us to track concurrent downloads.
     DownloadingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>, &'a str),
     InstallingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
+    ComponentInstalled(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     RemovingComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     RemovingOldComponent(&'a str, &'a TargetTriple, Option<&'a TargetTriple>),
     DownloadingManifest(&'a str),
@@ -106,6 +107,7 @@ impl Notification<'_> {
             Extracting(_, _)
             | DownloadingComponent(_, _, _, _)
             | InstallingComponent(_, _, _)
+            | ComponentInstalled(_, _, _)
             | RemovingComponent(_, _, _)
             | RemovingOldComponent(_, _, _)
             | ComponentAlreadyInstalled(_)
@@ -201,6 +203,12 @@ impl Display for Notification<'_> {
                     write!(f, "installing component '{}' for '{}'", c, t.unwrap())
                 }
             }
+            ComponentInstalled(c, h, t) => {
+                match t {
+                    Some(t) if t != h => write!(f, "component '{c}' for '{t}' installed"),
+                    _ => write!(f, "component '{c}' installed"),
+                }
+            }
             RemovingComponent(c, h, t) => {
                 if Some(h) == t.as_ref() || t.is_none() {
                     write!(f, "removing component '{c}'")