1 files changed, 111 insertions, 95 deletions

diff --git a/src/main.rs b/src/main.rs
index 31a320b..5d60a17 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,8 +2,9 @@ use clap::{Parser, Subcommand};
 use modlist::{
     config::Cfg,
     db::{config_get_current_list, lists_get, lists_get_all_ids},
-    download, export, get_current_list, import, list_add, list_change, list_remove, list_version,
-    mod_add, mod_remove, update, IDSelector, List, Modloader, VersionLevel, list_list, AddMod,
+    download, export, get_current_list, import, list_add, list_change,
+    list_list, list_remove, list_version, mod_add, mod_remove, update, AddMod,
+    IDSelector, List, Modloader, VersionLevel,
 };
 
 #[derive(Parser)]
@@ -15,10 +16,6 @@ struct Cli {
     /// config file path
     #[arg(short, long)]
     config: Option<String>,
-
-    /// Force GameVersion update
-    #[arg(long)]
-    force_gameupdate: bool,
 }
 
 #[derive(Subcommand)]
@@ -30,6 +27,10 @@ enum Commands {
     List {
         #[command(subcommand)]
         command: ListCommands,
+
+        /// Force GameVersion update
+        #[arg(long)]
+        force_gameupdate: bool,
     },
     Download {
         /// download all lists
@@ -43,7 +44,7 @@ enum Commands {
         /// remove disabled versions
         #[arg(short, long)]
         remove: bool,
-        
+
         /// optional List selection, else default list will be used
         #[arg(short, long)]
         list: Option<String>,
@@ -81,7 +82,7 @@ enum Commands {
         /// the list you want to export
         list: Option<String>,
     },
-    Test
+    Test,
 }
 
 #[derive(Subcommand)]
@@ -160,119 +161,134 @@ async fn main() {
     let config = Cfg::init(cli.config).await.unwrap();
 
     match cli.command {
-        Commands::Mod { command } => {
-            match command {
-                #[allow(unused_variables)]
-                ModCommands::Add {
-                    id,
-                    version,
-                    list,
-                    download,
-                    lock,
-                } => {
-                    let listf = match list {
-                        Some(list) => lists_get(config.clone(), list).unwrap(),
-                        None => lists_get(
-                            config.clone(),
-                            config_get_current_list(config.clone()).unwrap(),
-                        )
-                        .unwrap(),
-                    };
+        Commands::Mod { command } => match command {
+            ModCommands::Add {
+                id,
+                version,
+                list,
+                download,
+                lock,
+            } => {
+                let listf = match list {
+                    Some(list) => lists_get(&config, &list).unwrap(),
+                    None => lists_get(
+                        &config,
+                        &config_get_current_list(&config).unwrap(),
+                    )
+                    .unwrap(),
+                };
 
-                    let marked_id = match version {
-                        true => IDSelector::VersionID(id),
-                        false => IDSelector::ModificationID(id),
-                    };
+                let marked_id = match version {
+                    true => IDSelector::VersionID(id),
+                    false => IDSelector::ModificationID(id),
+                };
 
-                    let add_id = AddMod { id: marked_id, set_version: lock };
+                let add_id = AddMod {
+                    id: marked_id,
+                    set_version: lock,
+                };
 
-                    mod_add(config, vec![add_id], listf, download).await
-                }
-                ModCommands::Remove { id, list } => {
-                    let listf = match list {
-                        Some(list) => lists_get(config.clone(), list).unwrap(),
-                        None => lists_get(
-                            config.clone(),
-                            config_get_current_list(config.clone()).unwrap(),
-                        )
-                        .unwrap(),
-                    };
-                    mod_remove(config, &id, listf)
-                }
+                mod_add(&config, vec![add_id], listf, download).await
             }
-        }
-        Commands::List { command } => {
-            match command {
-                ListCommands::Add {
-                    id,
-                    directory,
-                    modloader,
-                    version,
-                } => {
-                    let ml = match modloader {
-                        Some(ml) => Modloader::from(&ml).unwrap(),
-                        None => config.clone().defaults.modloader,
-                    };
-
-                    let versions_path = &config.versions;
-                    let ver = match version {
-                        Some(ver) => VersionLevel::from(&ver).get(versions_path, cli.force_gameupdate).await.unwrap(),
-                        None => config.clone().defaults.version.get(versions_path, cli.force_gameupdate).await.unwrap(),
-                    };
-
-                    list_add(config, id, ver, ml, directory)
-                }
-                ListCommands::Remove { id } => list_remove(config, id),
-                ListCommands::List => {
-                    list_list(config)
-                }
-                ListCommands::Change { id } => list_change(config, id),
-                ListCommands::Version {
-                    id,
-                    version,
-                    download,
-                    remove,
-                } => list_version(config, id, version, download, remove).await,
+            ModCommands::Remove { id, list } => {
+                let listf = match list {
+                    Some(list) => lists_get(&config, &list).unwrap(),
+                    None => lists_get(
+                        &config,
+                        &config_get_current_list(&config).unwrap(),
+                    )
+                    .unwrap(),
+                };
+                mod_remove(&config, &id, &listf)
             }
-        }
+        },
+        Commands::List {
+            command,
+            force_gameupdate,
+        } => match command {
+            ListCommands::Add {
+                id,
+                directory,
+                modloader,
+                version,
+            } => {
+                let ml = match modloader {
+                    Some(ml) => Modloader::from(&ml).unwrap(),
+                    None => config.defaults.modloader.clone(),
+                };
+
+                let versions_path = &config.versions;
+                let ver = match version {
+                    Some(ver) => VersionLevel::from(&ver)
+                        .get(versions_path, force_gameupdate)
+                        .await
+                        .unwrap(),
+                    None => config
+                        .defaults
+                        .version
+                        .clone()
+                        .get(versions_path, force_gameupdate)
+                        .await
+                        .unwrap(),
+                };
+
+                list_add(&config, &id, &ver, &ml, &directory)
+            }
+            ListCommands::Remove { id } => list_remove(&config, &id),
+            ListCommands::List => list_list(&config),
+            ListCommands::Change { id } => list_change(&config, &id),
+            ListCommands::Version {
+                id,
+                version,
+                download,
+                remove,
+            } => list_version(&config, &id, version, download, remove).await,
+        },
         Commands::Update {
             all,
             download,
             clean,
             remove,
-            list
+            list,
         } => {
             let mut liststack: Vec<List> = vec![];
             if all {
-                let list_ids = lists_get_all_ids(config.clone()).unwrap();
+                let list_ids = lists_get_all_ids(&config).unwrap();
                 for id in list_ids {
-                    liststack.push(lists_get(config.clone(), id).unwrap());
+                    liststack.push(lists_get(&config, &id).unwrap());
                 }
             } else {
-                let current = match list  {
-                    Some(l) => lists_get(config.clone(), l).unwrap(),
-                    None => get_current_list(config.clone()).unwrap(),
+                let current = match list {
+                    Some(l) => lists_get(&config, &l).unwrap(),
+                    None => get_current_list(&config).unwrap(),
                 };
                 liststack.push(current)
             }
-            update(config, liststack, clean, download, remove).await
+
+            update(&config, liststack, clean, download, remove).await
         }
-        Commands::Download { all, clean, remove, list } => {
+        Commands::Download {
+            all,
+            clean,
+            remove,
+            list,
+        } => {
             let mut liststack: Vec<List> = vec![];
             if all {
-                let list_ids = lists_get_all_ids(config.clone()).unwrap();
+                let list_ids = lists_get_all_ids(&config).unwrap();
                 for id in list_ids {
-                    liststack.push(lists_get(config.clone(), id).unwrap());
+                    liststack.push(lists_get(&config, &id).unwrap());
                 }
             } else {
-                let current = match list  {
-                    Some(l) => lists_get(config.clone(), l).unwrap(),
-                    None => get_current_list(config.clone()).unwrap(),
+                let current = match list {
+                    Some(l) => lists_get(&config, &l).unwrap(),
+                    None => get_current_list(&config).unwrap(),
                 };
                 liststack.push(current)
             }
-            download(config, liststack, clean, remove).await
-        },
+
+            download(&config, liststack, clean, remove).await
+        }
         Commands::Import { file, download } => {
             let filestr: String = match file {
                 Some(args) => args,
@@ -284,9 +300,9 @@ async fn main() {
                     .unwrap(),
             };
 
-            import(config, filestr, download).await
+            import(&config, &filestr, download).await
         }
-        Commands::Export { list } => export(config, list),
+        Commands::Export { list } => export(&config, list),
         Commands::Test => Ok(()),
     }
     .unwrap();