Merge pull request 'config' (#4) from config into master

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

1 files changed, 12 insertions, 10 deletions

diff --git a/src/main.rs b/src/main.rs
index 53cbe71..3bc2ba0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,11 +3,9 @@ use modlist::{
     config::Cfg,
     db::{config_get_current_list, lists_get, lists_get_all_ids},
     download, export, get_current_list, import, list_add, list_change, list_remove, list_version,
-    mod_add, mod_remove, update, IDSelector, List, Modloader,
+    mod_add, mod_remove, update, IDSelector, List, Modloader, VersionLevel,
 };
 
-//TODO implement remote sql db
-
 //TODO make default list optional
 #[derive(Parser)]
 #[command(author, version, about)]
@@ -18,6 +16,10 @@ struct Cli {
     /// config file path
     #[arg(short, long)]
     config: Option<String>,
+
+    /// Force GameVersion update
+    #[arg(long)]
+    force_gameupdate: bool,
 }
 
 #[derive(Subcommand)]
@@ -72,6 +74,7 @@ enum Commands {
         /// the list you want to export
         list: Option<String>,
     },
+    Test
 }
 
 #[derive(Subcommand)]
@@ -147,7 +150,7 @@ enum ListCommands {
 async fn main() {
     let cli = Cli::parse();
 
-    let config = Cfg::init(cli.config).unwrap();
+    let config = Cfg::init(cli.config).await.unwrap();
 
     match cli.command {
         Commands::Mod { command } => {
@@ -201,15 +204,13 @@ async fn main() {
                 } => {
                     let ml = match modloader {
                         Some(ml) => Modloader::from(&ml).unwrap(),
-                        //TODO add default modloader to config
-                        None => Modloader::Fabric,
+                        None => config.clone().defaults.modloader,
                     };
 
+                    let versions_path = &config.versions;
                     let ver = match version {
-                        Some(ver) => ver,
-                        //TODO get latest version
-                        //TODO impl config for specific version or latest or latest snap
-                        None => "1.19.4".to_string(),
+                        Some(ver) => VersionLevel::from(&ver).get(versions_path, cli.force_gameupdate).await.unwrap(),
+                        None => config.clone().defaults.version.get(versions_path, cli.force_gameupdate).await.unwrap(),
                     };
 
                     list_add(config, id, ver, ml, directory)
@@ -263,6 +264,7 @@ async fn main() {
             import(config, filestr, download).await
         }
         Commands::Export { list } => export(config, list),
+        Commands::Test => Ok(()),
     }
     .unwrap();
 }