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

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

1 files changed, 76 insertions, 17 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index ebfb4eb..a7cf744 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,26 +1,48 @@
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+
 use crate::{config::Cfg, List};
 use crate::{
     db::userlist_get_all_current_versions_with_mods,
     error::{ErrorType, MLError, MLE},
     files::{
-        clean_list_dir, delete_version, disable_version, download_versions, get_downloaded_versions,
+        clean_list_dir, delete_version, disable_version, download_versions,
+        get_downloaded_versions,
     },
     modrinth::get_raw_versions,
 };
+use crate::{PROGRESS_CHARS, STYLE_BAR_POS};
 
-pub async fn download(config: Cfg, liststack: Vec<List>, clean: bool, delete_old: bool) -> MLE<()> {
+pub async fn download(
+    config: &Cfg,
+    liststack: Vec<List>,
+    clean: bool,
+    delete_old: bool,
+) -> MLE<()> {
+    let mp = MultiProgress::new();
+    let download_p =
+        mp.add(ProgressBar::new(liststack.len().try_into().unwrap()));
+    download_p.set_style(
+        ProgressStyle::with_template(STYLE_BAR_POS)
+            .unwrap()
+            .progress_chars(PROGRESS_CHARS),
+    );
 
     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.clone(),
-            String::from(&current_list.id),
-        ) {
-            Ok(i) => Ok(i),
-            Err(e) => Err(MLError::new(ErrorType::DBError, e.to_string().as_str())),
-        }?;
+        download_p.set_message(format!("Download in {}", current_list.id));
+
+        let downloaded_versions =
+            get_downloaded_versions(current_list.clone())?;
+        let current_version_ids =
+            match userlist_get_all_current_versions_with_mods(
+                config,
+                String::from(&current_list.id),
+            ) {
+                Ok(i) => Ok(i),
+                Err(e) => Err(MLError::new(
+                    ErrorType::DBError,
+                    e.to_string().as_str(),
+                )),
+            }?;
 
         let mut to_download: Vec<String> = vec![];
         //(mod_id, version_id)
@@ -39,7 +61,10 @@ pub async fn download(config: Cfg, liststack: Vec<List>, clean: bool, delete_old
                     .ok_or("SOMETHING_HAS_REALLY_GONE_WRONG")
                     .unwrap();
                 if &current_version != downloaded_version {
-                    to_disable.push((mod_id.clone(), String::from(downloaded_version)));
+                    to_disable.push((
+                        mod_id.clone(),
+                        String::from(downloaded_version),
+                    ));
                     to_download.push(current_version);
                 }
             }
@@ -54,23 +79,57 @@ pub async fn download(config: Cfg, liststack: Vec<List>, clean: bool, delete_old
                 current_list.clone(),
                 config.clone(),
                 get_raw_versions(&config.apis.modrinth, to_download).await,
+                &mp,
+                &download_p,
             )
             .await?;
         } else {
-            println!("There are no new versions to download");
+            download_p.println(format!(
+                "There are no new versions to download for {}",
+                current_list.id
+            ));
         }
 
         if !to_disable.is_empty() {
+            let d_p = mp.insert_before(
+                &download_p,
+                ProgressBar::new(to_disable.len().try_into().unwrap()),
+            );
+            d_p.set_style(
+                ProgressStyle::with_template(STYLE_BAR_POS)
+                    .unwrap()
+                    .progress_chars(PROGRESS_CHARS),
+            );
             for ver in to_disable {
                 if delete_old {
-                    println!("Deleting version {} for mod {}", ver.1, ver.0);
-                    delete_version(current_list.clone(), ver.1)?;
+                    d_p.set_message(format!("Delete version {}", ver.1));
+                    d_p.inc(1);
+                    delete_version(&current_list, ver.1)?;
                 } else {
-                    disable_version(config.clone(), current_list.clone(), ver.1, ver.0)?;
+                    d_p.set_message(format!("Disable version {}", ver.1));
+                    d_p.inc(1);
+                    disable_version(
+                        config,
+                        current_list.clone(),
+                        ver.1,
+                        ver.0,
+                    )?;
                 };
             }
+
+            let del_msg = if delete_old {
+                "Deleted all old versions"
+            } else {
+                "Disabled all old versions"
+            };
+
+            d_p.finish_with_message(del_msg);
         }
+
+        download_p.inc(1);
     }
 
+    download_p.finish_with_message("Downloaded all lists");
+
     Ok(())
 }