added more progress

5 files changed, 109 insertions, 48 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index ebfb4eb..6831714 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,3 +1,4 @@
+
 use crate::{config::Cfg, List};
 use crate::{
     db::userlist_get_all_current_versions_with_mods,
@@ -9,7 +10,6 @@ use crate::{
 };
 
 pub async fn download(config: Cfg, liststack: Vec<List>, clean: bool, delete_old: bool) -> MLE<()> {
-
     for current_list in liststack {
         println!("Downloading current versions of mods in {}", current_list.id);
         let downloaded_versions = get_downloaded_versions(current_list.clone())?;
@@ -63,7 +63,7 @@ pub async fn download(config: Cfg, liststack: Vec<List>, clean: bool, delete_old
         if !to_disable.is_empty() {
             for ver in to_disable {
                 if delete_old {
-                    println!("Deleting version {} for mod {}", ver.1, ver.0);
+                    // println!("Deleting version {} for mod {}", ver.1, ver.0);
                     delete_version(current_list.clone(), ver.1)?;
                 } else {
                     disable_version(config.clone(), current_list.clone(), ver.1, ver.0)?;
diff --git a/src/commands/io.rs b/src/commands/io.rs
index dd294bc..2a26f1d 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -24,7 +24,7 @@ impl ExportVersion {
     fn from(config: Cfg, list_id: &str, mod_id: &str) -> MLE<Self> {
         Ok(Self {
             version: userlist_get_current_version(config.clone(), list_id, mod_id)?,
-            set: userlist_get_set_version(config.clone(), list_id, mod_id)?
+            set: userlist_get_set_version(config, list_id, mod_id)?
         })
     }
 }
diff --git a/src/commands/list.rs b/src/commands/list.rs
index 4aa4306..c07823b 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -32,7 +32,7 @@ pub fn list_add(
 }
 
 pub fn list_change(config: Cfg, id: String) -> MLE<()> {
-    if lists_get_all_ids(config.clone())?.into_iter().find(|l| l == &id).is_none() {
+    if !lists_get_all_ids(config.clone())?.into_iter().any(|l| l == id) {
         return Err(MLError::new(ErrorType::ArgumentError, "List not found"));
     };
     println!("Change default list to: {}", id);
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index d4c49d6..730583d 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,5 +1,7 @@
 use std::{io::Write, collections::HashMap};
 
+use indicatif::{ProgressBar, ProgressStyle};
+
 use crate::{
     config::Cfg,
     db::{
@@ -12,6 +14,8 @@ use crate::{
     List,
 };
 
+const PROGRESS_CHARS: &str = "#>-";
+
 #[derive(Debug, Clone)]
 pub struct AddMod {
     pub id: IDSelector,
@@ -41,28 +45,45 @@ pub async fn mod_add(
     list: List,
     direct_download: bool,
 ) -> MLE<()> {
-    println!("Add mods to {}", list.id);
-    println!("  └Add mods:");
+    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:");
 
     let mut mod_ids: Vec<(String, bool)> = Vec::new();
     let mut ver_ids: Vec<(String, bool)> = Vec::new();
 
+    let p = ProgressBar::new(mods.len().try_into().unwrap());
+    p.set_style(spinner_style.clone());
+    p.set_message("Sort ids");
+
     //"Sort" project ids from version ids to be able to handle them differently but in a batch
     for m in mods {
+        p.inc(1);
         match m.id {
             IDSelector::ModificationID(pid) => mod_ids.push((pid, m.set_version)),
             IDSelector::VersionID(vid) => ver_ids.push((vid, m.set_version)),
         }
     }
-
+    
+    p.finish_with_message("Sort ids done");
+    
+    let info_p = ProgressBar::new(2);
+    info_p.set_message("Get infos");
+    info_p.set_style(bar_style.clone());
     let mut projectinfo: Vec<ProjectInfo> = Vec::new();
     if !mod_ids.is_empty() {
-        projectinfo.append(&mut get_mod_infos(config.clone(), mod_ids, list.clone()).await?)
+        projectinfo.append(&mut get_mod_infos(config.clone(), mod_ids, list.clone()).await?);
+        info_p.inc(1);
     };
     if !ver_ids.is_empty() {
-        projectinfo.append(&mut get_ver_info(config.clone(), ver_ids).await?)
+        projectinfo.append(&mut get_ver_info(config.clone(), ver_ids).await?);
+        info_p.inc(1);
     };
 
+    info_p.finish_with_message("Get infos done");
+
     if projectinfo.is_empty() {
         return Err(MLError::new(ErrorType::ArgumentError, "NO_IDS?"));
     };
@@ -70,18 +91,19 @@ pub async fn mod_add(
     let mut downloadstack: Vec<Version> = Vec::new();
 
     //Adding each mod to the lists and downloadstack
-    if projectinfo.len() == 1 {
-        println!("  └Insert mod in list {} and save infos", list.id);
-    } else {
-        println!("  └Insert mods in list {} and save infos", list.id);
-    }
+    let add_p = ProgressBar::new(projectinfo.len().try_into().unwrap());
+    add_p.set_style(bar_style);
 
     for project in projectinfo {
+
+        add_p.set_message(format!("Add {}", project.title));
+
         let current_version_id = if project.current_version.is_none() {
             String::from("NONE")
         } else {
             project.current_version.clone().unwrap().id
         };
+
         match userlist_insert(
             config.clone(),
             &list.id,
@@ -124,8 +146,13 @@ pub async fn mod_add(
         if project.current_version.is_some() {
             downloadstack.push(project.current_version.unwrap())
         };
+
+        // add_p.println(format!("Added {}", project.title));
+        add_p.inc(1);
     }
 
+    add_p.finish_with_message("Added all mods");
+
     //Download all the added mods
     if direct_download {
         download_versions(list.clone(), config.clone(), downloadstack).await?;
@@ -140,7 +167,7 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
 
     let mut ids = vec![];
 
-    println!("{:?}", mod_ids);
+    // println!("{:?}", mod_ids);
 
     for id in mod_ids {
         setmap.insert(id.0.to_string(), id.1);
@@ -156,8 +183,8 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
         _ => panic!("PANIC"),
     };
     for project in m_projects {
-        println!("\t└{}", project.title);
-        println!("\t  └Get versions");
+        // println!("\t└{}", project.title);
+        // println!("\t  └Get versions");
         let available_versions = versions(
             &config.apis.modrinth,
             String::from(&project.id),
@@ -170,7 +197,7 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
         let file: String;
         if !available_versions.is_empty() {
             let current_id = extract_current_version(available_versions.clone())?;
-            println!("\t  └Current version: {}", current_id);
+            // println!("\t  └Current version: {}", current_id);
 
             current_version = Some(
                 available_versions
@@ -197,7 +224,7 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
                 available_versions_vec.push(ver.id);
             }
 
-            println!("{:?}", setmap);
+            // println!("{:?}", setmap);
 
             projectinfo.push(ProjectInfo {
                 mod_id: String::from(&project.id),
@@ -206,10 +233,10 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
                 current_version,
                 applicable_versions: available_versions_vec,
                 download_link: file,
-                set_version: setmap.get(&project.slug).unwrap().clone(),
+                set_version: *setmap.get(&project.slug).unwrap(),
             })
         } else {
-            println!("\t  └There's currently no mod version for your specified target");
+            // println!("\t  └There's currently no mod version for your specified target");
             current_version = None;
             file = String::from("NONE");
             available_versions_vec.push(String::from("NONE"));
@@ -220,7 +247,7 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
                 current_version,
                 applicable_versions: available_versions_vec,
                 download_link: file,
-                set_version: setmap.get(&project.id).unwrap().clone(),
+                set_version: *setmap.get(&project.id).unwrap(),
             })
         }
     }
@@ -252,7 +279,7 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<Proj
 
     for (i, project) in v_projects.into_iter().enumerate() {
         let version = &v_versions[i];
-        println!("\t└{}({})", project.title, version.id);
+        // println!("\t└{}({})", project.title, version.id);
         let file = version
             .clone()
             .files
@@ -267,7 +294,7 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<Proj
             current_version: Some(version.clone()),
             applicable_versions: vec![String::from(&version.id)],
             download_link: file,
-            set_version: setmap.get(&version.id).unwrap().clone(),
+            set_version: *setmap.get(&version.id).unwrap(),
         })
     }
     Ok(projectinfo)
@@ -282,7 +309,7 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<Proj
 pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
     let mod_id = mods_get_id(&config.data, id)?;
 
-    println!("Remove mod {} from {}", mods_get_info(config.clone(), &mod_id)?.title, list.id);
+    println!("Remove mod {} from {}", mods_get_info(&config, &mod_id)?.title, list.id);
     let version = userlist_get_current_version(config.clone(), &list.id, &mod_id)?;
 
     print!("  └Remove from list");
@@ -300,7 +327,6 @@ pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
             if err.to_string() !=  "User input not accepted: VERSION_NOT_FOUND_IN_FILES" {
                 return Err(err);
             };
-            ()
         },
     };
     println!(" ✓");
diff --git a/src/commands/update.rs b/src/commands/update.rs
index d3a282b..2de13f3 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -1,3 +1,5 @@
+use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
+
 use crate::{
     config::Cfg,
     db::{
@@ -10,6 +12,8 @@ use crate::{
     List,
 };
 
+const PROGRESS_CHARS: &str = "#>-";
+
 pub async fn update(
     config: Cfg,
     liststack: Vec<List>,
@@ -17,20 +21,39 @@ pub async fn update(
     direct_download: bool,
     delete_old: bool,
 ) -> MLE<()> {
+
+    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();
+    update_p.set_style(bar_style.clone());
+    update_p.set_message("Update");
+
     for current_list in liststack {
-        println!("Update mods in {}", current_list.id);
+
+        // println!("Update mods in {}", current_list.id);
         let mods = userlist_get_all_ids(config.clone(), &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 mut current_versions: Vec<(String, String)> = vec![];
 
         let mut updatestack: Vec<Version> = vec![];
 
         for id in mods {
-            let info = mods_get_info(config.clone(), &id)?;
-            println!("  ├{}", info.title);
+            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);
 
             if userlist_get_set_version(config.clone(), &current_list.id, &id)? {
-                println!("  │ └Set version, skipping update");
+                // println!("  │ └Set version, skipping update");
+                list_p.inc(1);
                 continue;
             }
 
@@ -38,12 +61,15 @@ pub async fn update(
             let disable_version =
                 userlist_get_current_version(config.clone(), &current_list.id, &id)?;
 
+            mod_p.inc(1);
+
             updatestack.push(
                 match specific_update(
                     config.clone(),
                     clean,
                     current_list.clone(),
                     String::from(&id),
+                    &mod_p
                 )
                 .await
                 {
@@ -53,19 +79,25 @@ pub async fn update(
                     }
                     Err(e) => {
                         if e.to_string() == "Mod: NO_UPDATE_AVAILABLE" {
-                            println!(
-                                "  │ └No new version found for the specified minecraft version"
-                            );
+                            // println!(
+                                // "  │ └No new version found for the specified minecraft version"
+                            // );
                         } else {
                             return Err(e);
                         };
+                        list_p.inc(1);
                         continue;
                     }
                 },
-            )
+            );
+            list_p.inc(1);
         }
 
+        list_p.finish_with_message(format!("Updated {}", current_list.id));
+
         if clean {
+            update_p.set_message("Cleaning");
+            update_p.inc(1);
             clean_list_dir(&current_list)?;
         };
 
@@ -85,12 +117,16 @@ pub async fn update(
                 }
             }
         };
+        update_p.inc(1);
     }
 
+    update_p.finish_with_message("Updated all lists");
+
+
     Ok(())
 }
 
-async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> MLE<Version> {
+async fn specific_update(config: Cfg, clean: bool, list: List, id: String, progress: &ProgressBar) -> MLE<Version> {
     let applicable_versions =
         versions(&config.apis.modrinth, String::from(&id), list.clone()).await;
 
@@ -116,10 +152,11 @@ async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> ML
         let current_str = extract_current_version(applicable_versions.clone())?;
 
         if clean {
-            println!("\t  └Add version to downloadstack");
+            // println!("\t  └Add version to downloadstack");
         } else {
-            println!("\t  └Get versions for specified minecraft versions");
-            println!("\t  └New current version: {}", current_str);
+            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);
         };
 
         //get new versions
@@ -133,16 +170,14 @@ async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> ML
         }?;
         current.push(current_ver.clone());
 
-        let link = match current_ver
-            .files
-            .into_iter()
-            .find(|f| f.primary)
-            .ok_or("!no primary in links")
-        {
-            Ok(p) => Ok(p),
-            Err(e) => Err(MLError::new(ErrorType::Other, e)),
-        }?
-        .url;
+        let files = &current_ver.files;
+
+        let link = match files.clone().into_iter().find(|f| f.primary) {
+                Some(f) => f,
+                None => { files[0].clone() }
+            }
+            .url;
+
         userlist_change_versions(config, list.id, current_str, versions.join("|"), link, id)?;
     }