1 files changed, 9 insertions, 22 deletions

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)
 }