added --clean for update && list downloadfolder

12 files changed, 217 insertions, 141 deletions

diff --git a/data.db b/data.db
index 5308bbc..a54cd80 100644
--- a/data.db
+++ b/data.db
diff --git a/planmodlist.xopp b/planmodlist.xopp
index 277f1ad..7dbf105 100644
--- a/planmodlist.xopp
+++ b/planmodlist.xopp
diff --git a/src/apis/modrinth.rs b/src/apis/modrinth.rs
index abb8eec..ec8d203 100644
--- a/src/apis/modrinth.rs
+++ b/src/apis/modrinth.rs
@@ -124,7 +124,6 @@ async fn get(api: String, path: String) -> Result<Vec<u8>, Box<dyn std::error::E
     Ok(data)
 }
 
-
 pub async fn project(api: String, name: &str) -> Project {
     let url = format!("project/{}", name);
     let data = get(api, url);
@@ -143,7 +142,6 @@ pub async fn projects(api: String, ids: Vec<String>) -> Vec<Project> {
 }
 
 pub async fn versions(api: String, id: String, list: List) -> Vec<Version> {
-
     let loaderstr = match list.modloader {
         Modloader::Forge => String::from("forge"),
         Modloader::Fabric => String::from("fabric"),
@@ -157,7 +155,7 @@ pub async fn versions(api: String, id: String, list: List) -> Vec<Version> {
 }
 
 pub async fn get_raw_versions(api: String, versions: Vec<String>) -> Vec<Version> {
-    println!("Getting versions");
+    println!("Getting versions {}", &versions.join(", "));
 
     let url = format!(r#"versions?ids=["{}"]"#, versions.join(r#"",""#));
 
@@ -169,18 +167,15 @@ pub async fn get_raw_versions(api: String, versions: Vec<String>) -> Vec<Version
 pub fn extract_current_version(versions: Vec<Version>) -> Result<String, Box<dyn std::error::Error>> {
     match versions.len() {
         0 => Err(Box::new(Error::new(ErrorKind::NotFound, "NO_VERSIONS_AVAILABLE"))),
-        //TODO compare publish dates
         1.. => {
             let mut times: Vec<(String, DateTime<FixedOffset>)> = vec![];
             for ver in versions {
                 let stamp = DateTime::parse_from_rfc3339(&ver.date_published)?;
                 times.push((ver.id, stamp))
             }
-            dbg!(&times);
             times.sort_by_key(|t| t.1);
             times.reverse();
-            dbg!(&times);
-            println!("CW: {}", times[0].0);
+            println!("Current Version: {}", times[0].0);
             Ok(times[0].0.to_string())
         },
         _ => panic!("available_versions should never be negative"),
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"),
     }
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 595b677..519a0cb 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,23 +1,17 @@
 use std::io::{Error, ErrorKind};
 
-use crate::{modrinth::{project, versions, extract_current_version}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, mods_get_all_ids, userlist_get_all_ids}, input::Input, get_current_list};
+use crate::{modrinth::{project, versions, extract_current_version}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, mods_get_all_ids, userlist_get_all_ids}, input::{Input, Subcmd}, get_current_list};
 
-pub async fn modification(config: Cfg, args: Option<Vec<String>>) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn modification(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
     
-    if args.is_none() { return Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))) }
-
-    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()).await
+    match input.subcommand.ok_or("")? {
+        Subcmd::Add => {
+            add(config, input.args.ok_or("")?).await
         },
-        "remove" => {
-            remove(config, arguments.args.unwrap())
+        Subcmd::Remove => {
+            remove(config, input.args.ok_or("")?)
         },
-        _ => Err(Box::new(Error::new(ErrorKind::InvalidInput, "UNKNOWN_SUBCOMMAND")))
+        _ => Err(Box::new(Error::new(ErrorKind::InvalidInput, "SUBCOMMAND_NOT_AVAILABLE")))
     }
 }
 
@@ -29,8 +23,6 @@ async fn add(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::E
 
     let project = project(String::from(&config.apis.modrinth), &args[0]).await;
 
-    dbg!(&project);
-
     if project.versions.is_empty() { panic!("This should never happen"); };
 
     let available_versions = versions(String::from(&config.apis.modrinth), String::from(&project.id), current_list.clone()).await;
@@ -48,7 +40,6 @@ async fn add(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::E
     //add to current list and mod table
     match userlist_get_all_ids(config.clone(), current_list.clone().id) {
         Ok(mods) => {
-            dbg!(&mods);
             if mods.contains(&project.id) {
                 return Err(Box::new(Error::new(ErrorKind::Other, "MOD_ALREADY_ON_LIST"))); } 
             else {
@@ -60,7 +51,6 @@ async fn add(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::E
     
     match mods_get_all_ids(config.clone()) {
         Ok(mods) => {
-            dbg!(&mods);
             if mods.contains(&project.id) {
                 return Err(Box::new(Error::new(ErrorKind::Other, "MOD_ALREADY_IN_DATABASE")))
             } else {
@@ -81,8 +71,5 @@ fn remove(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Erro
     let mod_id = mods_get_id(config.clone(), String::from(&args[0]))?;
     
     //TODO implement remove from modlist if not in any other lists && config clean is true
-    match userlist_remove(config, current_list.id, mod_id) {
-        Err(..) => { Err(Box::new(Error::new(ErrorKind::Other, "TBD"))) },
-        Ok(()) => Ok(()),
-    }
+    userlist_remove(config, current_list.id, mod_id)
 }
diff --git a/src/commands/setup.rs b/src/commands/setup.rs
index 8c0fcfd..be06040 100644
--- a/src/commands/setup.rs
+++ b/src/commands/setup.rs
@@ -1,9 +1,8 @@
 use std::{fs::File, path::Path, io::{Error, ErrorKind}};
 
-use crate::{config::Cfg, db::{db_setup, s_config_get_version, s_config_create_version, s_insert_column, lists_get_all_ids, lists_get, userlist_get_all_current_version_ids, s_userlist_update_download}, modrinth::get_raw_versions};
+use crate::{config::Cfg, db::{db_setup, s_config_get_version, s_config_create_version, s_insert_column, lists_get_all_ids, lists_get, userlist_get_all_current_version_ids, s_userlist_update_download, s_config_update_version}, modrinth::get_raw_versions};
 
 pub async fn setup(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
-
     let db_file = format!("{}/data.db", String::from(&config.data));
     
     if !Path::new(&db_file).exists() {
@@ -13,6 +12,7 @@ pub async fn setup(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
     match s_config_get_version(config.clone()) {
         Ok(ver) => {
             match ver.as_str() {
+                "0.2" => to_03(config)?,
                 _ => return Err(Box::new(Error::new(ErrorKind::Other, "UNKNOWN_VERSION")))
             }
         },
@@ -33,7 +33,7 @@ async fn to_02(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
 
     for list in lists {
         println!("Updating {}", list);
-        s_insert_column(config.clone(), String::from(&list), String::from("current_download"), String::new())?;
+        s_insert_column(config.clone(), String::from(&list), String::from("current_download"), String::from("TEXT"))?;
 
         let full_list = lists_get(config.clone(), String::from(&list))?;
 
@@ -51,3 +51,8 @@ async fn to_02(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+
+fn to_03(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
+    s_insert_column(config.clone(), String::from("lists"), String::from("download_folder"), String::from("TEXT"))?;
+    s_config_update_version(config, String::from("0.3"))
+}
diff --git a/src/commands/update.rs b/src/commands/update.rs
index e383eae..85630f5 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -4,9 +4,9 @@ use reqwest::Client;
 
 use futures_util::StreamExt;
 
-use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions}, List};
+use crate::{config::Cfg, modrinth::{projects, Project, versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, mods_get_versions, userlist_get_applicable_versions, userlist_change_versions}, List, input::Input};
 
-pub async fn update(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn update(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
 
     let current_list = get_current_list(config.clone())?;
 
@@ -20,15 +20,16 @@ pub async fn update(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
     
     let mut updatestack: Vec<Version> = vec![];
     for (index, project) in projects.into_iter().enumerate() {
+        //Get versions for project and check if they match up
         let current_version = &versions[index];
-
         let p_id = String::from(&project.id);
         let v_id = &current_version.mod_id;
-
         if &p_id != v_id { return Err(Box::new(Error::new(ErrorKind::Other, "SORTING_ERROR"))) };
-        
-        if project.versions.join("|") != current_version.versions {
-            updatestack.push(match specific_update(config.clone(), current_list.clone(), project).await {
+
+
+        //Adding to stack if not the same versions in the list OR if clean == true
+        if input.clone().clean || (project.versions.join("|") != current_version.versions) {
+            updatestack.push(match specific_update(config.clone(), input.clone(), current_list.clone(), project).await {
                 Ok(ver) => ver,
                 //TODO handle errors (only continue on "NO_UPDATE_AVAILABLE")
                 Err(_) => { continue; },
@@ -36,13 +37,23 @@ pub async fn update(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
         };
     };
     //println!("{:?}", updatestack);
+    
+    
+    if input.clean {
+        let dl_path = &current_list.download_folder;
+        println!("Cleaning {}", dl_path);
+        for entry in std::fs::read_dir(dl_path)? {
+            let entry = entry?;
+            std::fs::remove_file(entry.path())?;
+        }
+    }
 
-    download_updates(config, updatestack).await?;
+    download_updates(config, current_list, updatestack).await?;
 
     Ok(())
 }
 
-async fn specific_update(config: Cfg, list: List, project: Project) -> Result<Version, Box<dyn std::error::Error>> {
+async fn specific_update(config: Cfg, input: Input, list: List, project: Project) -> Result<Version, Box<dyn std::error::Error>> {
     print!("Checking update for '{}' in {}", project.title, list.id);
     
     let applicable_versions = versions(String::from(&config.apis.modrinth), String::from(&project.id), list.clone()).await;
@@ -54,7 +65,7 @@ async fn specific_update(config: Cfg, list: List, project: Project) -> Result<Ve
     }
     
     let mut current: Vec<Version> = vec![];
-    if versions.join("|") != userlist_get_applicable_versions(config.clone(), String::from(&list.id), String::from(&project.id))? {
+    if input.clean || (versions.join("|") != userlist_get_applicable_versions(config.clone(), String::from(&list.id), String::from(&project.id))?) {
         //get new versions
         print!(" | getting new version");
         let current_str = extract_current_version(applicable_versions.clone())?;
@@ -71,9 +82,9 @@ async fn specific_update(config: Cfg, list: List, project: Project) -> Result<Ve
     Ok(current[0].clone())
 }
 
-async fn download_updates(config: Cfg, versions: Vec<Version>) -> Result<String, Box<dyn std::error::Error>> {
+async fn download_updates(config: Cfg, current_list: List, versions: Vec<Version>) -> Result<String, Box<dyn std::error::Error>> {
 
-    let dl_path = String::from(&config.downloads);
+    let dl_path = String::from(&current_list.download_folder);
 
     for ver in versions {
         let primary_file = ver.files.into_iter().find(|file| file.primary).unwrap();
diff --git a/src/db.rs b/src/db.rs
index 5d82271..6b1e3ab 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -2,7 +2,7 @@ use std::io::{Error, ErrorKind};
 
 use rusqlite::Connection;
 
-use crate::{Modloader, config::Cfg, List, get_modloader};
+use crate::{Modloader, config::Cfg, List};
 
 //mods
 pub fn mods_insert(config: Cfg, id: String, name: String, versions: Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
@@ -226,14 +226,14 @@ pub fn userlist_get_all_downloads(config: Cfg, list_id: String) -> Result<Vec<St
 }
 
 //lists
-pub fn lists_insert(config: Cfg, id: String, mc_version: String, mod_loader: Modloader) -> Result<(), Box<dyn std::error::Error>> {
+pub fn lists_insert(config: Cfg, id: String, mc_version: String, mod_loader: Modloader, download_folder: String) -> Result<(), Box<dyn std::error::Error>> {
     println!("Creating list {}", id);
 
     let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
-    connection.execute("INSERT INTO lists VALUES (?1, ?2, ?3)", [id.clone(), mc_version, mod_loader.stringify()])?;
-    connection.execute(format!("CREATE TABLE {}( 'mod_id' TEXT, 'current_version' TEXT, 'applicable_versions' BLOB, 'current_download' TEXT)", id).as_str(), [])?;
+    connection.execute("INSERT INTO lists VALUES (?1, ?2, ?3, ?4)", [id.clone(), mc_version, mod_loader.stringify(), download_folder])?;
+    connection.execute(format!("CREATE TABLE {}( 'mod_id' TEXT, 'current_version' TEXT, 'applicable_versions' BLOB, 'current_download' TEXT )", id).as_str(), [])?;
 
     Ok(())
 }
@@ -251,16 +251,16 @@ pub fn lists_get(config: Cfg, list_id: String) -> Result<List, Box<dyn std::erro
     let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
-    let mut list = List { id: String::new(), mc_version: String::new(), modloader: Modloader::Fabric };
-    let mut stmt = connection.prepare("SELECT mc_version, modloader FROM lists WHERE id = ?")?;
+    let mut list = List { id: String::new(), mc_version: String::new(), modloader: Modloader::Fabric, download_folder: String::new() };
+    let mut stmt = connection.prepare("SELECT mc_version, modloader, download_folder FROM lists WHERE id = ?")?;
 
     let list_iter = stmt.query_map([&list_id], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?])
+        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?, row.get::<usize, String>(2)?])
     })?;
 
     for l in list_iter {
         let li = l?;
-        list = List { id: String::from(&list_id), mc_version: String::from(&li[0]), modloader: get_modloader(String::from(&li[1]))? };
+        list = List { id: String::from(&list_id), mc_version: String::from(&li[0]), modloader: Modloader::from(&li[1])?, download_folder: String::from(&li[2]) };
     };
 
     if list.id.is_empty() { return Err(Box::new(Error::new(ErrorKind::Other, "LIST_NOT_FOUND"))); }
@@ -378,11 +378,10 @@ pub fn db_setup(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
     connection.execute_batch(
         "CREATE TABLE 'user_config' ( 'id' TEXT, 'value' TEXT );
          CREATE TABLE 'mods' ( 'id' TEXT, 'name' TEXT, 'versions' TEXT );
-         CREATE TABLE 'lists' ( 'id' TEXT, 'mc_version' TEXT, 'modloader' TEXT );
-         INSERT INTO 'user_config' VALUES ( 'db_version', '0.2' );
+         CREATE TABLE 'lists' ( 'id' TEXT, 'mc_version' TEXT, 'modloader' TEXT, 'download_folder' TEXT );
+         INSERT INTO 'user_config' VALUES ( 'db_version', '0.3' );
          INSERT INTO 'user_config' VALUES ( 'current_list', '...' )",
     )?;
     
     Ok(())
 }
-
diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 0000000..c82688c
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,34 @@
+use core::fmt;
+
+pub type MLE<T> = Result<T, MLError>;
+
+#[derive(Debug)]
+pub struct MLError {
+    etype: ErrorType,
+    message: String,
+}
+
+#[derive(Debug)]
+pub enum ErrorType {
+    ArgumentError
+}
+
+impl std::error::Error for MLError {
+    fn description(&self) -> &str {
+        &self.message
+    }
+}
+
+impl fmt::Display for MLError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.etype {
+            ErrorType::ArgumentError => write!(f, "ARGS")
+        }
+    }
+}
+
+impl MLError {
+    pub fn new(etype: ErrorType, message: &str) -> Self {
+        Self { etype, message: String::from(message) }
+    }
+}
diff --git a/src/input.rs b/src/input.rs
index c7e82d9..109fa0c 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -1,69 +1,135 @@
-use std::{io::{Error, ErrorKind}, env};
-use crate::{config::Cfg, list, modification, update, setup, download};
+use std::env;
+use crate::{config::Cfg, list, modification, update, setup, download, error::{MLError, ErrorType, MLE}};
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Input {
-    pub command: String,
+    pub command: Cmd,
+    pub subcommand: Option<Subcmd>,
     pub args: Option<Vec<String>>,
+    pub direct_download: bool,
+    pub force_download: bool,
+    pub all_lists: bool,
+    pub delete_old: bool,
+    pub clean: bool,
 }
 
 impl Input {
-    pub fn from(string: String) -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn from(string: &str) -> MLE<Self> {
         let mut split: Vec<&str> = string.split(' ').collect();
-        let command: String;
-        let mut args: Option<Vec<String>> = None;
-        if split[0].is_empty() { split.remove(0); };
-        match split.len() {
-            0 => { Err(Box::new(Error::new(ErrorKind::InvalidInput, "NO_ARGS"))) } 
-            1 => Ok( Input { command: split[0].to_string(), args }),
-            2.. => {
-                command = split[0].to_string();
-                split.remove(0);
-                let mut str_args: Vec<String> = vec![];
-                for e in split {
-                    str_args.push(e.to_string());
+        
+        let mut direct_download = false;
+        let mut force_download = false;
+        let mut all_lists = false;
+        let mut delete_old = false;
+        let mut clean = false;
+
+        for (i, input) in split.clone().into_iter().enumerate() {
+            if input.starts_with("--") {
+                match input {
+                    "--direct-download" => direct_download = true,
+                    "--force-download" => force_download = true,
+                    "--all_lists" => all_lists = true,
+                    "--delete_old" => delete_old = true,
+                    "--clean" => clean = true,
+                    _ => continue,
                 }
-                args = Some(str_args);
-                Ok(Input { command, args })
-            },
-            _ => { panic!("This should never happen") } 
+                split.remove(i);
+            }
         }
+
+        let command = Cmd::from(split.remove(0))?;
+        let subcommand = match split.is_empty() {
+            false => Some(Subcmd::from(split.remove(0))?),
+            true => None
+        };
+        
+        let args = match split.is_empty() {
+            true => None,
+            false => {
+                let mut strsplit: Vec<String> = Vec::new();
+                for s in split {
+                    strsplit.push(String::from(s))
+                }
+                Some(strsplit)
+            }
+        };
+
+        Ok(Self { command, subcommand, args, direct_download, force_download, all_lists, delete_old, clean })
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Cmd {
+    Mod,
+    List,
+    Update,
+    Download,
+    Setup
+}
+
+impl Cmd {
+    pub fn from(string: &str) -> MLE<Self> {
+        let cmd = match string {
+            "mod" => Self::Mod,
+            "list" => Self::List,
+            "update" => Self::Update,
+            "download" => Self::Download,
+            "setup" => Self::Setup,
+            _ => return Err(MLError::new(ErrorType::ArgumentError, "Unknown command"))
+        };
+        Ok(cmd)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Subcmd {
+    Add,
+    Remove,
+    Change
+}
+
+impl Subcmd {
+    fn from(string: &str) -> MLE<Self> {
+        let cmd = match string {
+            "add" => Self::Add,
+            "remove" => Self::Remove,
+            "change" => Self::Change,
+            _ => return Err(MLError::new(ErrorType::ArgumentError, "SUBCMD_NOT_FOUND"))
+        };
+        Ok(cmd)
     }
 }
 
 pub async fn get_input(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
     let mut args: Vec<String> = env::args().collect();
-    dbg!(&args);
     args.reverse();
     args.pop();
     args.reverse();
-    dbg!(&args);
 
-    let input = Input::from(args.join(" "))?;
+    let input = Input::from(&args.join(" "))?;
 
-    match input.command.as_str() {
-        "mod" => { 
-            modification(config, input.args).await
+    match input.command {
+        Cmd::Mod => { 
+            modification(config, input).await
         },
-        "list" => {
-            list(config, input.args)
+        Cmd::List => {
+            list(config, input)
         },
-        "update" => {
-            update(config).await
+        Cmd::Update => {
+            update(config, input).await
         },
-        "setup" => {
+        Cmd::Setup => {
             setup(config).await
         },
-        "download" => {
+        Cmd::Download => {
             download(config).await
-        },
-        _ => Err(Box::new(Error::new(ErrorKind::InvalidInput, "UNKNOWN_COMMAND"))),
+        }
     }
 }
 
 #[test]
 fn input_from() {
-    let string = String::from("list add test 1.19.2 fabric");
-    let input = Input { command: String::from("list"), args: Some(vec![String::from("add"), String::from("test"), String::from("1.19.2"), String::from("fabric")]) };
+    let string = "lis add test 1.19.2 fabric";
+    let input = Input{ command: Cmd::List, subcommand: Some(Subcmd::Add), args: Some(vec![String::from("test"), String::from("1.19.2"), String::from("fabric")]), force_download: false, direct_download: false, all_lists: false };
     assert_eq!(Input::from(string).unwrap(), input);
 }
diff --git a/src/lib.rs b/src/lib.rs
index 1e7ebbf..51b4487 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,6 +3,7 @@ pub mod config;
 pub mod commands;
 pub mod input;
 pub mod db;
+pub mod error;
 
 use std::io::{Error, ErrorKind};
 
@@ -23,12 +24,11 @@ impl Modloader {
         }
     }
 
-}
-
-pub fn get_modloader(string: String) -> Result<Modloader, Box<dyn std::error::Error>> {
-    match string.as_str() {
-        "forge" => Ok(Modloader::Forge),
-        "fabric" => Ok(Modloader::Fabric),
-        _ => Err(Box::new(Error::new(ErrorKind::InvalidData, "UNKNOWN_MODLOADER")))
+    fn from(string: &str) -> Result<Modloader, Box<Error>> {
+        match string {
+            "forge" => Ok(Modloader::Forge),
+            "fabric" => Ok(Modloader::Fabric),
+            _ => Err(Box::new(Error::new(ErrorKind::InvalidData, "UNKNOWN_MODLOADER")))
+        }
     }
 }
diff --git a/tests/db.rs b/tests/db.rs
index 16061d0..7127fc6 100644
--- a/tests/db.rs
+++ b/tests/db.rs
@@ -1,4 +1,4 @@
-use std::{fs::{File, create_dir_all}, path::Path, sync::Once};
+use std::{fs::{File, create_dir_all, remove_dir_all}, path::Path, sync::Once};
 
 use modlist::{config::{Cfg, Apis}, db::{mods_insert, db_setup, mods_get_all_ids, mods_get_id, mods_remove, userlist_insert, lists_insert, userlist_get_all_ids, userlist_remove, mods_get_versions, userlist_get_applicable_versions, lists_remove, lists_get, lists_get_all_ids, userlist_get_all_current_version_ids, userlist_change_versions, s_userlist_update_download, userlist_get_all_downloads, config_change_current_list, config_get_current_list, s_config_update_version, s_config_create_version, s_config_get_version}, Modloader, List};
 
@@ -11,6 +11,7 @@ fn setup() -> Cfg {
     
     INIT.call_once(|| {
         let db_path = Path::new(db_pathstr);
+        if db_path.exists() { remove_dir_all(db_pathstr).unwrap(); };
         create_dir_all(db_path).unwrap();
         let db_filestr = format!("{}/data.db", db_pathstr);
         File::create(db_filestr).unwrap();
@@ -46,7 +47,7 @@ fn test_mods_get_all_ids() {
 fn test_mods_get_id() {
     let config = setup();
 
-    mods_insert(config.clone(), String::from("GI"), String::from("GETID_TEST"), vec![String::from("GI_VER1"), String::from("GI_VER2")]).unwrap();
+    mods_insert(config, String::from("GI"), String::from("GETID_TEST"), vec![String::from("GI_VER1"), String::from("GI_VER2")]).unwrap();
 }
 
 #[test]