Sad bugs fixed and work on cli

cli/Cargo.toml

@@ -4,3 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+clap = { version = "4.1.8", features = ["derive", "env", "string", "debug"] }
+tokio = { version = "1.26.0", features = ["full"] }
+wormhole-common = { path = "../common" }

cli/src/cli.rs

@@ -0,0 +1,50 @@
+use clap::{Parser, Subcommand};
+
+#[derive(Parser, Debug, Clone, Copy)]
+#[command(author, version, about, long_about = None)]
+pub struct Cli {
+    #[arg(short, long)]
+    pub verbose: bool,
+
+    #[command(subcommand)]
+    pub command: Option<Commands>,
+}
+
+#[derive(Subcommand, Debug, Clone, Copy)]
+pub enum Commands {
+    Mod {
+        #[command(subcommand)]
+        command: Option<ModCommands>,
+    },
+
+    Instance {
+        #[command(subcommand)]
+        command: Option<InstanceCommands>,
+    },
+}
+
+#[derive(Subcommand, Debug, Clone, Copy)]
+pub enum ModCommands {
+    Install {
+        id: i32,
+        instance_id: Option<i32>,
+    },
+
+    Info {
+        id: i32,
+        instance_id: Option<i32>,
+    },
+
+    Remove {
+        id: i32,
+        instance_id: Option<i32>,
+    },
+}
+
+#[derive(Subcommand, Debug, Clone, Copy)]
+pub enum InstanceCommands {
+    List {},
+    Create {},
+    Delete {},
+    Info {},
+}

cli/src/commands/mod.rs

@@ -0,0 +1 @@
+pub mod mods;

cli/src/commands/mods/install.rs

@@ -0,0 +1,19 @@
+use wormhole_common::{installer::mods::ModInstaller, finder::find_install_dir};
+
+pub async fn install_mod(id: i32, verbose: bool) {
+    if verbose {
+        println!("Creating mod installer...");
+    }
+
+    let installer = ModInstaller::new(find_install_dir());
+
+    if verbose {
+        println!("Installing mod...");
+    }
+
+    installer.install_from_spacedock(id).await;
+
+    if verbose {
+        println!("Mod installed!");
+    }
+}

cli/src/commands/mods/mod.rs

@@ -0,0 +1 @@
+pub mod install;

cli/src/main.rs

@@ -1,3 +1,35 @@
-fn main() {
-    println!("Hello, world!");
+pub mod cli;
+pub mod commands;
+
+use clap::Parser;
+use cli::{Cli, Commands, ModCommands};
+use commands::mods::install::install_mod;
+use tokio::main;
+
+#[main]
+pub async fn main() {
+    let cli = Cli::parse();
+    let verbose = cli.verbose;
+
+    if verbose {
+        println!("Command: {:?}", cli.command);
+    }
+
+    if let Some(scmd) = cli.command {
+        match scmd {
+            Commands::Mod { command } => {
+                if let Some(scmd) = command {
+                    match scmd {
+                        ModCommands::Install { id, instance_id } => {
+                            install_mod(id, verbose).await;
+                        },
+
+                        _ => (),
+                    };
+                }
+            },
+
+            _ => (),
+        };
+    }
 }

common/src/mods/spacedock/mod.rs

@@ -54,7 +54,7 @@ impl SpaceDockAPI {
     }
 
     pub async fn get_mod_download(&self, id: i32) -> String {
-        let uri = format!("{}/mod/${}/latest", self.base.clone(), id);
+        let uri = format!("{}/mod/{}/latest", self.base.clone(), id);
         let resp = reqwest::get(uri).await.unwrap();
         let text = resp.text().await.unwrap();
         let data = serde_json::from_str::<LatestSchema>(&text).unwrap();