Merge pull request 'multithreaded' (#6) from multithreaded into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/6

1 files changed, 125 insertions, 79 deletions

diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 9a1a651..4488b70 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,24 +1,30 @@
-use std::{io::Write, collections::HashMap};
+use std::collections::HashMap;
+
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 
 use crate::{
     config::Cfg,
     db::{
-        lists_get_all_ids, mods_get_id, mods_insert, mods_remove, userlist_get_all_ids,
-        userlist_get_current_version, userlist_insert, userlist_remove, mods_get_info,
+        lists_get_all_ids, mods_get_id, mods_get_info, mods_insert,
+        mods_remove, userlist_get_all_ids, userlist_get_current_version,
+        userlist_insert, userlist_remove,
     },
     error::{ErrorType, MLError, MLE},
     files::{delete_version, download_versions},
-    modrinth::{extract_current_version, get_raw_versions, project, projects, versions, Version},
-    List,
+    modrinth::{
+        extract_current_version, get_raw_versions, project, projects, versions,
+        Version,
+    },
+    List, PROGRESS_CHARS, STYLE_BAR_POS, STYLE_OPERATION,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct AddMod {
     pub id: IDSelector,
-    pub set_version: bool
+    pub set_version: bool,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum IDSelector {
     ModificationID(String),
     VersionID(String),
@@ -36,54 +42,76 @@ pub struct ProjectInfo {
 }
 
 pub async fn mod_add(
-    config: Cfg,
+    config: &Cfg,
     mods: Vec<AddMod>,
     list: List,
     direct_download: bool,
 ) -> MLE<()> {
-    println!("Add mods to {}", list.id);
-    println!("  └Add mods:");
+    let mp = MultiProgress::new();
 
     let mut mod_ids: Vec<(String, bool)> = Vec::new();
     let mut ver_ids: Vec<(String, bool)> = Vec::new();
 
+    let add_p = mp.add(ProgressBar::new(mods.len().try_into().unwrap()));
+    add_p.set_style(
+        ProgressStyle::with_template(STYLE_BAR_POS)
+            .unwrap()
+            .progress_chars(PROGRESS_CHARS),
+    );
+    add_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 {
+        add_p.inc(1);
         match m.id {
-            IDSelector::ModificationID(pid) => mod_ids.push((pid, m.set_version)),
+            IDSelector::ModificationID(pid) => {
+                mod_ids.push((pid, m.set_version))
+            }
             IDSelector::VersionID(vid) => ver_ids.push((vid, m.set_version)),
         }
     }
 
+    add_p.set_message("Get infos");
+
     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, mod_ids, list.clone()).await?);
     };
     if !ver_ids.is_empty() {
-        projectinfo.append(&mut get_ver_info(config.clone(), ver_ids).await?)
+        projectinfo.append(&mut get_ver_info(config, ver_ids).await?);
     };
 
     if projectinfo.is_empty() {
         return Err(MLError::new(ErrorType::ArgumentError, "NO_IDS?"));
     };
 
+    add_p.set_message("Add mods to database");
+
     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 project_p = mp.insert_before(
+        &add_p,
+        ProgressBar::new(projectinfo.len().try_into().unwrap()),
+    );
+    project_p.set_style(
+        ProgressStyle::with_template(STYLE_BAR_POS)
+            .unwrap()
+            .progress_chars(PROGRESS_CHARS),
+    );
 
     for project in projectinfo {
+        project_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(),
+            config,
             &list.id,
             &project.mod_id,
             &current_version_id,
@@ -92,7 +120,10 @@ pub async fn mod_add(
             project.set_version,
         ) {
             Err(e) => {
-                let expected_err = format!("SQL: UNIQUE constraint failed: {}.mod_id", list.id);
+                let expected_err = format!(
+                    "SQL: UNIQUE constraint failed: {}.mod_id",
+                    list.id
+                );
                 if e.to_string() == expected_err {
                     Err(MLError::new(
                         ErrorType::ModError,
@@ -106,7 +137,7 @@ pub async fn mod_add(
         }?;
 
         match mods_insert(
-            config.clone(),
+            config,
             &project.mod_id,
             &project.slug,
             &project.title,
@@ -124,18 +155,35 @@ pub async fn mod_add(
         if project.current_version.is_some() {
             downloadstack.push(project.current_version.unwrap())
         };
+
+        project_p.inc(1);
     }
 
+    project_p.finish_with_message("Added all mods to the database");
+
     //Download all the added mods
     if direct_download {
-        download_versions(list.clone(), config.clone(), downloadstack).await?;
+        add_p.set_message("Download mods");
+        download_versions(
+            list.clone(),
+            config.clone(),
+            downloadstack,
+            &mp,
+            &add_p,
+        )
+        .await?;
     };
 
+    add_p.finish_with_message("Added all mods");
+
     Ok(())
 }
 
-async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) -> MLE<Vec<ProjectInfo>> {
-
+async fn get_mod_infos(
+    config: &Cfg,
+    mod_ids: Vec<(String, bool)>,
+    list: List,
+) -> MLE<Vec<ProjectInfo>> {
     let mut setmap: HashMap<String, bool> = HashMap::new();
 
     let mut ids = vec![];
@@ -154,8 +202,6 @@ 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");
         let available_versions = versions(
             &config.apis.modrinth,
             String::from(&project.id),
@@ -167,8 +213,8 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
         let current_version: Option<Version>;
         let file: String;
         if !available_versions.is_empty() {
-            let current_id = extract_current_version(available_versions.clone())?;
-            println!("\t  └Current version: {}", current_id);
+            let current_id =
+                extract_current_version(available_versions.clone())?;
 
             current_version = Some(
                 available_versions
@@ -177,19 +223,15 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
                     .find(|v| v.id == current_id)
                     .unwrap(),
             );
-            
+
             // match primary, if none?
-            let files = current_version
-                .clone()
-                .ok_or("")
-                .unwrap()
-                .files;
+            let files = current_version.clone().ok_or("").unwrap().files;
 
             file = match files.clone().into_iter().find(|f| f.primary) {
-                    Some(f) => f,
-                    None => { files[0].clone() }
-                }
-                .url;
+                Some(f) => f,
+                None => files[0].clone(),
+            }
+            .url;
 
             for ver in available_versions {
                 available_versions_vec.push(ver.id);
@@ -197,15 +239,14 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
 
             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(),
             })
         } else {
-            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"));
@@ -216,7 +257,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(),
             })
         }
     }
@@ -224,8 +265,10 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<(String, bool)>, list: List) ->
     Ok(projectinfo)
 }
 
-async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<ProjectInfo>> {
-
+async fn get_ver_info(
+    config: &Cfg,
+    ver_ids: Vec<(String, bool)>,
+) -> MLE<Vec<ProjectInfo>> {
     let mut setmap: HashMap<String, bool> = HashMap::new();
 
     let mut ids = vec![];
@@ -248,14 +291,15 @@ 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);
-        let file = version
-            .clone()
-            .files
-            .into_iter()
-            .find(|f| f.primary)
-            .unwrap()
-            .url;
+
+        let files = version.clone().files;
+
+        let file = match files.clone().into_iter().find(|f| f.primary) {
+            Some(f) => f,
+            None => files[0].clone(),
+        }
+        .url;
+
         projectinfo.push(ProjectInfo {
             mod_id: String::from(&project.id),
             slug: project.slug,
@@ -263,7 +307,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)
@@ -275,48 +319,45 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<(String, bool)>) -> MLE<Vec<Proj
 /// * `config` - config struct
 /// * `id` - name, slug or id of the mod
 /// * `list` - List struct
-pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
+pub fn mod_remove(config: &Cfg, id: &str, list: &List) -> MLE<()> {
+    let progress = ProgressBar::new_spinner();
+    progress.set_style(ProgressStyle::with_template(STYLE_OPERATION).unwrap());
+
     let mod_id = mods_get_id(&config.data, id)?;
 
-    println!("Remove mod {} from {}", mods_get_info(config.clone(), &mod_id)?.title, list.id);
-    let version = userlist_get_current_version(config.clone(), &list.id, &mod_id)?;
+    let info = mods_get_info(config, &mod_id)?;
 
-    print!("  └Remove from list");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
-    userlist_remove(config.clone(), &list.id, &mod_id)?;
-    println!(" ✓");
+    progress.set_message(format!("Remove {} from {}", info.title, list.id));
 
-    print!("  └Delete file");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
+    let version = userlist_get_current_version(config, &list.id, &mod_id)?;
+
+    userlist_remove(config, &list.id, &mod_id)?;
+
+    progress.set_message("Delete file");
     match delete_version(list, version) {
         Ok(_) => (),
         Err(err) => {
-            if err.to_string() !=  "User input not accepted: VERSION_NOT_FOUND_IN_FILES" {
+            if err.to_string()
+                != "User input not accepted: VERSION_NOT_FOUND_IN_FILES"
+            {
                 return Err(err);
             };
-            ()
-        },
+        }
     };
-    println!(" ✓");
 
-    print!("  └Clean main db table");
-    //Force flush of stdout, else print! doesn't print instantly
-    std::io::stdout().flush()?;
-    let list_ids = lists_get_all_ids(config.clone())?;
+    progress.set_message("Check main list");
+    let list_ids = lists_get_all_ids(config)?;
 
     // Remove mod from main list if not used elsewhere
     let mut mod_used = false;
     for id in list_ids {
-        let mods = match userlist_get_all_ids(config.clone(), &id) {
+        let mods = match userlist_get_all_ids(config, &id) {
             Ok(m) => m,
             Err(err) => {
-                if err.to_string() ==  "Database: NO_MODS_USERLIST" {
-                    println!(" ✓");
+                if err.to_string() == "Database: NO_MODS_USERLIST" {
                     return Ok(());
                 };
-                return Err(err)
+                return Err(err);
             }
         };
         if mods.contains(&mod_id) {
@@ -326,9 +367,14 @@ pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
     }
 
     if !mod_used {
-        mods_remove(config, mod_id)?;
+        progress.set_message("Remove from main list");
+        mods_remove(config, &mod_id)?;
     };
-    println!(" ✓");
+
+    progress.finish_with_message(format!(
+        "Removed {} from {}",
+        info.title, list.id
+    ));
 
     Ok(())
 }