add auto create dirs, database and default config

9 files changed, 63 insertions, 98 deletions

diff --git a/.gitignore b/.gitignore
index 390e3b2..343357f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 .planmodlist.autosave.xopp
 data.db.cp
 export.toml
-config.toml
+modlist.toml
 /dev
 /.fleet
-/.vscode
\ No newline at end of file
+/.vscode
diff --git a/cache b/cache
deleted file mode 100644
index 22c613c..0000000
--- a/cache
+++ /dev/null
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/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 34da2f8..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, error::MLE};
-
-pub async fn setup(config: Cfg) -> MLE<()> {
-    let db_file = format!("{}/data.db", config.data);
-
-    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/config.rs b/src/config.rs
index 23c7796..817d22b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,11 +1,11 @@
 use std::{
-    fs::File,
-    io::{Read, Write},
+    fs::{File, create_dir_all},
+    io::{Read, Write}, path::Path,
 };
 
 use serde::{Deserialize, Serialize};
 
-use crate::error::MLE;
+use crate::{error::MLE, db::db_setup};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Cfg {
@@ -21,26 +21,16 @@ pub struct Apis {
 
 impl Cfg {
     pub fn init(path: Option<String>) -> MLE<Self> {
-        let configfile = match path {
+        let configfile = match path.clone() {
             Some(p) => String::from(p),
-            None => dirs::config_dir().unwrap().join("modlist.toml").to_string_lossy().into(),
+            None => dirs::config_dir().unwrap().join("modlist.toml").to_string_lossy().to_string(),
         };
 
         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("~/.cache/modlist/"),
-                        cache: String::from("~/.cache/modlist/cache"),
-                        apis: Apis {
-                            modrinth: String::from("https://api.modrinth.com/v2/"),
-                        },
-                    };
-                    let mut file = File::create(&configfile)?;
-                    println!("Created config file");
-                    file.write_all(toml::to_string(&default_cfg)?.as_bytes())?;
+                if err.kind() == std::io::ErrorKind::NotFound && path.is_none() {
+                    create_config(&configfile)?;
                     File::open(&configfile)?
                 } else {
                     return Err(err.into());
@@ -50,6 +40,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 2ffcff5..36fab75 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -701,11 +701,9 @@ pub fn s_insert_column(
     Ok(())
 }
 
-pub fn db_setup(config: Cfg) -> MLE<()> {
-    println!("Initiating database");
+pub fn db_setup(path: &str) -> MLE<()> {
 
-    let data = format!("{}/data.db", config.data);
-    let connection = Connection::open(data)?;
+    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 0b5bc3f..a73fc18 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -32,7 +32,7 @@ pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>)
         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().unwrap();
+            std::io::stdout().flush()?;
             copy_cached_version(&c.unwrap(), &dl_path);
             println!(" ✓");
         } else {
diff --git a/src/main.rs b/src/main.rs
index 957e7c9..30c4001 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -150,7 +150,6 @@ async fn main() {
     let config = Cfg::init(cli.config).unwrap();
     println!("{:?}", config);
 
-    //TODO setup? maybe setup on install
     match cli.command {
         Commands::Mod { command } => {
             match command {