3 files changed, 52 insertions, 97 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index fea3f34..e9a96b5 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,4 +1,6 @@
 
+use indicatif::MultiProgress;
+
 use crate::{config::Cfg, List};
 use crate::{
     db::userlist_get_all_current_versions_with_mods,
@@ -10,10 +12,12 @@ use crate::{
 };
 
 pub async fn download(config: &Cfg, liststack: Vec<List>, clean: bool, delete_old: bool) -> MLE<()> {
+
+    let mp = MultiProgress::new();
+
     for current_list in liststack {
         println!("Downloading current versions of mods in {}", current_list.id);
         let downloaded_versions = get_downloaded_versions(current_list.clone())?;
-        // println!("To download: {:#?}", downloaded_versions);
         let current_version_ids = match userlist_get_all_current_versions_with_mods(
             config,
             String::from(&current_list.id),
@@ -54,6 +58,8 @@ pub async fn download(config: &Cfg, liststack: Vec<List>, clean: bool, delete_ol
                 current_list.clone(),
                 config.clone(),
                 get_raw_versions(&config.apis.modrinth, to_download).await,
+                &mp,
+                None
             )
             .await?;
         } else {
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 31931f8..d369c4b 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,6 +1,6 @@
 use std::{io::Write, collections::HashMap};
 
-use indicatif::{ProgressBar, ProgressStyle};
+use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
 
 use crate::{
     config::Cfg,
@@ -11,16 +11,16 @@ use crate::{
     error::{ErrorType, MLError, MLE},
     files::{delete_version, download_versions},
     modrinth::{extract_current_version, get_raw_versions, project, projects, versions, Version},
-    List, PROGRESS_CHARS,
+    List, PROGRESS_CHARS, STYLE_BAR_POS, STYLE_SPINNER,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct AddMod {
     pub id: IDSelector,
     pub set_version: bool
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum IDSelector {
     ModificationID(String),
     VersionID(String),
@@ -43,12 +43,11 @@ pub async fn mod_add(
     list: List,
     direct_download: bool,
 ) -> MLE<()> {
-    let spinner_style = ProgressStyle::with_template("{spinner:.green}{msg}").unwrap();
-    let bar_style = ProgressStyle::with_template("{spinner:.green}{wide_msg}{pos}/{len} [{bar:.green/lime}]").unwrap().progress_chars(PROGRESS_CHARS);
 
-    // println!("Add mods to {}", list.id);
-    // println!("  └Add mods:");
+    //TODO MultiProgress
 
+    let spinner_style = ProgressStyle::with_template(STYLE_SPINNER).unwrap();
+    let bar_style = ProgressStyle::with_template(STYLE_BAR_POS).unwrap().progress_chars(PROGRESS_CHARS);
     let mut mod_ids: Vec<(String, bool)> = Vec::new();
     let mut ver_ids: Vec<(String, bool)> = Vec::new();
 
@@ -153,7 +152,8 @@ pub async fn mod_add(
 
     //Download all the added mods
     if direct_download {
-        download_versions(list.clone(), config.clone(), downloadstack).await?;
+        let mp = MultiProgress::new();
+        download_versions(list.clone(), config.clone(), downloadstack, &mp, None).await?;
     };
 
     Ok(())
diff --git a/src/commands/update.rs b/src/commands/update.rs
index 7482e43..bde6896 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -9,7 +9,7 @@ use crate::{
     error::{ErrorType, MLError, MLE},
     files::{clean_list_dir, delete_version, disable_version, download_versions},
     modrinth::{extract_current_version, versions, Version},
-    List, PROGRESS_CHARS,
+    List, PROGRESS_CHARS, STYLE_BAR_POS,
 };
 
 pub async fn update(
@@ -23,35 +23,32 @@ pub async fn update(
     let mp = MultiProgress::new();
 
     let update_p = mp.add(ProgressBar::new(liststack.len().try_into().unwrap()));
-    let bar_style = ProgressStyle::with_template("{spinner:.green}{wide_msg}{pos}/{len} [{bar:.green/lime}]").unwrap().progress_chars(PROGRESS_CHARS);
-    let spinner_style = ProgressStyle::with_template("{spinner:.green}{msg}").unwrap();
+    let bar_style = ProgressStyle::with_template(STYLE_BAR_POS).unwrap().progress_chars(PROGRESS_CHARS);
     update_p.set_style(bar_style.clone());
     update_p.set_message("Update");
 
     for current_list in liststack {
+        let list_p = mp.insert_before(&update_p, ProgressBar::new(2));
+        list_p.set_style(ProgressStyle::with_template(STYLE_BAR_POS).unwrap().progress_chars(PROGRESS_CHARS));
+        list_p.set_message(format!("Update {}", current_list.id));
 
-        // println!("Update mods in {}", current_list.id);
         let mods = userlist_get_all_ids(config, &current_list.id)?;
 
-        let list_p = mp.insert_before(&update_p, ProgressBar::new(mods.len().try_into().unwrap()));
-        list_p.set_style(bar_style.clone());
-        list_p.set_message(format!("Update {}", current_list.id));
+        let list_u_p = mp.insert_before(&list_p, ProgressBar::new(mods.len().try_into().unwrap()));
+        list_u_p.set_style(bar_style.clone());
+        list_u_p.set_message(format!("Update {}", current_list.id));
 
         let mut current_versions: Vec<(String, String)> = vec![];
 
         let mut updatestack: Vec<Version> = vec![];
 
         for id in mods {
-            let mod_p = mp.insert_before(&list_p, ProgressBar::new(1));
-            mod_p.set_style(spinner_style.clone());
-
             let info = mods_get_info(config, &id)?;
-            mod_p.set_message(format!("Update {}", info.title));
-            // println!("  ├{}", info.title);
-
+            list_u_p.set_message(format!("Update {}", info.title));
+            
+            //Skip check if version is set
             if userlist_get_set_version(config, &current_list.id, &id)? {
-                // println!("  │ └Set version, skipping update");
-                list_p.inc(1);
+                list_u_p.inc(1);
                 continue;
             }
 
@@ -59,15 +56,13 @@ pub async fn update(
             let disable_version =
                 userlist_get_current_version(config, &current_list.id, &id)?;
 
-            mod_p.inc(1);
-
             updatestack.push(
                 match specific_update(
                     config,
                     clean,
                     current_list.clone(),
                     &id,
-                    &mod_p
+                    &list_u_p
                 )
                 .await
                 {
@@ -77,44 +72,55 @@ pub async fn update(
                     }
                     Err(e) => {
                         if e.to_string() == "Mod: NO_UPDATE_AVAILABLE" {
-                            // println!(
-                                // "  │ └No new version found for the specified minecraft version"
-                            // );
                         } else {
                             return Err(e);
                         };
-                        list_p.inc(1);
+                        list_u_p.inc(1);
                         continue;
                     }
                 },
             );
-            list_p.inc(1);
+            list_u_p.inc(1);
         }
 
-        list_p.finish_with_message(format!("Updated {}", current_list.id));
+        list_u_p.finish_with_message(format!("Updated mods in {}", current_list.id));
+        list_p.inc(1);
 
         if clean {
-            update_p.set_message("Cleaning");
-            update_p.inc(1);
+            list_p.set_message("Cleaning");
             clean_list_dir(&current_list)?;
         };
 
         if direct_download && !updatestack.is_empty() {
-            download_versions(current_list.clone(), config.clone(), updatestack).await?;
+            download_versions(current_list.clone(), config.clone(), updatestack, &mp, Some(&list_p)).await?;
 
             //Disable old versions
             if !clean {
+                let d_p = mp.insert_before(&list_p, ProgressBar::new(current_versions.len().try_into().unwrap()));
+                d_p.set_style(bar_style.clone());
                 for ver in current_versions {
                     if delete_old {
-                        println!("    └Delete version {}", ver.0);
+                        d_p.set_message(format!("Delete version {}", ver.0));
+                        d_p.inc(1);
                         delete_version(current_list.clone(), ver.0)?;
                     } else if ver.0 != "NONE" {
-                        println!("    └Disable version {}", ver.0);
+                        d_p.set_message(format!("Disable version {}", ver.0));
+                        d_p.inc(1);
                         disable_version(config, current_list.clone(), ver.0, ver.1)?;
                     };
                 }
+
+                let del_msg = if delete_old {
+                    "Deleted all old versions"
+                } else {
+                    "Disabled all old versions"
+                };
+
+                d_p.finish_with_message(del_msg);
             }
         };
+        list_p.inc(1);
+        list_p.finish_with_message(format!("Updated {}", current_list.id));
         update_p.inc(1);
     }
 
@@ -149,13 +155,7 @@ async fn specific_update(config: &Cfg, clean: bool, list: List, id: &str, progre
     {
         let current_str = extract_current_version(applicable_versions.clone())?;
 
-        if clean {
-            // println!("\t  └Add version to downloadstack");
-        } else {
-            progress.println(format!("Found new version for {}", mods_get_info(config, id).unwrap().title));
-            // println!("\t  └Get versions for specified minecraft versions");
-            // println!("\t  └New current version: {}", current_str);
-        };
+        if !clean { progress.println(format!("Found new version for {}", mods_get_info(config, id).unwrap().title)); }
 
         //get new versions
         let current_ver = match applicable_versions
@@ -183,56 +183,5 @@ async fn specific_update(config: &Cfg, clean: bool, list: List, id: &str, progre
         return Err(MLError::new(ErrorType::ModError, "NO_UPDATE_AVAILABLE"));
     };
 
-    //println!(" └✔️");
     Ok(current[0].clone())
 }
-
-// #[tokio::test]
-// async fn download_updates_test() {
-//     use crate::{
-//         modrinth::{Hash, Version, VersionFile, VersionType},
-//         List, Modloader,
-//     };
-//
-//     let config = Cfg::init().unwrap();
-//     let current_list = List {
-//         id: String::from("..."),
-//         mc_version: String::from("..."),
-//         modloader: Modloader::Fabric,
-//         download_folder: String::from("./dev/tests/dl"),
-//     };
-//
-//     let versions = vec![Version {
-//             id: "dEqtGnT9".to_string(),
-//             project_id: "kYuIpRLv".to_string(),
-//             author_id: "Qnt13hO8".to_string(),
-//             featured: true,
-//             name: "1.2.2-1.19 - Fabric".to_string(),
-//             version_number: "1.2.2-1.19".to_string(),
-//             changelog: None,
-//             date_published: "2022-11-02T17:41:43.072267Z".to_string(),
-//             downloads: 58,
-//             version_type: VersionType::release,
-//             files: vec![VersionFile {
-//                     hashes: Hash {
-//                         sha1: "fdc6dc39427fc92cc1d7ad8b275b5b83325e712b".to_string(),
-//                         sha512: "5b372f00d6e5d6a5ef225c3897826b9f6a2be5506905f7f71b9e939779765b41be6f2a9b029cfc752ad0751d0d2d5f8bb4544408df1363eebdde15641e99a849".to_string()
-//                     },
-//                     url: "https://cdn.modrinth.com/data/kYuIpRLv/versions/dEqtGnT9/waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
-//                     filename: "waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
-//                     primary: true,
-//                     size: 323176
-//             }],
-//             game_versions: vec![
-//                 "1.19".to_string(),
-//                 "1.19.1".to_string(),
-//                 "1.19.2".to_string()
-//             ],
-//             loaders: vec![
-//                 "fabric".to_string()
-//             ]
-//         }];
-//     assert!(download_versions(current_list, config, versions)
-//         .await
-//         .is_ok())
-// }