1 files changed, 18 insertions, 40 deletions

diff --git a/src/commands/list.rs b/src/commands/list.rs
index 6c80e4e..76965df 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -1,38 +1,27 @@
 use std::io::{Error, ErrorKind};
 
-use crate::{db::{lists_insert, lists_remove, config_change_current_list, lists_get_all_ids, config_get_current_list, lists_get}, Modloader, config::Cfg, input::Input};
+use crate::{db::{lists_insert, lists_remove, config_change_current_list, lists_get_all_ids, config_get_current_list, lists_get}, Modloader, config::Cfg, input::{Input, Subcmd}};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct List {
     pub id: String,
     pub mc_version: String,
     pub modloader: Modloader,
+    pub download_folder: String,
 }
 
-pub fn list(config: Cfg, args: Option<Vec<String>>) -> Result<(), Box<dyn std::error::Error>> {
+pub fn list(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
 
-    if args.is_none() {
-        let lists = lists_get_all_ids(config.clone())?;
-        let current_list = config_get_current_list(config)?;
-        println!("Your lists:\n{}\n-----\nCurrently selected list: \"{}\"", lists.join(",\n"), current_list);
-        return Ok(());
-    }
-
-    let arguments = Input::from(args.unwrap().join(" "))?;
-
-    if arguments.args.is_none() { return Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))); };
-
-    match arguments.command.as_str() {
-        "add" => {
-            add(config, arguments.args.unwrap())
+    match input.subcommand.ok_or("")? {
+        Subcmd::Add => {
+            add(config, input.args.ok_or("")?)
         },
-        "change" => {
-            change(config, arguments.args.unwrap())
+        Subcmd::Change => {
+            change(config, input.args.ok_or("")?)
         },
-        "remove" => {
-            remove(config, arguments.args.unwrap())
-        },
-        _ => Err(Box::new(Error::new(ErrorKind::InvalidInput, "UNKNOWN_SUBCOMMAND")))
+        Subcmd::Remove => {
+            remove(config, input.args.ok_or("")?)
+        }
     }
 }
 
@@ -43,16 +32,13 @@ pub fn get_current_list(config: Cfg) -> Result<List, Box<dyn std::error::Error>>
 
 fn add(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
     match args.len() {
-        1 | 2 => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))),
-        3 => {
+        1 | 2 | 3 => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))),
+        4 => {
             let id = String::from(&args[0]);
             let mc_version = String::from(&args[1]);
-            let mod_loader = match args[2].as_str() {
-                "forge" => Modloader::Forge,
-                "fabric" => Modloader::Fabric,
-                _ => return Err(Box::new(Error::new(ErrorKind::InvalidInput, "UNKNOWN_MODLOADER")))
-            };
-            lists_insert(config, id, mc_version, mod_loader)
+            let mod_loader = Modloader::from(&args[2])?;
+            let download_folder = String::from(&args[3]);
+            lists_insert(config, id, mc_version, mod_loader, download_folder)
         },
         5.. => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_MANY_ARGUMENTS"))),
         _ => panic!("list arguments should never be zero or lower"),
@@ -65,10 +51,7 @@ fn change(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Erro
         1 => {
             let list = String::from(&args[0]);
             if !lists.contains(&list) { return Err(Box::new(Error::new(ErrorKind::NotFound, "LIST_DOESNT_EXIST"))); };
-            match config_change_current_list(config, list) {
-                Err(..) => { Err(Box::new(Error::new(ErrorKind::Other, "72"))) },
-                Ok(()) => Ok(()),
-            }
+            config_change_current_list(config, list)
         },
         2.. => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_MANY_ARGUMENTS"))),
         _ => panic!("list arguments should never be zero or lower"),
@@ -77,12 +60,7 @@ fn change(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Erro
 
 fn remove(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
     match args.len() {
-        1 => {
-            match lists_remove(config, String::from(&args[0])) {
-                Err(..) => { Err(Box::new(Error::new(ErrorKind::Other, "85"))) },
-                Ok(()) => Ok(()),
-            }
-        },
+        1 => lists_remove(config, String::from(&args[0])),
         2.. => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_MANY_ARGUMENTS"))),
         _ => panic!("list arguments should never be zero or lower"),
     }