added multithreaded downloads and progressbar

4 files changed, 161 insertions, 61 deletions

diff --git a/Cargo.lock b/Cargo.lock
index c842b90..394a3e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -232,6 +232,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
+name = "console"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0525278dce688103060006713371cedbad27186c7d913f33d866b498da0f595"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
 name = "core-foundation"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -312,6 +325,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
 name = "encoding_rs"
 version = "0.8.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -654,6 +673,18 @@ dependencies = [
 ]
 
 [[package]]
+name = "indicatif"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic 0.3.20",
+ "unicode-width",
+]
+
+[[package]]
 name = "instant"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -806,6 +837,7 @@ dependencies = [
  "dirs",
  "error-chain",
  "futures-util",
+ "indicatif",
  "reqwest",
  "rusqlite",
  "serde",
@@ -862,6 +894,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
 name = "object"
 version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -968,6 +1006,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
 [[package]]
+name = "portable-atomic"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e"
+dependencies = [
+ "portable-atomic 1.3.2",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5"
+
+[[package]]
 name = "proc-macro2"
 version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 345f60d..a4b51bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,3 +18,4 @@ error-chain = "0.12.4"
 dirs = "5.0.0"
 clap = { version = "4.2.1", features = ["derive"] }
 clap_complete = "4.2.0"
+indicatif = "0.17.3"
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 9a1a651..d4c49d6 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -140,6 +140,8 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
 
     let mut ids = vec![];
 
+    println!("{:?}", mod_ids);
+
     for id in mod_ids {
         setmap.insert(id.0.to_string(), id.1);
         ids.push(id.0);
@@ -195,14 +197,16 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
                 available_versions_vec.push(ver.id);
             }
 
+            println!("{:?}", setmap);
+
             projectinfo.push(ProjectInfo {
                 mod_id: String::from(&project.id),
-                slug: project.slug,
+                slug: project.slug.clone(),
                 title: project.title,
                 current_version,
                 applicable_versions: available_versions_vec,
                 download_link: file,
-                set_version: setmap.get(&project.id).unwrap().clone(),
+                set_version: setmap.get(&project.slug).unwrap().clone(),
             })
         } else {
             println!("\t  └There's currently no mod version for your specified target");
diff --git a/src/files.rs b/src/files.rs
index a4c128e..a4a1d3b 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -1,9 +1,11 @@
 use futures_util::StreamExt;
+use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
 use reqwest::Client;
+use tokio::task::JoinSet;
 use std::{
     collections::HashMap,
     fs::{copy, read_dir, remove_file, rename, File},
-    io::Write,
+    io::Write, cmp::min,
 };
 
 use crate::{
@@ -15,83 +17,123 @@ use crate::{
     List,
 };
 
-pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>) -> MLE<String> {
-    let mut cached = get_cached_versions(&config.cache);
+pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>) -> MLE<()> {
+    let cached = get_cached_versions(&config.cache);
 
     // println!("{:#?}", cached);
 
-    let dl_path = String::from(&list.download_folder);
+    // println!("  └Download mods to {}", dl_path);
+    
+    let mp = MultiProgress::new();
 
-    println!("  └Download mods to {}", dl_path);
+    let mut js = JoinSet::new();
+    let style = ProgressStyle::with_template("{spinner:.green}{msg}\t[{bar:.green/lime}] {bytes}/{total_bytes}")
+        .unwrap()
+        .progress_chars("#>-");
 
     for ver in versions {
-        let project_info = mods_get_info(config.clone(), &ver.project_id)?;
-
-        //Check cache if already downloaded
-        let c = cached.remove(&ver.id);
-        if c.is_some() {
-            print!(
-                "\t└({})Get version {} from cache",
-                project_info.title, ver.id
-            );
-            //Force flush of stdout, else print! doesn't print instantly
-            std::io::stdout().flush()?;
-            copy_cached_version(&c.unwrap(), &dl_path);
-            println!(" ✓");
-        } else {
-            print!("\t└({})Download version {}", project_info.title, ver.id);
-            //Force flush of stdout, else print! doesn't print instantly
-            std::io::stdout().flush().unwrap();
-            let files = ver.files;
-            let file = match files.clone().into_iter().find(|f| f.primary) {
-                Some(f) => f,
-                None => files[0].clone()
-            };
-            let mut splitname: Vec<&str> = file.filename.split('.').collect();
-            let extension = match splitname.pop().ok_or("") {
-                Ok(e) => e,
-                Err(..) => return Err(MLError::new(ErrorType::Other, "NO_FILE_EXTENSION")),
-            };
-            let filename = format!(
-                "{}.mr.{}.{}.{}",
-                splitname.join("."),
-                ver.project_id,
-                ver.id,
-                extension
-            );
-            download_file(
-                file.url,
-                list.clone().download_folder,
-                filename.clone(),
-            )
-            .await?;
-            println!(" ✓");
-            //Copy file to cache
-            print!("\t  └Copy to cache");
-            //Force flush of stdout, else print! doesn't print instantly
-            std::io::stdout().flush().unwrap();
-            let dl_path_file = format!("{}/{}", list.download_folder, filename);
-            let cache_path = format!("{}/{}", &config.clone().cache, filename);
-            // println!("{}:{}", dl_path_file, cache_path);
-            copy(dl_path_file, cache_path)?;
-            println!(" ✓");
-        }
+        let p = mp.add(ProgressBar::new(1));
+        p.set_style(style.clone());
+        js.spawn(download_version(config.clone(), list.clone(), ver, cached.clone(), p));
+    }
+
+    mp.clear().unwrap();
+
+    while js.join_next().await.is_some() {}
+
+    Ok(())
+}
+
+async fn download_version(config: Cfg, list: List, version: Version, mut cached: HashMap<String, String>, progress: ProgressBar) -> MLE<()> {
+    let project_info = mods_get_info(config.clone(), &version.project_id)?;
+
+    let dl_path = String::from(&list.download_folder);
+
+    progress.set_message(String::from(&version.id));
+
+    //Check cache if already downloaded
+    let c = cached.remove(&version.id);
+    if c.is_some() {
+        print!(
+            "\t└({})Get version {} from cache",
+            project_info.title, version.id
+        );
+        //Force flush of stdout, else print! doesn't print instantly
+        std::io::stdout().flush()?;
+        copy_cached_version(&c.unwrap(), &dl_path);
+        println!(" ✓");
+    } else {
+        // print!("\t└({})Download version {}", project_info.title, version.id);
+        //Force flush of stdout, else print! doesn't print instantly
+        std::io::stdout().flush().unwrap();
+        let files = version.files;
+        let file = match files.clone().into_iter().find(|f| f.primary) {
+            Some(f) => f,
+            None => files[0].clone()
+        };
+        let mut splitname: Vec<&str> = file.filename.split('.').collect();
+        let extension = match splitname.pop().ok_or("") {
+            Ok(e) => e,
+            Err(..) => return Err(MLError::new(ErrorType::Other, "NO_FILE_EXTENSION")),
+        };
+        let filename = format!(
+            "{}.mr.{}.{}.{}",
+            splitname.join("."),
+            version.project_id,
+            version.id,
+            extension
+        );
+
+        download_file(
+            &file.url,
+            &list.download_folder,
+            &filename,
+            &progress
+        )
+        .await?;
+        // println!(" ✓");
+        //Copy file to cache
+        // print!("\t  └Copy to cache");
+        //Force flush of stdout, else print! doesn't print instantly
+        std::io::stdout().flush().unwrap();
+        let dl_path_file = format!("{}/{}", list.download_folder, filename);
+        let cache_path = format!("{}/{}", &config.clone().cache, filename);
+        // println!("{}:{}", dl_path_file, cache_path);
+        copy(dl_path_file, cache_path)?;
+        // println!(" ✓");
     }
 
-    Ok(dl_path)
+    progress.finish_with_message(format!("✓{}", version.id));
+
+    Ok(())
 }
 
-async fn download_file(url: String, path: String, name: String) -> MLE<()> {
+async fn download_file(url: &str, path: &str, name: &str, progress: &ProgressBar) -> MLE<()> {
     let dl_path_file = format!("{}/{}", path, name);
-    let res = Client::new().get(String::from(&url)).send().await?;
+    let res = Client::new().get(url).send().await?;
+
+    let size = res.content_length().expect("Couldn't get content length");
+
+    progress.set_length(size);
+    // progress.set_style(ProgressStyle::with_template("{spinner:.green}{msg}\t[{wide_bar:.green/lime}] {bytes}/{total_bytes}").unwrap().progress_chars("#>-"));
 
     // download chunks
     let mut file = File::create(&dl_path_file)?;
     let mut stream = res.bytes_stream();
 
+    let mut downloaded: u64 = 0;
+
     while let Some(item) = stream.next().await {
+        progress.inc(1);
         let chunk = item?;
         file.write_all(&chunk)?;
+        
+        // Progress bar
+        let new = min(downloaded + (chunk.len() as u64), size);
+        downloaded = new;
+        progress.set_position(new);
+
+        // std::thread::sleep(std::time::Duration::from_millis(100));
     }
 
     Ok(())