Merge pull request #21 from mxve/build/symbols

build: add symbols

Cargo.lock

@@ -13,7 +13,7 @@ dependencies = [
 
 [[package]]
 name = "alterware-launcher"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "http_req",
  "mslnk",

Cargo.toml

@@ -1,11 +1,15 @@
 [package]
 name = "alterware-launcher"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 build = "res/build.rs"
 
 [profile.release]
 opt-level = "s"
+
+# Symbols are a nice thing
+debug = true
+
 panic = "abort"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

README.md

@@ -8,3 +8,4 @@
 
 - Passing ```iw4-sp```, ```iw5-mod```, ```iw6-mod``` or ```s1-mod``` as the first argument will skip automatic game detection
 - Passing ```update``` will stop the launcher from launching the game
+- ```skip-launcher-update``` skips self-update

src/main.rs

@@ -19,7 +19,7 @@ struct CdnFile {
 #[derive(serde::Deserialize, serde::Serialize)]
 struct Game<'a> {
     engine: &'a str,
-    client: &'a str,
+    client: Vec<&'a str>,
     references: Vec<&'a str>,
     app_id: u32,
 }
@@ -40,7 +40,6 @@ fn get_file_sha1(path: &PathBuf) -> String {
     sha1.digest().to_string()
 }
 
-#[cfg(windows)]
 fn get_input() -> String {
     let mut input = String::new();
     std::io::stdin().read_line(&mut input).unwrap();
@@ -134,6 +133,29 @@ fn get_installed_games(games: &Vec<Game>) -> Vec<(u32, PathBuf)> {
     installed_games
 }
 
+#[cfg(windows)]
+fn setup_client_links(game: &Game, game_dir: &PathBuf) {
+    if game.client.len() > 1 {
+        println!("Multiple clients installed, use the shortcuts (launch-<client>.lnk in the game directory or desktop shortcuts) to launch a specific client.");
+    }
+
+    let target = game_dir.join("alterware-launcher.exe");
+
+    for c in game.client.iter() {
+        let lnk = game_dir.join(format!("launch-{}.lnk", c));
+
+        let mut sl = ShellLink::new(target.clone()).unwrap();
+        sl.set_arguments(Some(c.to_string()));
+        sl.set_icon_location(Some(
+            game_dir
+                .join(format!("{}.exe", c))
+                .to_string_lossy()
+                .into_owned(),
+        ));
+        sl.create_lnk(&lnk).unwrap();
+    }
+}
+
 #[cfg(windows)]
 fn windows_launcher_install(games: &Vec<Game>) {
     println!("No game specified/found. Checking for installed Steam games..");
@@ -156,6 +178,7 @@ fn windows_launcher_install(games: &Vec<Game>) {
                 let launcher_path = std::env::current_exe().unwrap();
                 fs::copy(launcher_path, path.join("alterware-launcher.exe")).unwrap();
                 println!("Launcher copied to {}", path.display());
+                setup_client_links(game, path);
 
                 println!("Create Desktop shortcut? (Y/n)");
                 let input = get_input().to_ascii_lowercase();
@@ -167,16 +190,20 @@ fn windows_launcher_install(games: &Vec<Game>) {
                     ));
 
                     let target = path.join("alterware-launcher.exe");
-                    let lnk = desktop.join(format!("{}.lnk", game.client));
 
-                    let mut sl = ShellLink::new(target).unwrap();
+                    for c in game.client.iter() {
+                        let lnk = desktop.join(format!("{}.lnk", c));
+
+                        let mut sl = ShellLink::new(target.clone()).unwrap();
+                        sl.set_arguments(Some(c.to_string()));
                         sl.set_icon_location(Some(
-                        path.join(format!("{}.exe", game.client))
+                            path.join(format!("{}.exe", c))
                                 .to_string_lossy()
                                 .into_owned(),
                         ));
                         sl.create_lnk(lnk).unwrap();
                     }
+                }
 
                 break;
             }
@@ -241,10 +268,16 @@ fn launch(file_path: &PathBuf) {
 }
 
 fn main() {
-    self_update();
-
     let mut args: Vec<String> = std::env::args().collect();
 
+    if !args.contains(&String::from("skip-launcher-update")) {
+        self_update();
+    } else {
+        args.iter()
+            .position(|r| r == "skip-launcher-update")
+            .map(|e| args.remove(e));
+    }
+
     let games_json =
         http::get_body_string(format!("{}/games.json?{}", MASTER, get_cache_buster()).as_str());
     let games: Vec<Game> = serde_json::from_str(&games_json).unwrap();
@@ -264,7 +297,20 @@ fn main() {
         'main: for g in games.iter() {
             for r in g.references.iter() {
                 if std::path::Path::new(r).exists() {
-                    game = String::from(g.client);
+                    if g.client.len() > 1 {
+                        #[cfg(windows)]
+                        setup_client_links(g, &std::env::current_dir().unwrap());
+
+                        #[cfg(not(windows))]
+                        println!("Multiple clients installed, set the client as the first argument to launch a specific client.");
+
+                        for (i, c) in g.client.iter().enumerate() {
+                            println!("{}: {}", i, c);
+                        }
+                        game = String::from(g.client[get_input().parse::<usize>().unwrap()]);
+                        break 'main;
+                    }
+                    game = String::from(g.client[0]);
                     break 'main;
                 }
             }
@@ -272,13 +318,14 @@ fn main() {
     }
 
     for g in games.iter() {
-        if g.client == game {
+        for c in g.client.iter() {
+            if c == &game {
                 update(g);
-            if update_only {
+                if !update_only {
+                    launch(&PathBuf::from(format!("{}.exe", c)));
+                }
                 return;
             }
-            launch(&PathBuf::from(format!("{}.exe", g.client)));
-            return;
         }
     }