Merge pull request 'clap' (#1) from clap into master

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

1 files changed, 32 insertions, 14 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index 2714630..9434591 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,10 +1,16 @@
-use crate::{files::{get_downloaded_versions, download_versions, delete_version, disable_version, clean_list_dir}, db::{userlist_get_all_current_versions_with_mods, lists_get_all_ids, lists_get}, modrinth::get_raw_versions, error::{MLE, ErrorType, MLError}};
-use crate::{List, get_current_list, config::Cfg, input::Input};
-
-pub async fn download(config: Cfg, input: Input) -> MLE<()> {
+use crate::{config::Cfg, get_current_list, List};
+use crate::{
+    db::{lists_get, lists_get_all_ids, userlist_get_all_current_versions_with_mods},
+    error::{ErrorType, MLError, MLE},
+    files::{
+        clean_list_dir, delete_version, disable_version, download_versions, get_downloaded_versions,
+    },
+    modrinth::get_raw_versions,
+};
 
+pub async fn download(config: Cfg, all_lists: bool, clean: bool, delete_old: bool) -> MLE<()> {
     let mut liststack: Vec<List> = vec![];
-    if input.all_lists {
+    if all_lists {
         let list_ids = lists_get_all_ids(config.clone())?;
         for id in list_ids {
             liststack.push(lists_get(config.clone(), id)?);
@@ -18,7 +24,10 @@ pub async fn download(config: Cfg, input: Input) -> MLE<()> {
     for current_list in liststack {
         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)) {
+        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())),
         }?;
@@ -33,31 +42,40 @@ pub async fn download(config: Cfg, input: Input) -> MLE<()> {
 
             let current_download = downloaded_versions.get(&mod_id);
 
-            if current_download.is_none() || input.clean {
+            if current_download.is_none() || clean {
                 to_download.push(current_version);
             } else {
-                let downloaded_version = current_download.ok_or("SOMETHING_HAS_REALLY_GONE_WRONG").unwrap();
+                let downloaded_version = current_download
+                    .ok_or("SOMETHING_HAS_REALLY_GONE_WRONG")
+                    .unwrap();
                 if &current_version != downloaded_version {
                     to_disable.push((mod_id.clone(), String::from(downloaded_version)));
                     to_download.push(current_version);
                 }
             }
         }
-        
-        if input.clean { clean_list_dir(&current_list)? };
+
+        if clean {
+            clean_list_dir(&current_list)?
+        };
 
         if !to_download.is_empty() {
-            download_versions(current_list.clone(), config.clone(), get_raw_versions(&config.apis.modrinth, to_download).await).await?;
+            download_versions(
+                current_list.clone(),
+                config.clone(),
+                get_raw_versions(&config.apis.modrinth, to_download).await,
+            )
+            .await?;
         } else {
             println!("There are no new versions to download");
         }
-        
+
         if !to_disable.is_empty() {
             for ver in to_disable {
-                if input.delete_old {
+                if delete_old {
                     println!("Deleting version {} for mod {}", ver.1, ver.0);
                     delete_version(current_list.clone(), ver.1)?;
-                } else { 
+                } else {
                     disable_version(config.clone(), current_list.clone(), ver.1, ver.0)?;
                 };
             }