fix: allow log&process bar mix

Author: discord9

Cargo.lock

@@ -23,6 +23,7 @@ env_logger = "0.11.5"
 flate2 = "1.0.35"
 guess_host_triple = "0.1.4"
 indicatif = "0.17.9"
+indicatif-log-bridge = "0.2.3"
 lazy_static = "1.0"
 log = "0.4.22"
 miette = { version = "7.3.0", features = ["fancy"] }

Cargo.toml

@@ -8,9 +8,11 @@ pub mod toolchain;
 pub mod logging {
     use env_logger::{Builder, Env, WriteStyle};
 
+    use crate::toolchain::PROCESS_BARS;
+
     /// Initializes the logger
     pub fn initialize_logger(log_level: &str) {
-        Builder::from_env(Env::default().default_filter_or(log_level))
+        let logger = Builder::from_env(Env::default().default_filter_or(log_level))
             .format(|buf, record| {
                 use std::io::Write;
                 writeln!(
@@ -21,7 +23,13 @@ pub mod logging {
                 )
             })
             .write_style(WriteStyle::Always)
-            .init();
+            .build();
+        let level = logger.filter();
+        // make logging and process bar no longer mixed up
+        indicatif_log_bridge::LogWrapper::new(PROCESS_BARS.clone(), logger)
+            .try_init()
+            .unwrap();
+        log::set_max_level(level);
     }
 }
 

src/lib.rs

@@ -151,16 +151,15 @@ pub async fn download_file(
             bytes.extend(&chunk);
         }
         bar.finish_with_message(format!("{} download complete", file_name));
-        if DOWNLOAD_CNT.load(atomic::Ordering::Relaxed) == 1 {
+        //  remove process bar on complete
+        PROCESS_BARS.remove(&bar);
+        if DOWNLOAD_CNT.fetch_sub(1, atomic::Ordering::Relaxed) == 1 {
             // clear all progress bars
             PROCESS_BARS.clear().unwrap();
             info!("All downloads complete");
         }
-        DOWNLOAD_CNT.fetch_sub(1, atomic::Ordering::Relaxed);
         // wait while DOWNLOAD_CNT is not zero
-        while DOWNLOAD_CNT.load(atomic::Ordering::Relaxed) != 0 {
-            tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
-        }
+
         bytes.freeze()
     };
     if uncompress {