Merge pull request 'cache' (#3) from cache into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/3

11 files changed, 255 insertions, 228 deletions

diff --git a/src/cache.rs b/src/cache.rs
new file mode 100644
index 0000000..11645d1
--- /dev/null
+++ b/src/cache.rs
@@ -0,0 +1,37 @@
+use std::{
+    collections::HashMap,
+    fs::{copy, read_dir},
+};
+
+/// .
+///
+/// # Panics
+///
+/// Panics if .
+pub fn get_cached_versions(path: &str) -> HashMap<String, String> {
+    let mut versions: HashMap<String, String> = HashMap::new();
+    for file in read_dir(path).unwrap() {
+        let path = file.unwrap().path();
+        if path.is_file() && path.extension().ok_or("BAH").unwrap() == "jar" {
+            let pathstr = path.to_str().ok_or("BAH").unwrap();
+            let namesplit: Vec<&str> = pathstr.split('.').collect();
+            versions.insert(
+                String::from(namesplit[namesplit.len() - 2]),
+                String::from(pathstr),
+            );
+        }
+    }
+    versions
+}
+
+/// .
+///
+/// # Panics
+///
+/// Panics if .
+pub fn copy_cached_version(version_path: &str, download_path: &str) {
+    let versplit: Vec<&str> = version_path.split('/').collect();
+    let download = format!("{}{}", download_path, versplit[versplit.len() - 1]);
+    // println!("{:#?}", download);
+    copy(version_path, download).unwrap();
+}
diff --git a/src/commands/download.rs b/src/commands/download.rs
index 9434591..1a8eb8f 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -23,7 +23,7 @@ pub async fn download(config: Cfg, all_lists: bool, clean: bool, delete_old: boo
 
     for current_list in liststack {
         let downloaded_versions = get_downloaded_versions(current_list.clone())?;
-        println!("To download: {:#?}", downloaded_versions);
+        // println!("To download: {:#?}", downloaded_versions);
         let current_version_ids = match userlist_get_all_current_versions_with_mods(
             config.clone(),
             String::from(&current_list.id),
diff --git a/src/commands/io.rs b/src/commands/io.rs
index 7f03eec..82b30ce 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -5,7 +5,6 @@ use std::io::prelude::*;
 use crate::{
     config::Cfg,
     db::{lists_get, lists_get_all_ids, lists_insert, userlist_get_all_ids},
-    devdir,
     error::MLE,
     mod_add, IDSelector, List, Modloader,
 };
@@ -61,9 +60,7 @@ pub fn export(config: Cfg, list: Option<String>) -> MLE<()> {
 
     let filestr = dirs::home_dir().unwrap().join("mlexport.toml");
 
-    let mut file = File::create(devdir(
-        filestr.into_os_string().into_string().unwrap().as_str(),
-    ))?;
+    let mut file = File::create(filestr.into_os_string().into_string().unwrap().as_str())?;
     file.write_all(toml.as_bytes())?;
 
     Ok(())
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 1c7c012..0f13056 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -2,12 +2,10 @@ pub mod download;
 pub mod io;
 pub mod list;
 pub mod modification;
-pub mod setup;
 pub mod update;
 
 pub use download::*;
 pub use io::*;
 pub use list::*;
 pub use modification::*;
-pub use setup::*;
 pub use update::*;
diff --git a/src/commands/setup.rs b/src/commands/setup.rs
deleted file mode 100644
index 40e8c0a..0000000
--- a/src/commands/setup.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use std::{fs::File, path::Path};
-
-use crate::{config::Cfg, db::db_setup, devdir, error::MLE};
-
-pub async fn setup(config: Cfg) -> MLE<()> {
-    let db_file = devdir(format!("{}/data.db", config.data).as_str());
-
-    if !Path::new(&db_file).exists() {
-        create(config, db_file)?;
-    }
-
-    /*
-    match s_config_get_version(config.clone()) {
-        Ok(ver) => {
-            match ver.as_str() {
-                "0.2" => to_03(config)?,
-                "0.3" => to_04(config)?,
-                _ => return Err(MLError::new(ErrorType::Other, "UNKNOWN_VERSION"))
-            }
-        },
-        Err(..) => to_02(config).await?
-    };
-    */
-
-    Ok(())
-}
-
-fn create(config: Cfg, db_file: String) -> MLE<()> {
-    println!("Create database");
-
-    File::create(db_file)?;
-    db_setup(config)?;
-    Ok(())
-}
-
-//async fn to_02(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
-//    let lists = lists_get_all_ids(config.clone())?;
-//
-//    for list in lists {
-//        println!("Updating {}", list);
-//        s_insert_column(config.clone(), String::from(&list), String::from("current_download"), String::from("TEXT"), None)?;
-//
-//        let full_list = lists_get(config.clone(), String::from(&list))?;
-//
-//        let versions = userlist_get_all_current_version_ids(config.clone(), full_list.clone().id)?;
-//
-//        let raw_versions = get_raw_versions(String::from(&config.apis.modrinth), versions).await;
-//
-//        for ver in raw_versions {
-//            println!("Adding link for {}", ver.project_id);
-//            let file = ver.files.into_iter().find(|f| f.primary).unwrap();
-//            s_userlist_update_download(config.clone(), String::from(&full_list.id), ver.project_id, file.url)?;
-//        }
-//    };
-//    s_config_create_version(config)?;
-//
-//    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"), None)?;
-//    s_config_update_version(config, String::from("0.3"))
-//}
-//
-//fn to_04(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
-//    for list_id in lists_get_all_ids(config.clone())? {
-//        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"))
-//}
diff --git a/src/commands/update.rs b/src/commands/update.rs
index 3d9578b..4bc3ac0 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -156,52 +156,52 @@ async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> ML
     Ok(current[0].clone())
 }
 
-#[tokio::test]
-async fn download_updates_test() {
-    use crate::{
-        modrinth::{Hash, Version, VersionFile, VersionType},
-        List, Modloader,
-    };
-
-    let config = Cfg::init("modlist.toml").unwrap();
-    let current_list = List {
-        id: String::from("..."),
-        mc_version: String::from("..."),
-        modloader: Modloader::Fabric,
-        download_folder: String::from("./dev/tests/dl"),
-    };
-
-    let versions = vec![Version {
-            id: "dEqtGnT9".to_string(),
-            project_id: "kYuIpRLv".to_string(),
-            author_id: "Qnt13hO8".to_string(),
-            featured: true,
-            name: "1.2.2-1.19 - Fabric".to_string(),
-            version_number: "1.2.2-1.19".to_string(),
-            changelog: None,
-            date_published: "2022-11-02T17:41:43.072267Z".to_string(),
-            downloads: 58,
-            version_type: VersionType::release,
-            files: vec![VersionFile {
-                    hashes: Hash {
-                        sha1: "fdc6dc39427fc92cc1d7ad8b275b5b83325e712b".to_string(),
-                        sha512: "5b372f00d6e5d6a5ef225c3897826b9f6a2be5506905f7f71b9e939779765b41be6f2a9b029cfc752ad0751d0d2d5f8bb4544408df1363eebdde15641e99a849".to_string()
-                    },
-                    url: "https://cdn.modrinth.com/data/kYuIpRLv/versions/dEqtGnT9/waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
-                    filename: "waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
-                    primary: true,
-                    size: 323176
-            }],
-            game_versions: vec![
-                "1.19".to_string(),
-                "1.19.1".to_string(),
-                "1.19.2".to_string()
-            ],
-            loaders: vec![
-                "fabric".to_string()
-            ]
-        }];
-    assert!(download_versions(current_list, config, versions)
-        .await
-        .is_ok())
-}
+// #[tokio::test]
+// async fn download_updates_test() {
+//     use crate::{
+//         modrinth::{Hash, Version, VersionFile, VersionType},
+//         List, Modloader,
+//     };
+//
+//     let config = Cfg::init().unwrap();
+//     let current_list = List {
+//         id: String::from("..."),
+//         mc_version: String::from("..."),
+//         modloader: Modloader::Fabric,
+//         download_folder: String::from("./dev/tests/dl"),
+//     };
+//
+//     let versions = vec![Version {
+//             id: "dEqtGnT9".to_string(),
+//             project_id: "kYuIpRLv".to_string(),
+//             author_id: "Qnt13hO8".to_string(),
+//             featured: true,
+//             name: "1.2.2-1.19 - Fabric".to_string(),
+//             version_number: "1.2.2-1.19".to_string(),
+//             changelog: None,
+//             date_published: "2022-11-02T17:41:43.072267Z".to_string(),
+//             downloads: 58,
+//             version_type: VersionType::release,
+//             files: vec![VersionFile {
+//                     hashes: Hash {
+//                         sha1: "fdc6dc39427fc92cc1d7ad8b275b5b83325e712b".to_string(),
+//                         sha512: "5b372f00d6e5d6a5ef225c3897826b9f6a2be5506905f7f71b9e939779765b41be6f2a9b029cfc752ad0751d0d2d5f8bb4544408df1363eebdde15641e99a849".to_string()
+//                     },
+//                     url: "https://cdn.modrinth.com/data/kYuIpRLv/versions/dEqtGnT9/waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
+//                     filename: "waveycapes-fabric-1.2.2-mc1.19.2.jar".to_string(),
+//                     primary: true,
+//                     size: 323176
+//             }],
+//             game_versions: vec![
+//                 "1.19".to_string(),
+//                 "1.19.1".to_string(),
+//                 "1.19.2".to_string()
+//             ],
+//             loaders: vec![
+//                 "fabric".to_string()
+//             ]
+//         }];
+//     assert!(download_versions(current_list, config, versions)
+//         .await
+//         .is_ok())
+// }
diff --git a/src/config.rs b/src/config.rs
index 1b54d5f..61db1c7 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,15 +1,17 @@
 use std::{
-    fs::File,
+    fs::{create_dir_all, File},
     io::{Read, Write},
+    path::Path,
 };
 
 use serde::{Deserialize, Serialize};
 
-use crate::{devdir, error::MLE};
+use crate::{db::db_setup, error::MLE};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Cfg {
     pub data: String,
+    pub cache: String,
     pub apis: Apis,
 }
 
@@ -19,24 +21,22 @@ pub struct Apis {
 }
 
 impl Cfg {
-    pub fn init(filename: &str) -> MLE<Self> {
-        let configfile = dirs::config_dir().unwrap().join(filename);
+    pub fn init(path: Option<String>) -> MLE<Self> {
+        let configfile = match path.clone() {
+            Some(p) => String::from(p),
+            None => dirs::config_dir()
+                .unwrap()
+                .join("modlist.toml")
+                .to_string_lossy()
+                .to_string(),
+        };
 
-        let mut file = match File::open(devdir(configfile.to_str().unwrap())) {
+        let mut file = match File::open(&configfile) {
             Ok(file) => file,
             Err(err) => {
-                if err.kind() == std::io::ErrorKind::NotFound {
-                    println!("No config file found, creating one");
-                    let default_cfg = Cfg {
-                        data: String::from("./"),
-                        apis: Apis {
-                            modrinth: String::from("https://api.modrinth.com/v2/"),
-                        },
-                    };
-                    let mut file = File::create(devdir(configfile.to_str().unwrap()))?;
-                    println!("Created config file");
-                    file.write_all(toml::to_string(&default_cfg)?.as_bytes())?;
-                    File::open(devdir(configfile.to_str().unwrap()))?
+                if err.kind() == std::io::ErrorKind::NotFound && path.is_none() {
+                    create_config(&configfile)?;
+                    File::open(&configfile)?
                 } else {
                     return Err(err.into());
                 }
@@ -45,6 +45,56 @@ impl Cfg {
         let mut content = String::new();
         file.read_to_string(&mut content)?;
         let config = toml::from_str::<Cfg>(&content)?;
+        //Check cache
+        if !Path::new(&config.cache).exists() {
+            create_cache(&config.cache)?;
+        };
+        //Check database
+        //TODO check file
+        let datafile = format!("{}/data.db", config.data);
+        match File::open(&datafile) {
+            Ok(..) => (),
+            Err(..) => create_database(&datafile)?,
+        };
         Ok(config)
     }
 }
+
+fn create_config(path: &str) -> MLE<()> {
+    print!("No config file found, create default");
+    //Force flush of stdout, else print! doesn't print instantly
+    std::io::stdout().flush()?;
+    let default_cfg = Cfg {
+        //TODO get home dir
+        data: String::from("$HOME/.cache/modlist/"),
+        cache: String::from("$HOME/.cache/modlist/cache"),
+        apis: Apis {
+            modrinth: String::from("https://api.modrinth.com/v2/"),
+        },
+    };
+    let mut file = File::create(path)?;
+    file.write_all(toml::to_string(&default_cfg)?.as_bytes())?;
+    println!(" ✓");
+    Ok(())
+}
+
+fn create_database(path: &str) -> MLE<()> {
+    print!("No database found, create base");
+    //Force flush of stdout, else print! doesn't print instantly
+    std::io::stdout().flush()?;
+
+    File::create(path)?;
+    db_setup(path)?;
+    println!(" ✓");
+    Ok(())
+}
+
+fn create_cache(path: &str) -> MLE<()> {
+    print!("No cache direcory found, create one");
+    //Force flush of stdout, else print! doesn't print instantly
+    std::io::stdout().flush()?;
+
+    create_dir_all(path)?;
+    println!(" ✓");
+    Ok(())
+}
diff --git a/src/db.rs b/src/db.rs
index 09d54c2..abfe1dd 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -4,14 +4,13 @@ use rusqlite::Connection;
 
 use crate::{
     config::Cfg,
-    devdir,
     error::{ErrorType, MLError, MLE},
     List, Modloader,
 };
 
 //MODS
 pub fn mods_insert(config: Cfg, id: &str, slug: &str, name: &str) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -23,7 +22,7 @@ pub fn mods_insert(config: Cfg, id: &str, slug: &str, name: &str) -> MLE<()> {
 }
 
 pub fn mods_get_all_ids(config: Cfg) -> Result<Vec<String>, Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut mods: Vec<String> = Vec::new();
@@ -53,7 +52,7 @@ pub fn mods_get_all_ids(config: Cfg) -> Result<Vec<String>, Box<dyn std::error::
 pub fn mods_get_id(data: &str, slug: &str) -> MLE<String> {
     //TODO check if "slug" is id
 
-    let data = devdir(format!("{}/data.db", data).as_str());
+    let data = format!("{}/data.db", data);
     let connection = Connection::open(data)?;
 
     let mut mod_id = String::new();
@@ -88,7 +87,7 @@ pub struct ModInfo {
 }
 
 pub fn mods_get_info(config: Cfg, id: &str) -> MLE<ModInfo> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut mod_info: Option<ModInfo> = None;
@@ -117,7 +116,7 @@ pub fn mods_get_info(config: Cfg, id: &str) -> MLE<ModInfo> {
 pub fn mods_remove(config: Cfg, id: String) -> MLE<()> {
     println!("Removing mod {} from database", id);
 
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute("DELETE FROM mods WHERE id = ?", [id])?;
@@ -132,7 +131,7 @@ pub struct DBModlistVersions {
 }
 
 pub fn mods_get_versions(config: Cfg, mods: Vec<String>) -> MLE<Vec<DBModlistVersions>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     if mods.is_empty() {
@@ -188,7 +187,7 @@ pub fn userlist_insert(
     current_link: &str,
     set_version: bool,
 ) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let sv = match set_version {
@@ -215,7 +214,7 @@ pub fn userlist_insert(
 }
 
 pub fn userlist_get_all_ids(config: Cfg, list_id: String) -> MLE<Vec<String>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut mod_ids: Vec<String> = Vec::new();
@@ -234,7 +233,7 @@ pub fn userlist_get_all_ids(config: Cfg, list_id: String) -> MLE<Vec<String>> {
 }
 
 pub fn userlist_remove(config: Cfg, list_id: &str, mod_id: &str) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -249,7 +248,7 @@ pub fn userlist_get_applicable_versions(
     list_id: String,
     mod_id: String,
 ) -> MLE<String> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
@@ -276,7 +275,7 @@ pub fn userlist_get_all_applicable_versions_with_mods(
     config: Cfg,
     list_id: String,
 ) -> MLE<Vec<(String, String)>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<(String, String)> = Vec::new();
@@ -302,7 +301,7 @@ pub fn userlist_get_all_applicable_versions_with_mods(
 }
 
 pub fn userlist_get_current_version(config: Cfg, list_id: &str, mod_id: &str) -> MLE<String> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
@@ -324,7 +323,7 @@ pub fn userlist_get_all_current_version_ids(
     config: Cfg,
     list_id: String,
 ) -> Result<Vec<String>, Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<String> = Vec::new();
@@ -350,7 +349,7 @@ pub fn userlist_get_all_current_versions_with_mods(
     config: Cfg,
     list_id: String,
 ) -> Result<Vec<(String, String)>, Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<(String, String)> = Vec::new();
@@ -379,7 +378,7 @@ pub fn userlist_get_all_current_versions_with_mods(
 }
 
 pub fn userlist_get_set_version(config: Cfg, list_id: &str, mod_id: &str) -> MLE<bool> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut set_version: bool = false;
@@ -402,7 +401,7 @@ pub fn userlist_change_versions(
     link: String,
     mod_id: String,
 ) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(format!("UPDATE {} SET current_version = ?1, applicable_versions = ?2, current_download = ?3 WHERE mod_id = ?4", list_id).as_str(), [current_version, versions, link, mod_id])?;
@@ -415,7 +414,7 @@ pub fn userlist_add_disabled_versions(
     disabled_version: String,
     mod_id: String,
 ) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let currently_disabled_versions =
@@ -437,7 +436,7 @@ pub fn userlist_add_disabled_versions(
 }
 
 pub fn userlist_get_disabled_versions(config: Cfg, list_id: String, mod_id: String) -> MLE<String> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
@@ -459,7 +458,7 @@ pub fn userlist_get_all_downloads(
     config: Cfg,
     list_id: String,
 ) -> Result<Vec<String>, Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut links: Vec<String> = Vec::new();
@@ -494,7 +493,7 @@ pub fn lists_insert(
 ) -> MLE<()> {
     println!("Creating list {}", id);
 
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -512,7 +511,7 @@ pub fn lists_insert(
 }
 
 pub fn lists_remove(config: Cfg, id: String) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute("DELETE FROM lists WHERE id = ?", [&id])?;
@@ -521,7 +520,7 @@ pub fn lists_remove(config: Cfg, id: String) -> MLE<()> {
 }
 
 pub fn lists_get(config: Cfg, list_id: String) -> MLE<List> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut list = List {
@@ -559,7 +558,7 @@ pub fn lists_get(config: Cfg, list_id: String) -> MLE<List> {
 }
 
 pub fn lists_version(config: Cfg, list_id: &str, version: &str) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     connection.execute(
@@ -570,7 +569,7 @@ pub fn lists_version(config: Cfg, list_id: &str, version: &str) -> MLE<()> {
 }
 
 pub fn lists_get_all_ids(config: Cfg) -> MLE<Vec<String>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut list_ids: Vec<String> = Vec::new();
@@ -589,7 +588,7 @@ pub fn lists_get_all_ids(config: Cfg) -> MLE<Vec<String>> {
 
 //config
 pub fn config_change_current_list(config: Cfg, id: String) -> MLE<()> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -600,7 +599,7 @@ pub fn config_change_current_list(config: Cfg, id: String) -> MLE<()> {
 }
 
 pub fn config_get_current_list(config: Cfg) -> MLE<String> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data).unwrap();
 
     let mut list_id = String::new();
@@ -625,7 +624,7 @@ pub fn s_userlist_update_download(
     mod_id: String,
     link: String,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -640,7 +639,7 @@ pub fn s_userlist_update_download(
 }
 
 pub fn s_config_create_version(config: Cfg) -> Result<(), Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -651,7 +650,7 @@ pub fn s_config_create_version(config: Cfg) -> Result<(), Box<dyn std::error::Er
 }
 
 pub fn s_config_update_version(config: Cfg, ver: String) -> Result<(), Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     connection.execute(
@@ -662,7 +661,7 @@ pub fn s_config_update_version(config: Cfg, ver: String) -> Result<(), Box<dyn s
 }
 
 pub fn s_config_get_version(config: Cfg) -> Result<String, Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut version: String = String::new();
@@ -689,7 +688,7 @@ pub fn s_insert_column(
     c_type: String,
     default: Option<String>,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let data = devdir(format!("{}/data.db", config.data).as_str());
+    let data = format!("{}/data.db", config.data);
     let connection = Connection::open(data)?;
 
     let mut sql = format!("ALTER TABLE {} ADD '{}' {}", table, column, c_type);
@@ -702,11 +701,8 @@ pub fn s_insert_column(
     Ok(())
 }
 
-pub fn db_setup(config: Cfg) -> MLE<()> {
-    println!("Initiating database");
-
-    let data = devdir(format!("{}/data.db", config.data).as_str());
-    let connection = Connection::open(data)?;
+pub fn db_setup(path: &str) -> MLE<()> {
+    let connection = Connection::open(path)?;
 
     connection.execute_batch(
         "CREATE TABLE 'user_config' ( 'id' TEXT, 'value' TEXT );
diff --git a/src/files.rs b/src/files.rs
index 6160cb4..59fc7de 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -2,11 +2,12 @@ use futures_util::StreamExt;
 use reqwest::Client;
 use std::{
     collections::HashMap,
-    fs::{read_dir, remove_file, rename, File},
+    fs::{copy, read_dir, remove_file, rename, File},
     io::Write,
 };
 
 use crate::{
+    cache::{copy_cached_version, get_cached_versions},
     config::Cfg,
     db::{mods_get_info, userlist_add_disabled_versions},
     error::{ErrorType, MLError, MLE},
@@ -15,31 +16,62 @@ use crate::{
 };
 
 pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>) -> MLE<String> {
+    let mut cached = get_cached_versions(&config.cache);
+
+    println!("{:#?}", cached);
+
     let dl_path = String::from(&list.download_folder);
 
     println!("  └Download mods to {}", dl_path);
 
     for ver in versions {
         let project_info = mods_get_info(config.clone(), &ver.project_id)?;
-        print!("\t└({})Download version {}", project_info.title, ver.id);
-        //Force flush of stdout, else print! doesn't print instantly
-        std::io::stdout().flush().unwrap();
-        let primary_file = ver.files.into_iter().find(|file| file.primary).unwrap();
-        let mut splitname: Vec<&str> = primary_file.filename.split('.').collect();
-        let extension = match splitname.pop().ok_or("") {
-            Ok(e) => e,
-            Err(..) => return Err(MLError::new(ErrorType::Other, "NO_FILE_EXTENSION")),
-        };
-        let filename = format!(
-            "{}.mr.{}.{}.{}",
-            splitname.join("."),
-            ver.project_id,
-            ver.id,
-            extension
-        );
-        download_file(primary_file.url, list.clone().download_folder, filename).await?;
-        //tokio::time::sleep(std::time::Duration::new(3, 0)).await;
-        println!(" ✓");
+
+        //Check cache if already downloaded
+        let c = cached.remove(&ver.id);
+        if c.is_some() {
+            print!(
+                "\t└({})Get version {} from cache",
+                project_info.title, ver.id
+            );
+            //Force flush of stdout, else print! doesn't print instantly
+            std::io::stdout().flush()?;
+            copy_cached_version(&c.unwrap(), &dl_path);
+            println!(" ✓");
+        } else {
+            print!("\t└({})Download version {}", project_info.title, ver.id);
+            //Force flush of stdout, else print! doesn't print instantly
+            std::io::stdout().flush().unwrap();
+            let primary_file = ver.files.into_iter().find(|file| file.primary).unwrap();
+            let mut splitname: Vec<&str> = primary_file.filename.split('.').collect();
+            let extension = match splitname.pop().ok_or("") {
+                Ok(e) => e,
+                Err(..) => return Err(MLError::new(ErrorType::Other, "NO_FILE_EXTENSION")),
+            };
+            let filename = format!(
+                "{}.mr.{}.{}.{}",
+                splitname.join("."),
+                ver.project_id,
+                ver.id,
+                extension
+            );
+            download_file(
+                primary_file.url,
+                list.clone().download_folder,
+                filename.clone(),
+            )
+            .await?;
+            println!(" ✓");
+            //Copy file to cache
+            print!("\t  └Copy to cache");
+            //Force flush of stdout, else print! doesn't print instantly
+            std::io::stdout().flush().unwrap();
+            let dl_path_file = format!("{}/{}", list.download_folder, filename);
+            let cache_path = format!("{}/{}", &config.clone().cache, filename);
+            // println!("{}:{}", dl_path_file, cache_path);
+            copy(dl_path_file, cache_path)?;
+            println!(" ✓");
+        }
     }
 
     Ok(dl_path)
diff --git a/src/lib.rs b/src/lib.rs
index 43f0fe7..185edd7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,11 +1,12 @@
 pub mod apis;
+pub mod cache;
 pub mod commands;
 pub mod config;
 pub mod db;
 pub mod error;
 pub mod files;
 
-use std::{fmt::Display, path::Path};
+use std::fmt::Display;
 
 pub use apis::*;
 pub use commands::*;
@@ -35,17 +36,3 @@ impl Display for Modloader {
         }
     }
 }
-
-pub fn devdir(path: &str) -> String {
-    let p = Path::new(path);
-    let dev = std::env::var("DEV");
-    let lvl = match dev {
-        Ok(dev) => dev.parse::<i32>().unwrap(),
-        Err(..) => 0,
-    };
-    if lvl >= 1 {
-        format!("./dev/{}", p.file_name().unwrap().to_str().unwrap())
-    } else {
-        String::from(path)
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 2006856..0ecb850 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,8 +2,8 @@ use clap::{Parser, Subcommand};
 use modlist::{
     config::Cfg,
     db::{config_get_current_list, lists_get, lists_get_all_ids},
-    devdir, download, export, get_current_list, import, list_add, list_change, list_remove,
-    list_version, mod_add, mod_remove, update, IDSelector, List, Modloader,
+    download, export, get_current_list, import, list_add, list_change, list_remove, list_version,
+    mod_add, mod_remove, update, IDSelector, List, Modloader,
 };
 
 //TODO implement remote sql db
@@ -14,6 +14,10 @@ use modlist::{
 struct Cli {
     #[command(subcommand)]
     command: Commands,
+
+    /// config file path
+    #[arg(short, long)]
+    config: Option<String>,
 }
 
 #[derive(Subcommand)]
@@ -143,10 +147,9 @@ enum ListCommands {
 async fn main() {
     let cli = Cli::parse();
 
-    let config = Cfg::init("modlist.toml").unwrap();
+    let config = Cfg::init(cli.config).unwrap();
     println!("{:?}", config);
 
-    //TODO setup? maybe setup on install
     match cli.command {
         Commands::Mod { command } => {
             match command {
@@ -250,15 +253,12 @@ async fn main() {
         Commands::Import { file, download } => {
             let filestr: String = match file {
                 Some(args) => args,
-                None => devdir(
-                    dirs::home_dir()
-                        .unwrap()
-                        .join("mlexport.toml")
-                        .into_os_string()
-                        .into_string()
-                        .unwrap()
-                        .as_str(),
-                ),
+                None => dirs::home_dir()
+                    .unwrap()
+                    .join("mlexport.toml")
+                    .into_os_string()
+                    .into_string()
+                    .unwrap(),
             };
 
             import(config, filestr, download).await