fix(downloads): correct faulty behavior when a download fails

Until now, the progress bars were not being correctly handled which
would make an error (i.e. "failed to download file X") pollute the
output.

Author: FranciscoTGouveia

src/cli/download_tracker.rs

@@ -55,11 +55,18 @@ impl DownloadTracker {
                 }
                 true
             }
+            Notification::Install(In::Utils(Un::DownloadFailed(url))) => {
+                self.download_failed(url);
+                false
+            }
             Notification::Install(In::DownloadingComponent(component, _, _, url)) => {
                 self.create_progress_bar(component.to_owned(), url.to_owned());
                 true
             }
-            Notification::Install(In::RetryingDownload(_url)) => true,
+            Notification::Install(In::RetryingDownload(url)) => {
+                self.retrying_download(url);
+                true
+            }
             _ => false,
         }
     }
@@ -105,4 +112,30 @@ impl DownloadTracker {
         );
         pb.finish();
     }
+
+    /// Notifies self that the download has failed.
+    pub(crate) fn download_failed(&mut self, url: &str) {
+        let Some(pb) = self.file_progress_bars.get(url) else {
+            return;
+        };
+        pb.set_style(
+            ProgressStyle::with_template("{msg:>12.bold}  download failed after {elapsed}")
+                .unwrap(),
+        );
+        pb.finish();
+    }
+
+    /// Notifies self that the download is being retried.
+    pub(crate) fn retrying_download(&mut self, url: &str) {
+        let Some(pb) = self.file_progress_bars.get(url) else {
+            return;
+        };
+        pb.set_style(
+            ProgressStyle::with_template(
+                "{msg:>12.bold}  [{bar:40}] {bytes}/{total_bytes} ({bytes_per_sec}, ETA: {eta})",
+            )
+            .unwrap()
+            .progress_chars("## "),
+        );
+    }
 }

src/download/mod.rs

@@ -219,9 +219,10 @@ async fn download_file_(
         .await;
 
     // The notification should only be sent if the download was successful (i.e. didn't timeout)
-    if res.is_ok() {
-        notify_handler(Notification::DownloadFinished(Some(url.as_str())));
-    }
+    notify_handler(match &res {
+        Ok(_) => Notification::DownloadFinished(Some(url.as_str())),
+        Err(_) => Notification::DownloadFailed(url.as_str()),
+    });
 
     res
 }
@@ -558,7 +559,6 @@ mod reqwest_be {
     #[cfg(feature = "reqwest-rustls-tls")]
     use rustls_platform_verifier::BuilderVerifierExt;
     use tokio_stream::StreamExt;
-    use tracing::error;
     use url::Url;
 
     use super::{DownloadError, Event};
@@ -576,7 +576,6 @@ mod reqwest_be {
 
         let res = request(url, resume_from, client)
             .await
-            .inspect_err(|error| error!(?error, "failed to download file"))
             .context("error downloading file")?;
 
         if !res.status().is_success() {

src/utils/notifications.rs

@@ -20,6 +20,8 @@ pub enum Notification<'a> {
     DownloadDataReceived(&'a [u8], Option<&'a str>),
     /// Download has finished.
     DownloadFinished(Option<&'a str>),
+    /// Download has failed.
+    DownloadFailed(&'a str),
     NoCanonicalPath(&'a Path),
     ResumingPartialDownload,
     /// This would make more sense as a crate::notifications::Notification
@@ -50,6 +52,7 @@ impl Notification<'_> {
             | DownloadContentLengthReceived(_, _)
             | DownloadDataReceived(_, _)
             | DownloadFinished(_)
+            | DownloadFailed(_)
             | ResumingPartialDownload
             | UsingCurl
             | UsingReqwest => NotificationLevel::Debug,
@@ -88,6 +91,7 @@ impl Display for Notification<'_> {
             DownloadContentLengthReceived(len, _) => write!(f, "download size is: '{len}'"),
             DownloadDataReceived(data, _) => write!(f, "received some data of size {}", data.len()),
             DownloadFinished(_) => write!(f, "download finished"),
+            DownloadFailed(_) => write!(f, "download failed"),
             NoCanonicalPath(path) => write!(f, "could not canonicalize path: '{}'", path.display()),
             ResumingPartialDownload => write!(f, "resuming partial download"),
             UsingCurl => write!(f, "downloading with curl"),