1 files changed, 42 insertions, 39 deletions

diff --git a/src/commands/list.rs b/src/commands/list.rs
index 8e86973..13176f4 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -1,4 +1,12 @@
-use crate::{db::{lists_insert, lists_remove, config_change_current_list, config_get_current_list, lists_get, lists_version}, Modloader, config::Cfg, input::{Input, ListOptions}, cmd_update, error::MLE};
+use crate::{
+    config::Cfg,
+    db::{
+        config_change_current_list, config_get_current_list, lists_get, lists_insert, lists_remove,
+        lists_version,
+    },
+    error::MLE,
+    update, Modloader,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct List {
@@ -8,60 +16,55 @@ pub struct List {
     pub download_folder: String,
 }
 
-pub async fn list(config: Cfg, input: Input) -> MLE<()> {
-
-    match input.clone().list_options.unwrap() {
-        ListOptions::Add => {
-            add(config, input)
-        },
-        ListOptions::Change => {
-            change(config, input)
-        },
-        ListOptions::Remove => {
-            remove(config, input)
-        },
-        ListOptions::Version => {
-            version(config, input).await
-        }
-    }
-}
-
 pub fn get_current_list(config: Cfg) -> MLE<List> {
     let id = config_get_current_list(config.clone())?;
     lists_get(config, id)
 }
 
-fn add(config: Cfg, input: Input) -> MLE<()> {
-    let id = input.list_id.unwrap();
-    let mc_version = input.list_mcversion.unwrap();
-    let mod_loader = input.modloader.unwrap();
-    let download_folder = input.directory.unwrap();
-    lists_insert(config, id, mc_version, mod_loader, download_folder)
+pub fn list_add(
+    config: Cfg,
+    id: String,
+    mc_version: String,
+    modloader: Modloader,
+    directory: String,
+) -> MLE<()> {
+    lists_insert(config, id, mc_version, modloader, directory)
 }
 
-fn change(config: Cfg, input: Input) -> MLE<()> {
-    println!("Change default list to: {}", input.clone().list.unwrap().id);
-    config_change_current_list(config, input.list.unwrap().id)
+pub fn list_change(config: Cfg, id: String) -> MLE<()> {
+    //TODO check if list exists
+    println!("Change default list to: {}", id);
+    config_change_current_list(config, id)
 }
 
-fn remove(config: Cfg, input: Input) -> MLE<()> {
-    lists_remove(config, input.list.unwrap().id)
+pub fn list_remove(config: Cfg, id: String) -> MLE<()> {
+    lists_remove(config, id)
 }
 
 ///Changing the current lists version and updating it
 ///
 /// #Arguments
-/// 
+///
 /// * `config` - The current config
 /// * `args` - All args, to extract the new version
-async fn version(config: Cfg, input: Input) -> MLE<()> {
-    println!("Change version for list {} to minecraft version: {}", input.clone().list.unwrap().id, input.clone().list_mcversion.unwrap());
+pub async fn list_version(
+    config: Cfg,
+    id: String,
+    mc_version: String,
+    download: bool,
+    delete: bool,
+) -> MLE<()> {
+    println!(
+        "Change version for list {} to minecraft version: {}",
+        id, mc_version
+    );
 
-    lists_version(config.clone(), input.clone().list.ok_or("").unwrap().id, input.clone().list_mcversion.ok_or("").unwrap())?;
-    
-    //Linebreak readability
-    println!("");
+    lists_version(config.clone(), &id, &mc_version)?;
 
-    println!("Check for updates for new minecraft version in list {}", input.clone().list.unwrap().id);
-    cmd_update(config, vec![input.list.ok_or("").unwrap()], true, input.direct_download, input.delete_old).await
+    println!(
+        "\nCheck for updates for new minecraft version in list {}",
+        id
+    );
+    let list = lists_get(config.clone(), id)?;
+    update(config, vec![list], true, download, delete).await
 }