Merge pull request #3 from FxQnLr/new_input

New input, fuck it

7 files changed, 123 insertions, 164 deletions

diff --git a/src/commands/download.rs b/src/commands/download.rs
index b958bf3..7748d15 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,7 +1,7 @@
-use crate::{files::{get_downloaded_versions, download_versions, delete_version, disable_version}, db::{userlist_get_all_current_versions_with_mods, lists_get_all_ids, lists_get}, modrinth::get_raw_versions};
+use crate::{files::{get_downloaded_versions, download_versions, delete_version, disable_version, clean_list_dir}, db::{userlist_get_all_current_versions_with_mods, lists_get_all_ids, lists_get}, modrinth::get_raw_versions, error::{MLE, ErrorType, MLError}};
 use crate::{List, get_current_list, config::Cfg, input::Input};
 
-pub async fn download(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn download(config: Cfg, input: Input) -> MLE<()> {
 
     let mut liststack: Vec<List> = vec![];
     if input.all_lists {
@@ -18,7 +18,10 @@ pub async fn download(config: Cfg, input: Input) -> Result<(), Box<dyn std::erro
     for current_list in liststack {
         let downloaded_versions = get_downloaded_versions(current_list.clone())?;
         println!("To download: {:#?}", downloaded_versions);
-        let current_version_ids = userlist_get_all_current_versions_with_mods(config.clone(), String::from(&current_list.id))?;
+        let current_version_ids = match userlist_get_all_current_versions_with_mods(config.clone(), String::from(&current_list.id)) {
+            Ok(i) => Ok(i),
+            Err(e) => Err(MLError::new(ErrorType::DBError, e.to_string().as_str())),
+        }?;
 
         let mut to_download: Vec<String> = vec![];
         //(mod_id, version_id)
@@ -33,7 +36,7 @@ pub async fn download(config: Cfg, input: Input) -> Result<(), Box<dyn std::erro
             if current_download.is_none() || input.clean {
                 to_download.push(current_version);
             } else {
-                let downloaded_version = current_download.ok_or("SOMETHING_HAS_REALLY_GONE_WRONG")?;
+                let downloaded_version = current_download.ok_or("SOMETHING_HAS_REALLY_GONE_WRONG").unwrap();
                 if &current_version != downloaded_version {
                     to_disable.push((mod_id.clone(), String::from(downloaded_version)));
                     to_download.push(current_version);
@@ -41,17 +44,10 @@ pub async fn download(config: Cfg, input: Input) -> Result<(), Box<dyn std::erro
             }
         }
         
-        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())?;
-            }
-        }
+        if input.clean { clean_list_dir(&current_list)? };
 
         if !to_download.is_empty() {
-            download_versions(current_list.clone(), get_raw_versions(String::from(&config.apis.modrinth), to_download).await).await?;
+            download_versions(current_list.clone(), config.clone(), get_raw_versions(String::from(&config.apis.modrinth), to_download).await).await?;
         } else {
             println!("There are no new versions to download");
         }
diff --git a/src/commands/io.rs b/src/commands/io.rs
index 6c4a4d3..4835e3d 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::prelude::*;
 use serde::{Serialize, Deserialize};
 
-use crate::{input::{Input, Subcmd}, db::{lists_get, userlist_get_all_ids, lists_get_all_ids, lists_insert}, config::Cfg, Modloader, mod_add, List, devdir};
+use crate::{input::{Input, IoOptions}, db::{lists_get, userlist_get_all_ids, lists_get_all_ids, lists_insert}, config::Cfg, Modloader, /*mod_add,*/ List, devdir, error::MLE};
 
 #[derive(Debug, Serialize, Deserialize)]
 struct Export {
@@ -19,7 +19,7 @@ struct ExportList {
 }
 
 impl ExportList {
-    pub fn from(config: Cfg, list_id: String, download: bool) -> Result<Self, Box<dyn std::error::Error>> {
+    pub fn from(config: Cfg, list_id: String, download: bool) -> MLE<Self> {
 
         let list = lists_get(config.clone(), String::from(&list_id))?;
 
@@ -32,26 +32,22 @@ impl ExportList {
     }
 }
 
-pub async fn io(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn io(config: Cfg, input: Input) -> MLE<()> {
     
-    match input.subcommand.clone().ok_or("INVALID_INPUT")? {
-        Subcmd::Export => { export(config, input)? },
-        Subcmd::Import => { import(config, input.args).await? },
-        _ => { },
+    match input.clone().io_options.unwrap() {
+        IoOptions::Export => { export(config, input)? },
+        IoOptions::Import => { import(config, input).await? },
     }
 
     Ok(())
 }
 
-fn export(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
+fn export(config: Cfg, input: Input) -> MLE<()> {
     let mut list_ids: Vec<String> = vec![];
     if input.all_lists {
         list_ids = lists_get_all_ids(config.clone())?;
     } else {
-        let args = input.args.ok_or("NO_ARGS")?;
-        for arg in args {
-            list_ids.push(lists_get(config.clone(), arg)?.id);
-        }
+        list_ids.push(lists_get(config.clone(), input.list.unwrap().id)?.id);
     }
     let mut lists: Vec<ExportList> = vec![];
     for list_id in list_ids {
@@ -68,10 +64,10 @@ fn export(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-async fn import(config: Cfg, args: Option<Vec<String>>) -> Result<(), Box<dyn std::error::Error>> {
+async fn import(config: Cfg, input: Input) -> MLE<()> {
     
-    let filestr: String = match args {
-        Some(args) => String::from(&args[0]),
+    let filestr: String = match input.file {
+        Some(args) => String::from(args),
         None => String::from(devdir(dirs::home_dir().unwrap().join("mlexport.toml").into_os_string().into_string().unwrap().as_str())),
     };
 
@@ -83,14 +79,14 @@ async fn import(config: Cfg, args: Option<Vec<String>>) -> Result<(), Box<dyn st
     println!("{:#?}", export);
 
     for exportlist in export.lists {
-        let list = List { id: exportlist.id, mc_version: exportlist.mc_version, modloader: Modloader::from(&exportlist.launcher)?, download_folder: exportlist.download_folder.ok_or("NO_DL")? };
+        let list = List { id: exportlist.id, mc_version: exportlist.mc_version, modloader: Modloader::from(&exportlist.launcher)?, download_folder: exportlist.download_folder.ok_or("NO_DL").unwrap() };
         lists_insert(config.clone(), list.id.clone(), list.mc_version.clone(), list.modloader.clone(), String::from(&list.download_folder))?;
         let mods: Vec<&str> = exportlist.mods.split("|").collect();
         let mut mod_ids = vec![];
         for mod_id in mods {
             mod_ids.push(String::from(mod_id));
         };
-        mod_add(config.clone(), mod_ids, list.clone(), false).await?;
+        //mod_add(config.clone(), mod_ids, list.clone(), false).await?;
     }
     Ok(())
 }
diff --git a/src/commands/list.rs b/src/commands/list.rs
index 3998cce..eaf6fa1 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -1,6 +1,4 @@
-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, lists_version}, Modloader, config::Cfg, input::{Input, Subcmd}, cmd_update, error::{MLE, ErrorType, MLError}, modrinth::MCVersionType};
+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};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct List {
@@ -10,32 +8,20 @@ pub struct List {
     pub download_folder: String,
 }
 
-pub async fn list(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn list(config: Cfg, input: Input) -> MLE<()> {
 
-    match input.subcommand.ok_or("")? {
-        Subcmd::Add => {
-            match add(config, input.args.ok_or("")?) {
-                Ok(..) => Ok(()),
-                Err(e) => Err(Box::new(e))
-            }
+    match input.clone().list_options.unwrap() {
+        ListOptions::Add => {
+            add(config, input)
         },
-        Subcmd::Change => {
-            change(config, input.args)
+        ListOptions::Change => {
+            change(config, input)
         },
-        Subcmd::Remove => {
-            match remove(config, input.args.ok_or("")?) {
-                Ok(..) => Ok(()),
-                Err(e) => Err(Box::new(e))
-            }
+        ListOptions::Remove => {
+            remove(config, input)
         },
-        Subcmd::Version => {
-            match version(config, Some(input.args.ok_or("NO_VERSION")?), Some(MCVersionType::Release)).await {
-                Ok(..) => Ok(()),
-                Err(e) => Err(Box::new(e))
-            }
-        }
-        _ => {
-            Err(Box::new(Error::new(ErrorKind::InvalidInput, "WRONG_SUBCOMMAND")))
+        ListOptions::Version => {
+            version(config, input).await
         }
     }
 }
@@ -45,42 +31,21 @@ pub fn get_current_list(config: Cfg) -> MLE<List> {
     lists_get(config, id)
 }
 
-fn add(config: Cfg, args: Vec<String>) -> MLE<()> {
-    match args.len() {
-        1 | 2 | 3 => Err(MLError::new(ErrorType::ArgumentCountError, "TOO_FEW_ARGUMENTS")),
-        4 => {
-            let id = String::from(&args[0]);
-            let mc_version = String::from(&args[1]);
-            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(MLError::new(ErrorType::ArgumentCountError, "TOO_MANY_ARGUMENTS")),
-        _ => panic!("list arguments should never be zero or lower"),
-    }
+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)
 }
 
-fn change(config: Cfg, args: Option<Vec<String>>) -> Result<(), Box<dyn std::error::Error>> {
-    let lists = lists_get_all_ids(config.clone())?;
-    if args.is_none() { println!("Currently selected list: {}", get_current_list(config)?.id); return Ok(()) };
-    let argsvec = args.ok_or("BAH")?;
-    match argsvec.len() {
-        1 => {
-            let list = String::from(&argsvec[0]);
-            if !lists.contains(&list) { return Err(Box::new(Error::new(ErrorKind::NotFound, "LIST_DOESNT_EXIST"))); };
-            config_change_current_list(config, list)
-        },
-        2.. => Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_MANY_ARGUMENTS"))),
-        _ => panic!("list arguments should never lower than zero"),
-    }
+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)
 }
 
-fn remove(config: Cfg, args: Vec<String>) -> MLE<()> {
-    match args.len() {
-        1 => lists_remove(config, String::from(&args[0])),
-        2.. => Err(MLError::new(ErrorType::ArgumentCountError, "TOO_MANY_ARGUMENTS")),
-        _ => panic!("list arguments should never be zero or lower"),
-    }
+fn remove(config: Cfg, input: Input) -> MLE<()> {
+    lists_remove(config, input.list.unwrap().id)
 }
 
 ///Changing the current lists version and updating it
@@ -88,10 +53,14 @@ fn remove(config: Cfg, args: Vec<String>) -> MLE<()> {
 /// 
 /// * `config` - The current config
 /// * `args` - All args, to extract the new version
-async fn version(config: Cfg, args: Option<Vec<String>>, version_type: Option<MCVersionType>) -> MLE<()> {
-    let current_list = lists_get(config.clone(), config_get_current_list(config.clone())?)?;
+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());
+
+    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(), String::from(&current_list.id), String::from(&args.unwrap()[0]))?;
-    //update the list & with -- args
-    cmd_update(config, vec![current_list], true, true, false).await
+    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
 }
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 0d5bd00..38139f9 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,13 +1,13 @@
 pub mod modification;
 pub mod list;
 pub mod update;
-pub mod setup;
+//pub mod setup;
 pub mod download;
 pub mod io;
 
 pub use modification::*;
 pub use list::*;
 pub use update::*;
-pub use setup::*;
+//pub use setup::*;
 pub use download::*;
 pub use io::*;
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 7d4be8d..c82d6b5 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,34 +1,26 @@
-use std::io::{Error, ErrorKind};
+use crate::{modrinth::{project, versions, extract_current_version, Version, projects}, 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, ModOptions}, files::{delete_version, download_versions}, List, error::{MLE, ErrorType, MLError}};
 
-use crate::{modrinth::{project, versions, extract_current_version, Version, projects}, 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, files::{delete_version, download_versions}, List};
-
-pub async fn modification(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
-    match input.subcommand.as_ref().ok_or("")? {
-        Subcmd::Add => {
+pub async fn modification(config: Cfg, input: Input) -> MLE<()> {
+    match input.clone().mod_options.ok_or("").unwrap() {
+        ModOptions::Add => {
             add(config, input).await
         },
-        Subcmd::Remove => {
-            remove(config, input.args.ok_or("")?)
+        ModOptions::Remove => {
+            remove(config, input)
         },
-        _ => Err(Box::new(Error::new(ErrorKind::InvalidInput, "SUBCOMMAND_NOT_AVAILABLE")))
     }
 }
 
-async fn add(config: Cfg, input: Input) -> Result<(), Box<dyn std::error::Error>> {
-
-    let args = input.args.ok_or("")?;
+async fn add(config: Cfg, input: Input) -> MLE<()> {
 
-    if args.is_empty() { return Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))); };
-    
-    let current_list = get_current_list(config.clone())?;
-    
-    mod_add(config, vec![String::from(&args[0])], current_list, input.disable_download).await?;
+    mod_add(config, vec![String::from(input.mod_id.unwrap())], input.list.unwrap(), input.direct_download).await?;
 
     Ok(())
 }
 
-pub async fn mod_add(config: Cfg, mod_id: Vec<String>, list: List, disable_download: bool) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn mod_add(config: Cfg, mod_id: Vec<String>, list: List, direct_download: bool) -> MLE<()> {
     
+    //Fix printing (its horrible)
     println!("Adding mod(s) {:?}", mod_id);
     let projects = if mod_id.len() == 1 {
         vec![project(String::from(&config.apis.modrinth), &mod_id[0]).await]
@@ -50,7 +42,7 @@ pub async fn mod_add(config: Cfg, mod_id: Vec<String>, list: List, disable_downl
 
             current_version_id = current_version.clone().unwrap().id;
 
-            file = current_version.clone().ok_or("VERSION_CORRUPTED")?.files.into_iter().find(|f| f.primary).unwrap().url;
+            file = current_version.clone().ok_or("").unwrap().files.into_iter().find(|f| f.primary).unwrap().url;
 
             for ver in available_versions {
                 available_versions_vec.push(ver.id);
@@ -67,7 +59,7 @@ pub async fn mod_add(config: Cfg, mod_id: Vec<String>, list: List, disable_downl
         match userlist_get_all_ids(config.clone(), list.clone().id) {
             Ok(mods) => {
                 if mods.contains(&project.id) {
-                    return Err(Box::new(Error::new(ErrorKind::Other, "MOD_ALREADY_ON_LIST"))); } 
+                    return Err(MLError::new(ErrorType::ModError, "MOD_ALREADY_ON_LIST")); }
                 else {
                     userlist_insert(config.clone(), String::from(&list.id), String::from(&project.id), String::from(&current_version_id), available_versions_vec, file)?;
                 } 
@@ -88,24 +80,23 @@ pub async fn mod_add(config: Cfg, mod_id: Vec<String>, list: List, disable_downl
             },
         };
 
-        if !disable_download && current_version.is_some() { download_versions(list.clone(), vec![current_version.unwrap()]).await?; };
+        if direct_download && current_version.is_some() { download_versions(list.clone(), config.clone(), vec![current_version.unwrap()]).await?; };
             
     }
 
     Ok(())
 }
 
-fn remove(config: Cfg, args: Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
-    if args.is_empty() { return Err(Box::new(Error::new(ErrorKind::InvalidInput, "TOO_FEW_ARGUMENTS"))); };
-
-    let current_list = get_current_list(config.clone())?;
-    let mod_id = mods_get_id(config.clone(), String::from(&args[0]))?;
+fn remove(config: Cfg, input: Input) -> MLE<()> {
+    
+    //TODO inplement deletion by slug or title
+    let mod_id = mods_get_id(config.clone(), input.clone().mod_id.unwrap())?;
     
-    let version = userlist_get_current_version(config.clone(), String::from(&current_list.id), String::from(&mod_id))?;
+    let version = userlist_get_current_version(config.clone(), input.clone().list.unwrap().id, String::from(&mod_id))?;
 
     //TODO implement remove from modlist if not in any other lists && config clean is true
-    userlist_remove(config.clone(), String::from(&current_list.id), String::from(&mod_id))?;
-    delete_version(current_list, version)?;
+    userlist_remove(config.clone(), input.clone().list.unwrap().id, String::from(&mod_id))?;
+    delete_version(input.list.unwrap(), version)?;
     
     let list_ids = lists_get_all_ids(config.clone())?;
     
diff --git a/src/commands/setup.rs b/src/commands/setup.rs
index e4fa801..cc7472c 100644
--- a/src/commands/setup.rs
+++ b/src/commands/setup.rs
@@ -63,4 +63,4 @@ fn to_04(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
         s_insert_column(config.clone(), list_id, String::from("disabled_versions"), String::from("TEXT"), Some(String::from("NONE")))?;
     }
     s_config_update_version(config, String::from("0.4"))
-}
+}
\ No newline at end of file
diff --git a/src/commands/update.rs b/src/commands/update.rs
index ca28130..d400a24 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -1,9 +1,6 @@
-use std::io::{Error, ErrorKind};
-
-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, lists_get_all_ids, lists_get, userlist_get_current_version, mods_change_versions}, List, input::Input, files::{delete_version, download_versions, disable_version}, error::{MLE, MLError, ErrorType}};
+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, lists_get_all_ids, lists_get, userlist_get_current_version, mods_change_versions}, List, input::Input, files::{delete_version, download_versions, disable_version, clean_list_dir}, error::{MLE, MLError, ErrorType}};
 
 pub async fn update(config: Cfg, input: Input) -> MLE<()> {
-    
     let mut liststack: Vec<List> = vec![];
     if input.all_lists {
         let list_ids = lists_get_all_ids(config.clone())?;
@@ -12,10 +9,9 @@ pub async fn update(config: Cfg, input: Input) -> MLE<()> {
         }
     } else {
         let current = get_current_list(config.clone())?;
-        println!("Checking for updates of mods in {}", current.id);
+        println!("Check for updates of mods in list {}", current.id);
         liststack.push(current)
     }
-    
     cmd_update(config, liststack, input.clean, input.direct_download, input.delete_old).await
 }
 
@@ -31,6 +27,7 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
         let mut projects = projects(String::from(&config.apis.modrinth), mods).await;
         projects.sort_by_key(|pro| pro.id.clone());
 
+        println!("Comparing mod versions:");
         let mut updatestack: Vec<Version> = vec![];
         for (index, project) in projects.into_iter().enumerate() {
             //Get versions for project and check if they match up
@@ -39,6 +36,8 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
             let v_id = &current_version.mod_id;
             if &p_id != v_id { return Err(MLError::new(ErrorType::Other, "SORTING_ERROR")) };
             
+            println!("\t({}) Check for update", project.title);
+    
             //Getting current installed version for disable or delete
             let disable_version = userlist_get_current_version(config.clone(), String::from(&current_list.id), String::from(&project.id))?;
             
@@ -51,51 +50,52 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
                         current_versions.push((disable_version, p_id));
                         ver
                     },
-                    //TODO handle errors (only continue on "NO_UPDATE_AVAILABLE")
-                    Err(..) => {
-                        //Updating versions in modlist for no repeating version calls
-                        mods_change_versions(config.clone(), version_db_string, project.id)?;
-                        println!("({}) No new version found for the specified", project.title);
+                    Err(e) => {
+                        //Catch no update available
+                        if e.to_string() == "Mod: NO_UPDATE_AVAILABLE" {
+                            mods_change_versions(config.clone(), version_db_string, project.id)?;
+                            println!("\t └No new version found for the specified minecraft version");
+                        } else {
+                            return Err(e);
+                        };
                         continue;
                     },
                 });
             } else {
-                println!("({}) No new version found", project.title);
+                println!("\t └No new version found");
             };
         };
+        
+        //Linebreak readability
+        println!("");
 
-        if 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())?;
-            }
-        }
+        if clean { clean_list_dir(&current_list)? };
         
-        if direct_download {
-            download_versions(current_list.clone(), updatestack).await?;
+        //Linebreak readability
+        println!("");
+
+        if direct_download && !updatestack.is_empty() {
+            download_versions(current_list.clone(), config.clone(), updatestack).await?;
 
             //Disable old versions
-            for ver in current_versions {
-                if delete_old {
-                    println!("Deleting version {} for mod {}", ver.0, ver.1);
-                    delete_version(current_list.clone(), ver.0)?;
-                } else if ver.0 != "NONE" { 
-                    println!("Disabling version {} for mod {}", ver.0, ver.1);
-                    disable_version(config.clone(), current_list.clone(), ver.0, ver.1)?;
-                };
+            if !clean {
+                for ver in current_versions {
+                    if delete_old {
+                        println!("Deleting version {} for mod {}", ver.0, ver.1);
+                        delete_version(current_list.clone(), ver.0)?;
+                    } else if ver.0 != "NONE" { 
+                        println!("Disabling version {} for mod {}", ver.0, ver.1);
+                        disable_version(config.clone(), current_list.clone(), ver.0, ver.1)?;
+                    };
+                }
             }
         };
-        
     }
 
     Ok(())
 }
 
-async fn specific_update(config: Cfg, clean: bool, list: List, project: Project) -> Result<Version, Box<dyn std::error::Error>> {
-    println!("Checking update for '{}' in {}", project.title, list.id);
-    
+async fn specific_update(config: Cfg, clean: bool, list: List, project: Project) -> MLE<Version> {
     let applicable_versions = versions(String::from(&config.apis.modrinth), String::from(&project.id), list.clone()).await;
     
     let mut versions: Vec<String> = vec![];
@@ -112,18 +112,24 @@ async fn specific_update(config: Cfg, clean: bool, list: List, project: Project)
     let mut current: Vec<Version> = vec![];
     if clean || (versions.join("|") != userlist_get_applicable_versions(config.clone(), String::from(&list.id), String::from(&project.id))?) {
         //get new versions
-        print!(" | getting new version");
+        println!("\t └Get versions for specified minecraft versions");
         let current_str = extract_current_version(applicable_versions.clone())?;
-        let current_ver = applicable_versions.into_iter().find(|ver| ver.id == current_str).ok_or("")?;
+        let current_ver = match applicable_versions.into_iter().find(|ver| ver.id == current_str).ok_or("!no current version in applicable_versions") {
+            Ok(v) => Ok(v),
+            Err(e) => Err(MLError::new(ErrorType::Other, e)),
+        }?;
         current.push(current_ver.clone());
 
-        let link = current_ver.files.into_iter().find(|f| f.primary).ok_or("")?.url;
+        let link = match current_ver.files.into_iter().find(|f| f.primary).ok_or("!no primary in links") {
+            Ok(p) => Ok(p),
+            Err(e) => Err(MLError::new(ErrorType::Other, e)),
+        }?.url;
         userlist_change_versions(config, list.id, current_str, versions.join("|"), link, project.id)?;
     }
 
-    if current.is_empty() { return Err(Box::new(Error::new(ErrorKind::NotFound, "NO_UPDATE_AVAILABLE"))) };
+    if current.is_empty() { return Err(MLError::new(ErrorType::ModError, "NO_UPDATE_AVAILABLE")) };
     
-    println!(" | ✔️");
+    //println!(" ������️");
     Ok(current[0].clone())
 }
 
@@ -132,6 +138,7 @@ async fn download_updates_test() {
 
     use crate::{modrinth::{Version, VersionFile, Hash, VersionType}, Modloader, List};
     
+    let config = Cfg::init("modlist.toml").unwrap();
     let current_list = List { id: String::from("..."), mc_version: String::from("..."), modloader: Modloader::Forge, download_folder: String::from("./dl") }; 
 
     let versions = vec![Version { 
@@ -164,5 +171,5 @@ async fn download_updates_test() {
                 "fabric".to_string()
             ]
         }];
-    assert!(download_versions(current_list, versions).await.is_ok())
+    assert!(download_versions(current_list, config, versions).await.is_ok())
 }