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

Author: FranciscoTGouveia

src/cli/download_tracker.rs

@@ -77,6 +77,10 @@ impl DownloadTracker {
                 self.installing_component(component);
                 true
             }
+            Notification::Install(In::ComponentInstalled(component, _, _)) => {
+                self.component_installed(component);
+                true
+            }
             _ => false,
         }
     }
@@ -132,7 +136,6 @@ impl DownloadTracker {
             ProgressStyle::with_template("{msg:>12.bold}  downloaded {total_bytes} in {elapsed}")
                 .unwrap(),
         );
-        pb.finish();
     }
 
     /// Notifies self that the download has failed.
@@ -156,7 +159,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
@@ -168,7 +171,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("⠁⠂⠄⡀⢀⠠⠐⠈ "),
+            );
+            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,7 +271,7 @@ impl Manifestation {
                             match message {
                                 Ok((component, format, installer_file)) => {
                                     match self.install_component(
-                                        component,
+                                        component.clone(),
                                         format,
                                         installer_file,
                                         tmp_cx,
@@ -280,6 +280,13 @@ impl Manifestation {
                                         current_tx,
                                     ) {
                                         Ok(new_tx) => {
+                                            (download_cfg.notify_handler)(
+                                                Notification::ComponentInstalled(
+                                                    &component.short_name(new_manifest),
+                                                    &self.target_triple,
+                                                    Some(&self.target_triple),
+                                                ),
+                                            );
                                             current_tx = new_tx;
                                         }
                                         Err(e) => {

src/dist/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),
@@ -64,6 +65,7 @@ impl Notification<'_> {
             Extracting(_, _)
             | DownloadingComponent(_, _, _, _)
             | InstallingComponent(_, _, _)
+            | ComponentInstalled(_, _, _)
             | RemovingComponent(_, _, _)
             | RemovingOldComponent(_, _, _)
             | ComponentAlreadyInstalled(_)
@@ -122,6 +124,13 @@ impl Display for Notification<'_> {
                     write!(f, "installing component '{}' for '{}'", c, t.unwrap())
                 }
             }
+            ComponentInstalled(c, h, t) => {
+                if Some(h) == t.as_ref() || t.is_none() {
+                    write!(f, "installing component '{c}'")
+                } else {
+                    write!(f, "installing component '{}' for '{}'", c, t.unwrap())
+                }
+            }
             RemovingComponent(c, h, t) => {
                 if Some(h) == t.as_ref() || t.is_none() {
                     write!(f, "removing component '{c}'")