feat: optionally install northstar core mods and DLL when creating a profile

Squashed commit of the following:

commit bba4ba1
Author: Emerald <emerald@mecha.garden>
Date:   Sun Mar 23 23:57:20 2025 -0400

    polish northstar profile install ux

commit 078927f
Author: emerald <emerald_actual@proton.me>
Date:   Sat Mar 22 18:19:33 2025 -0400

    install minimum profile files

Author: AnActualEmerald

Cargo.lock

@@ -64,6 +64,7 @@ tracing-appender = "0.2.3"
 clap_lex = "0.7.4"
 which = "7.0.2"
 steamlocate = { git = "https://github.com/WilliamVenner/steamlocate-rs", version = "2.0.1" }
+semver = { version = "1.0.26", features = ["serde"] }
 # rustyline = {version = "10.1.0", default_features = false}
 
 [package.metadata.wix]

Cargo.toml

@@ -1,10 +1,10 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use thermite::model::ModVersion;
 use tracing::warn;
 
 use crate::get_answer;
 use crate::model::ModName;
-use crate::traits::{Answer, Indexed};
+use crate::traits::{Answer, Index};
 use crate::utils::{download_and_install, to_file_size_string};
 
 use owo_colors::OwoColorize;
@@ -26,7 +26,7 @@ pub fn install(mods: Vec<ModName>, assume_yes: bool, force: bool, no_cache: bool
         }
         if let Some(m) = remote_index.get_item(&mn) {
             if let Some(version) = &mn.version {
-                let Some(mv) = m.get_version(version) else {
+                let Some(mv) = m.get_version(version.to_string()) else {
                     println!(
                         "Package {} has no version {}",
                         format!("{}.{}", mn.author, mn.name).bright_cyan(),

src/core/commands/install.rs

@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use crate::config::{DIRS, InstallType, SteamType};
 use crate::model::Cache;
-use crate::traits::{Answer, Indexed};
+use crate::traits::{Answer, Index};
 use crate::utils::{ensure_dir, init_msg};
 use crate::{NstarCommands, config::CONFIG, model::ModName};
 use crate::{get_answer, modfile};

src/core/commands/northstar.rs

@@ -1,17 +1,28 @@
 use std::{
     ffi::OsString,
-    fs,
+    fs::{self, File},
     io::{ErrorKind, IsTerminal, Write},
     path::{Path, PathBuf},
+    time::Duration,
 };
 
 use anyhow::{Result, anyhow};
-use clap::{Subcommand, ValueHint};
+use clap::{Args, Subcommand, ValueHint};
 use clap_complete::ArgValueCompleter;
 use copy_dir::copy_dir;
+use indicatif::{ProgressBar, ProgressStyle};
 use owo_colors::OwoColorize;
+use semver::Version;
+use thermite::core::manage::install_northstar_profile;
 
-use crate::{config::CONFIG, update_cfg, utils::init_msg};
+use crate::{
+    config::{CONFIG, DIRS},
+    get_answer,
+    model::{Cache, ModName},
+    traits::Answer,
+    update_cfg,
+    utils::{download_northstar, init_msg},
+};
 
 #[derive(Subcommand)]
 pub enum ProfileCommands {
@@ -41,9 +52,9 @@ pub enum ProfileCommands {
         ///Name of the profile to create
         #[clap(value_hint = ValueHint::DirPath)]
         name: OsString,
-        ///Remove any existing folder of the same name
-        #[arg(long, short)]
-        force: bool,
+
+        #[command(flatten)]
+        options: NewOptions,
     },
 
     #[clap(alias = "dupe", alias = "cp", alias = "copy")]
@@ -58,10 +69,28 @@ pub enum ProfileCommands {
     },
 }
 
-pub fn handle(command: &ProfileCommands) -> Result<()> {
+#[derive(Args, Clone)]
+pub struct NewOptions {
+    ///Don't inlcude Norhtstar core files and mods
+    #[arg(long, short)]
+    empty: bool,
+    ///Remove any existing folder of the same name
+    #[arg(long, short)]
+    force: bool,
+    ///Answer "yes" to any prompts
+    #[arg(long, short)]
+    yes: bool,
+    ///The version of Northstar to use when for this profile
+    ///
+    /// Leave unset for latest
+    #[arg(long, short, conflicts_with = "empty")]
+    version: Option<Version>,
+}
+
+pub fn handle(command: &ProfileCommands, no_cache: bool) -> Result<()> {
     match command {
         ProfileCommands::List => list_profiles(),
-        ProfileCommands::New { name, force } => new_profile(name, *force),
+        ProfileCommands::New { name, options } => new_profile(name, options.clone(), no_cache),
         ProfileCommands::Clone { source, new, force } => clone_profile(source, new, *force),
         ProfileCommands::Select { name } => activate_profile(name),
         ProfileCommands::Ignore { name } => {
@@ -173,14 +202,14 @@ fn list_profiles() -> Result<()> {
     Ok(())
 }
 
-fn new_profile(name: &OsString, force: bool) -> Result<()> {
+fn new_profile(name: &OsString, options: NewOptions, no_cache: bool) -> Result<()> {
     let Some(dir) = CONFIG.game_dir() else {
         return Err(init_msg());
     };
 
     let prof = dir.join(name);
     if prof.try_exists()? {
-        if force {
+        if options.force {
             fs::remove_dir_all(&prof)?;
         } else {
             println!("A folder of that name already exists, remove it first");
@@ -189,7 +218,43 @@ fn new_profile(name: &OsString, force: bool) -> Result<()> {
     }
     fs::create_dir(&prof)?;
 
-    println!("Created profile {:?}", name.bright_cyan());
+    if !options.empty {
+        let nsname = ModName::new("northstar", "Northstar", options.version.clone());
+        let cache = Cache::from_dir(DIRS.cache_dir())?;
+        let file = if !no_cache
+            && let Some(nstar) = if options.version.is_some() {
+                dbg!(cache.get(nsname))
+            } else {
+                cache.get_any(nsname)
+            } {
+            File::open(nstar)?
+        } else {
+            let ans = if let Some(version) = options.version.as_ref() {
+                get_answer!(options.yes, "Download Northstar {}? [Y/n] ", version)?
+            } else {
+                get_answer!(options.yes, "Download latest Northstar? [Y/n] ")?
+            };
+
+            if ans.is_no() {
+                println!("Not downloading Northstar, aborting");
+                return Ok(());
+            } else {
+                download_northstar(options.version)?
+            }
+        };
+
+        let bar = ProgressBar::new_spinner()
+            .with_style(
+                ProgressStyle::with_template("{prefix}{spinner:.cyan}")?
+                    .tick_strings(&["   ", ".  ", ".. ", "...", "   "]),
+            )
+            .with_prefix("Installing Northstar core files");
+        bar.enable_steady_tick(Duration::from_millis(500));
+        install_northstar_profile(file, prof)?;
+        bar.finish();
+    }
+
+    println!("Created profile {}", name.display().bright_cyan());
 
     Ok(())
 }

src/core/commands/profile.rs

@@ -1,4 +1,4 @@
-use crate::traits::Indexed;
+use crate::traits::Index;
 use anyhow::Result;
 use owo_colors::OwoColorize;
 use textwrap::Options;

src/core/commands/search.rs

@@ -5,7 +5,7 @@ use crate::{
     core::commands::northstar,
     get_answer,
     model::ModName,
-    traits::{Answer, Indexed},
+    traits::{Answer, Index},
     utils::{download_and_install, to_file_size_string},
 };
 use anyhow::Result;

src/core/commands/update.rs

@@ -60,13 +60,19 @@ macro_rules! get_answer {
     ($yes:expr) => {
         get_answer!($yes, "OK? [Y/n]: ")
     };
+    (yes:expr, $msg:literal) => {
+        get_answer!($yes, format!($msg))
+    };
     ($yes:expr, $msg:expr) => {
         if $yes {
             Ok(String::new())
         } else {
             $crate::readln!($msg)
         }
     };
+    ($yes:expr, $msg:literal, $($arg:expr),*) => {
+        get_answer!($yes, format!($msg, $($arg,)*))
+    }
 }
 
 #[macro_export]

src/macros.rs

@@ -387,7 +387,7 @@ fn main() -> ExitCode {
             no_wait,
             args: extra_args,
         } => core::run(no_profile, no_wait, extra_args),
-        Commands::Profile { command } => profile::handle(&command),
+        Commands::Profile { command } => profile::handle(&command, cli.no_cache),
     };
 
     if let Err(e) = res {

src/main.rs

@@ -5,8 +5,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use anyhow::{anyhow, Result};
-use thermite::model::{InstalledMod, Manifest, Mod};
+use anyhow::{Result, anyhow};
+use semver::Version;
+use thermite::model::{InstalledMod, Manifest, Mod, ModVersion};
 use tracing::{debug, warn};
 
 use crate::utils::validate_modname;
@@ -21,14 +22,14 @@ pub struct Package {
 pub struct ModName {
     pub author: String,
     pub name: String,
-    pub version: Option<String>,
+    pub version: Option<Version>,
 }
 
 impl ModName {
     pub fn new(
         author: impl Into<String>,
         name: impl Into<String>,
-        version: Option<String>,
+        version: Option<Version>,
     ) -> Self {
         Self {
             author: author.into(),
@@ -62,7 +63,7 @@ impl From<InstalledMod> for ModName {
         Self {
             author: value.author,
             name: value.manifest.name,
-            version: Some(value.manifest.version_number),
+            version: value.manifest.version_number.parse().ok(),
         }
     }
 }
@@ -72,7 +73,7 @@ impl From<&InstalledMod> for ModName {
         Self {
             author: value.author.clone(),
             name: value.manifest.name.clone(),
-            version: Some(value.manifest.version_number.clone()),
+            version: value.manifest.version_number.parse().ok(),
         }
     }
 }
@@ -82,7 +83,7 @@ impl From<Mod> for ModName {
         Self {
             author: value.author,
             name: value.name,
-            version: Some(value.latest),
+            version: value.latest.parse().ok(),
         }
     }
 }
@@ -92,7 +93,7 @@ impl From<&Mod> for ModName {
         Self {
             author: value.author.clone(),
             name: value.name.clone(),
-            version: Some(value.latest.clone()),
+            version: value.latest.parse().ok(),
         }
     }
 }
@@ -204,8 +205,30 @@ impl Cache {
         self.root.join(format!("{name}"))
     }
 
+    pub fn get_any(&self, name: impl AsRef<ModName>) -> Option<&PathBuf> {
+        let name = name.as_ref();
+        let mut keys = self
+            .packages
+            .keys()
+            .filter(|k| {
+                k.author.to_lowercase() == name.author.to_lowercase()
+                    && k.name.to_lowercase() == name.name.to_lowercase()
+            })
+            .collect::<Vec<_>>();
+
+        keys.sort_by(|a, b| {
+            a.version
+                .as_ref()
+                .and_then(|av| b.version.as_ref().map(|bv| av.cmp(bv)))
+                .unwrap_or(std::cmp::Ordering::Equal)
+        });
+
+        self.packages.get(keys.first()?)
+    }
+
     #[inline]
     pub fn get(&self, name: impl AsRef<ModName>) -> Option<&PathBuf> {
+        dbg!(&self.packages);
         self.packages.get(name.as_ref())
     }
 

src/model.rs

@@ -12,12 +12,12 @@ pub trait Answer {
     fn is_yes(&self) -> bool;
 }
 
-pub trait Indexed<T> {
+pub trait Index<T> {
     fn get_item(&self, name: &ModName) -> Option<&T>;
     fn search(&self, term: &str) -> Vec<&T>;
 }
 
-impl Indexed<Mod> for Vec<Mod> {
+impl Index<Mod> for Vec<Mod> {
     fn get_item(&self, name: &ModName) -> Option<&Mod> {
         self.iter().find(|v| {
             v.name.to_lowercase() == name.name.to_lowercase()
@@ -59,7 +59,7 @@ impl Indexed<Mod> for Vec<Mod> {
     }
 }
 
-impl Indexed<InstalledMod> for Vec<InstalledMod> {
+impl Index<InstalledMod> for Vec<InstalledMod> {
     fn get_item(&self, name: &ModName) -> Option<&InstalledMod> {
         self.iter()
             .find(|v| v.mod_json.name.to_lowercase() == name.name.to_lowercase())