improve launcher UX

Squashed commit of the following:

commit 2e28f93
Author: emerald <emerald_actual@proton.me>
Date:   Thu Mar 20 18:36:43 2025 -0400

    clippy

commit f2425f4
Author: emerald <emerald_actual@proton.me>
Date:   Thu Mar 20 18:33:11 2025 -0400

    allow passing extra args when launching

commit 16d40a6
Author: emerald <emerald@mecha.garden>
Date:   Thu Mar 20 14:30:28 2025 -0400

    better launcher experience

Author: AnActualEmerald

Cargo.lock

@@ -62,6 +62,8 @@ copy_dir = "0.1.3"
 clap_complete = { version = "4.5", features = ["unstable-dynamic"] }
 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" }
 # rustyline = {version = "10.1.0", default_features = false}
 
 [package.metadata.wix]

Cargo.toml

@@ -2,14 +2,14 @@ use std::collections::HashSet;
 use std::fmt::Display;
 use std::fs;
 use std::path::PathBuf;
+use std::process::Command;
 use std::sync::LazyLock;
 
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 use directories::ProjectDirs;
-use figment::providers::{Env, Format, Serialized, Toml};
 use figment::Figment;
-use owo_colors::OwoColorize;
+use figment::providers::{Env, Format, Serialized, Toml};
 use serde::{Deserialize, Serialize};
 
 use crate::IGNORED_DIRS;
@@ -40,6 +40,7 @@ pub struct Config {
     ignore: HashSet<String>,
     #[serde(default)]
     install_type: InstallType,
+    #[serde(default)]
     is_server: bool,
 }
 
@@ -145,7 +146,7 @@ pub fn default_ignore_list() -> HashSet<String> {
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, Default)]
 #[serde(rename_all = "lowercase")]
 pub enum InstallType {
-    Steam,
+    Steam(SteamType),
     Origin,
     EA,
     #[default]
@@ -157,3 +158,40 @@ impl Display for InstallType {
         write!(f, "{:?}", self)
     }
 }
+
+#[derive(Clone, Copy, Debug, Serialize, Deserialize, Default)]
+pub enum SteamType {
+    #[default]
+    Native,
+    Flatpak,
+}
+
+impl SteamType {
+    pub fn to_launch_command(self) -> Command {
+        match self {
+            Self::Native => Command::new("steam"),
+            Self::Flatpak => {
+                let mut cmd = Command::new("flatpak");
+                cmd.args(["run", "com.valvesoftware.Steam"]);
+                cmd
+            }
+        }
+    }
+
+    pub fn determine() -> Result<Self> {
+        use which::which;
+
+        if which("steam").is_ok() {
+            Ok(Self::Native)
+        } else if Command::new("flatpak")
+            .args(["info", "com.valvesoftware.Steam"])
+            .spawn()?
+            .wait()?
+            .success()
+        {
+            Ok(Self::Flatpak)
+        } else {
+            Err(anyhow!("Unable to find steam installation?"))
+        }
+    }
+}

src/config.rs

@@ -2,7 +2,7 @@ use std::fs::{self, OpenOptions};
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 
-use crate::config::DIRS;
+use crate::config::{DIRS, InstallType, SteamType};
 use crate::model::Cache;
 use crate::traits::{Answer, Indexed};
 use crate::utils::{ensure_dir, init_msg};
@@ -11,6 +11,7 @@ use crate::{get_answer, modfile};
 use anyhow::{Result, anyhow};
 use indicatif::{ProgressBar, ProgressStyle};
 use owo_colors::OwoColorize;
+use steamlocate::SteamDir;
 use thermite::model::{Mod, ModJSON};
 use thermite::prelude::*;
 use tracing::{debug, warn};
@@ -35,14 +36,24 @@ pub fn northstar(commands: &NstarCommands) -> Result<()> {
     Ok(())
 }
 
+fn get_titanfall() -> Result<PathBuf> {
+    let maybe = SteamDir::locate_multiple()?
+        .iter()
+        .filter_map(|dir| dir.find_app(TITANFALL2_STEAM_ID).ok().flatten())
+        .map(|(app, lib)| lib.resolve_app_dir(&app))
+        .next();
+
+    maybe.ok_or_else(|| anyhow!("Failed to find titanfall 2"))
+}
+
 fn init_ns(force: bool, path: Option<impl AsRef<Path>>, no_cache: bool) -> Result<()> {
     let (titanfall_path, steam) = if let Some(path) = path {
         (path.as_ref().to_path_buf(), false)
-    } else if let Ok(dir) = titanfall2_dir() {
+    } else if let Ok(dir) = get_titanfall() {
         (dir, true)
     } else {
-        println!(
-            "Couldn't automatically locate your Titanfall installation.\nPlease provide a path."
+        eprintln!(
+            "Couldn't automatically locate your Titanfall installation.\nPlease make sure it's installed or provide a path."
         );
         return Err(anyhow!("Unable to locate Titanfall 2 in Steam libraries"));
     };
@@ -56,7 +67,7 @@ fn init_ns(force: bool, path: Option<impl AsRef<Path>>, no_cache: bool) -> Resul
         new_config.set_game_dir(titanfall_path.clone());
 
         if steam {
-            new_config.set_install_type(crate::config::InstallType::Steam);
+            new_config.set_install_type(InstallType::Steam(SteamType::determine()?));
         }
 
         new_config.save()?;
@@ -113,7 +124,7 @@ fn init_ns(force: bool, path: Option<impl AsRef<Path>>, no_cache: bool) -> Resul
     let mut new_config = CONFIG.clone();
     new_config.set_game_dir(titanfall_path.clone());
     if steam {
-        new_config.set_install_type(crate::config::InstallType::Steam);
+        new_config.set_install_type(InstallType::Steam(SteamType::determine()?));
     }
     new_config.save()?;
 

src/core/commands/northstar.rs

@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::{Subcommand, ValueHint};
 use clap_complete::ArgValueCompleter;
 use copy_dir::copy_dir;

src/core/commands/profile.rs

@@ -1,36 +1,61 @@
+use std::time::Duration;
+
 use anyhow::Result;
 use owo_colors::OwoColorize;
+use thermite::TITANFALL2_STEAM_ID;
 
-use crate::config::InstallType::*;
 use crate::config::CONFIG;
+use crate::config::InstallType::*;
 
-pub fn run(no_profile: bool) -> Result<()> {
+pub fn run(no_profile: bool, no_wait: bool, extra: Vec<String>) -> Result<()> {
     match CONFIG.install_type() {
-        Steam => {
+        Steam(t) => {
             println!("Launching Titanfall 2 using steam...");
             let profile = if no_profile {
                 String::new()
             } else {
                 println!("Using profile {}", CONFIG.current_profile().bright_cyan());
                 format!("-profile={}", CONFIG.current_profile())
             };
-            open::that_detached(format!(
-                "steam://run/{}//{profile} -northstar/",
-                thermite::TITANFALL2_STEAM_ID
-            ))?;
+            // open::that_detached(format!(
+            //     "steam://run/{}//{profile} -northstar/",
+            //     thermite::TITANFALL2_STEAM_ID
+            // ))?;
+
+            let mut child = t
+                .to_launch_command()
+                .arg("-applaunch")
+                .arg(TITANFALL2_STEAM_ID.to_string())
+                .arg("-northstar")
+                .arg(profile)
+                .args(extra)
+                .spawn()?;
+
+            if !no_wait {
+                let spinner = indicatif::ProgressBar::new_spinner().with_message("Gaming...");
+                spinner.enable_steady_tick(Duration::from_millis(100));
+                child.wait()?;
+                spinner.finish_and_clear();
+            }
         }
         Origin => {
             println!("Launching Titanfall 2 using origin...");
             if CONFIG.current_profile() != "R2Northstar" {
-                println!("{}Papa doesn't support using profiles with Origin. Make sure to manually set the launch args to use your profile.", "!! ".bright_red());
+                println!(
+                    "{0} Papa doesn't support using profiles with Origin. Make sure to manually set the launch args to use your profile. {0}",
+                    "!!".bright_red()
+                );
             }
             open::that_detached(format!(
                 "origin://LaunchGame/{}",
                 thermite::TITANFALL2_ORIGIN_IDS[0]
             ))?;
         }
         Other => {
-            println!("Can't launch the game for this type of installation.\nIf you think this is a mistake, try running {}.", "papa ns init".bright_cyan());
+            println!(
+                "Can't launch the game for this type of installation.\nIf you think this is a mistake, try running {}.",
+                "papa ns init".bright_cyan()
+            );
         }
         _ => todo!(),
     }