fully added mod remove; fixed update from NONE

1 files changed, 17 insertions, 2 deletions

diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index ac23970..f36c8c6 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,6 +1,6 @@
 use std::io::{Error, ErrorKind};
 
-use crate::{modrinth::{project, versions, extract_current_version, 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, download_versions};
+use crate::{modrinth::{project, versions, extract_current_version, Version}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, mods_get_all_ids, userlist_get_all_ids, userlist_get_current_version, lists_get_all_ids, mods_remove}, input::{Input, Subcmd}, get_current_list, download_versions, files::delete_version};
 
 pub async fn modification(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
     
@@ -87,6 +87,21 @@ fn remove(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Erro
     let current_list = get_current_list(config.clone())?;
     let mod_id = mods_get_id(config.clone(), String::from(&args[0]))?;
     
+    let version = userlist_get_current_version(config.clone(), String::from(&current_list.id), String::from(&mod_id))?;
+
     //TODO implement remove from modlist if not in any other lists && config clean is true
-    userlist_remove(config, current_list.id, mod_id)
+    userlist_remove(config.clone(), String::from(&current_list.id), String::from(&mod_id))?;
+    delete_version(current_list, version)?;
+    
+    let list_ids = lists_get_all_ids(config.clone())?;
+    
+    let mut mod_used = false;
+    for id in list_ids {
+        let mods = userlist_get_all_ids(config.clone(), id)?;
+        if mods.contains(&mod_id) { mod_used = true; break; };
+    };
+
+    if !mod_used { mods_remove(config, mod_id)?; };
+
+    Ok(())
 }