typo

Bump serde from 1.0.188 to 1.0.189

.github/workflows/lint.yml

@@ -1,9 +1,3 @@
-# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
-#
-# While our "example" application has the platform-specific code,
-# for simplicity we are compiling and testing everything on the Ubuntu environment only.
-# For multi-OS testing see the `cross.yml` workflow.
-
 on: [push, pull_request]
 
 name: lint
@@ -14,18 +8,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: stable
-          override: true
 
       - name: Run cargo check
-        uses: actions-rs/cargo@v1
+        uses: clechasseur/rs-cargo@v2
-        continue-on-error: true  # WARNING: only for this example, remove it!
+        continue-on-error: true
         with:
           command: check
 
@@ -34,18 +26,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: stable
-          override: true
 
       - name: Run cargo test
-        uses: actions-rs/cargo@v1
+        uses: clechasseur/rs-cargo@v2
-        continue-on-error: true  # WARNING: only for this example, remove it!
+        continue-on-error: true
         with:
           command: test
 
@@ -54,26 +44,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: stable
-          override: true
           components: rustfmt, clippy
 
       - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
+        uses: clechasseur/rs-cargo@v2
-        continue-on-error: true  # WARNING: only for this example, remove it!
+        continue-on-error: true
         with:
           command: fmt
           args: --all -- --check
 
       - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
+        uses: clechasseur/rs-cargo@v2
-        continue-on-error: true  # WARNING: only for this example, remove it!
+        continue-on-error: true
         with:
           command: clippy
           args: -- -D warnings

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   create-release:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: taiki-e/create-gh-release-action@v1
         with:
           draft: true
@@ -18,14 +18,21 @@ jobs:
   upload-assets:
     strategy:
       matrix:
-        os:
+        include:
-          - ubuntu-20.04
+          - target: x86_64-unknown-linux-gnu
-          - windows-latest
+            os: ubuntu-20.04
+          - target: i686-unknown-linux-gnu
+            os: ubuntu-20.04
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+          - target: i686-pc-windows-msvc
+            os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
+          target: ${{ matrix.target }}
           bin: alterware-launcher
           tar: unix
           zip: windows

Cargo.lock

@@ -30,8 +30,9 @@ dependencies = [
 
 [[package]]
 name = "alterware-launcher"
-version = "0.4.8"
+version = "0.5.4"
 dependencies = [
+ "colored",
  "http_req",
  "mslnk",
  "rand",
@@ -41,16 +42,15 @@ dependencies = [
  "serde_json",
  "sha1_smol",
  "steamlocate",
- "windows-sys",
  "winres",
  "zip",
 ]
 
 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "base64ct"
@@ -137,6 +137,17 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "colored"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+dependencies = [
+ "is-terminal",
+ "lazy_static",
+ "windows-sys",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -284,6 +295,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -295,11 +312,12 @@ dependencies = [
 
 [[package]]
 name = "http_req"
-version = "0.9.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f680177f2ebe4aabd573d07b322d15a5e0fbc97cd739fd627b08043c89041f8"
+checksum = "158d4edacc70c9bdb0464314063b8d9d60fa776442dc13b00a13581b88b0a0a0"
 dependencies = [
  "rustls",
+ "rustls-pemfile",
  "unicase",
  "webpki",
  "webpki-roots",
@@ -323,6 +341,17 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.6"
@@ -372,6 +401,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "libc"
 version = "0.2.147"
@@ -622,12 +657,26 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin",
+ "spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.8"
@@ -643,15 +692,33 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.19.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+dependencies = [
+ "log",
+ "ring 0.16.20",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
  "base64",
- "log",
+]
- "ring",
+
- "sct",
+[[package]]
- "webpki",
+name = "rustls-webpki"
+version = "0.101.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+dependencies = [
+ "ring 0.16.20",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
@@ -662,19 +729,19 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "sct"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
 dependencies = [
- "ring",
+ "ring 0.16.20",
- "untrusted",
+ "untrusted 0.7.1",
 ]
 
 [[package]]
 name = "self-replace"
-version = "1.3.6"
+version = "1.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c56335359191626938ef6fdeb478f9f6a7c6020254d7f4641c7d810369fa0ec1"
+checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55"
 dependencies = [
  "fastrand 1.9.0",
  "tempfile",
@@ -683,24 +750,24 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -709,9 +776,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -752,6 +819,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
 [[package]]
 name = "steamlocate"
 version = "2.0.0-alpha.0"
@@ -855,9 +928,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
@@ -874,6 +947,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -952,22 +1031,19 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.21.4"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "ring",
+ "ring 0.17.2",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.21.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
-dependencies = [
- "webpki",
-]
 
 [[package]]
 name = "winapi"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "alterware-launcher"
-version = "0.4.8"
+version = "0.5.4"
 edition = "2021"
 build = "res/build.rs"
 
@@ -15,24 +15,21 @@ panic = "abort"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-http_req = { version = "0.9.2", default-features = false, features = [
+http_req = { version = "0.10.0", default-features = false, features = [
     "rust-tls",
 ] }
 sha1_smol = "1.0.0"
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.189", features = ["derive"] }
-serde_json = "1.0.105"
+serde_json = "1.0.107"
 rand = "0.8.5"
-semver = "1.0.18"
+semver = "1.0.20"
 zip = "0.6.6"
+colored = "2.0.4"
 
 [target.'cfg(windows)'.dependencies]
 steamlocate = "2.0.0-alpha.0"
 mslnk = "0.1.8"
-# https://github.com/mitsuhiko/self-replace/pull/16/
+self-replace = "1.3.7"
-windows-sys = { version = "0.48", features = [
-    "Win32_Security",
-] }
-self-replace = "1.3.6"
 
 [build-dependencies]
 winres = "0.1.12"

README.md

@@ -16,9 +16,53 @@
 
 #### Command line arguments
 
-- Passing ```iw4-sp```, ```iw4x```, ```iw5-mod```, ```iw6-mod``` or ```s1-mod``` as the first argument will skip automatic game detection
+- ```iw4-sp```, ```iw4x```, ```iw5-mod```, ```iw6-mod```, ```s1-mod```
-- Passing ```update``` will stop the launcher from launching the game
+  - Skip automatic detection and launch the specified game
-- ```skip-launcher-update``` skips launcher self-update
+    - This should always be the first argument if used
+- ```--update```, ```-u```
+  - Only update the game, don't launch it
+- ```--skip-launcher-update```
+  - Don't update the launcher
+- ```--bonus```
+  - Download bonus content
+- ```--force```, ```-f```
+  - Force file hash recheck
+- ```--path```, ```-p```
+  - Set the game path
+    - Do not include a trailing backslash in the path
+- ```--pass```
+  - Pass additional arguments to the game
+    - See [client-args.md](client-args.md)
+- ```--version```, ```-v```
+  - Print the launcher version
+
+Example: ```alterware-launcher.exe iw4x --bonus -u --path "C:\Games\IW4x" --pass "-console"```
+
+Some arguments can be set in alterware-launcher.json, args generally override the values of the config.
+
+---
+
+#### Config file
+alterware-launcher.json
+
+- ```update_only```
+  - See --update
+  - Default: false
+- ```skip_self_update```
+  - See --skip-launcher-update
+  - Default: false
+- ```download_bonus_content```
+  - See --bonus
+  - Default: false
+- ```ask_bonus_content```
+  - Ask the user if they want to download bonus content
+  - Default: true; false after asking
+- ```force_update```
+  - See --force
+  - Default: false
+- ```args```
+  - See --pass
+  - Default: ""
 
 ---
 
@@ -43,7 +87,7 @@ When the launcher updates itself it needs to be restarted. It will return exit c
 ```
 @echo off
 :loop
-start /wait alterware-launcher.exe update
+start /wait alterware-launcher.exe --update
 if %errorlevel% equ 201 (
     goto loop
 )

client-args.md

@@ -0,0 +1,32 @@
+# IW4x
+[github.com/iw4x/iw4x-client#command-line-arguments](https://github.com/iw4x/iw4x-client#command-line-arguments)
+
+| Argument                | Description                                    |
+|:------------------------|:-----------------------------------------------|
+| `-tests`                | Perform unit tests.                            |
+| `-entries`              | Print to the console a list of every asset as they are loaded from zonefiles. |
+| `-stdout`               | Redirect all logging output to the terminal iw4x is started from, or if there is none, creates a new terminal window to write log information in. |
+| `-console`              | Allow the game to display its own separate interactive console window. |
+| `-dedicated`            | Starts the game as a headless dedicated server. |
+| `-bigminidumps`         | Include all code sections from loaded modules in the dump. |
+| `-reallybigminidumps`   | Include data sections from all loaded modules in the dump. |
+| `-dump`                 | Write info of loaded assets to the raw folder as they are being loaded. |
+| `-nointro`              | Skip game's cinematic intro.                   |
+| `-version`              | Print IW4x build info on startup.              |
+| `-nosteam`              | Disable friends feature and do not update Steam about the game's current status just like an invisible mode. |
+| `-unprotect-dvars`      | Allow the server to modify saved/archive dvars. |
+| `-zonebuilder`          | Start the interactive zonebuilder tool console instead of starting the game. |
+| `-disable-notifies`     | Disable "Anti-CFG" checks |
+| `-disable-mongoose`     | Disable Mongoose HTTP server |
+| `-disable-rate-limit-check` | Disable RCOn rate limit checks |
+| `+<command>`            | Execute game command (ex. `+set net_port 1337`)|
+
+
+# S1-Mod, IW6-Mod
+| Argument                | Description                                    |
+|:------------------------|:-----------------------------------------------|
+| `-headless`             | Use system console                             |
+| `-dedicated`            | Dedicated server                               |
+| `-singleplayer`         | Start singleplayer; Skip launcher              |
+| `-multiplayer`          | Start multiplayer; Skip launcher               |
+| `+<command>`            | Execute game command (ex. `+set net_port 1337`)|

src/config.rs

@@ -0,0 +1,42 @@
+use crate::structs::Config;
+
+use std::{fs, path::PathBuf};
+
+pub fn load(config_path: PathBuf) -> Config {
+    if config_path.exists() {
+        let cfg = fs::read_to_string(&config_path).unwrap();
+        let cfg: Config = serde_json::from_str(&cfg).unwrap_or(Config::default());
+        return cfg;
+    }
+    save(config_path.clone(), Config::default());
+    Config::default()
+}
+
+pub fn save(config_path: PathBuf, config: Config) {
+    match fs::write(
+        config_path.clone(),
+        serde_json::to_string_pretty(&config).unwrap(),
+    ) {
+        Ok(_) => (),
+        Err(e) => match e.kind() {
+            std::io::ErrorKind::NotFound => {
+                fs::create_dir_all(config_path.parent().unwrap()).unwrap();
+                save(config_path, config);
+            }
+            _ => println!("Could not save config file, got:\n{}\n", e),
+        },
+    }
+}
+
+pub fn save_value(config_path: PathBuf, key: &str, value: bool) {
+    let mut config = load(config_path.clone());
+    match key {
+        "update_only" => config.update_only = value,
+        "skip_self_update" => config.skip_self_update = value,
+        "download_bonus_content" => config.download_bonus_content = value,
+        "ask_bonus_content" => config.ask_bonus_content = value,
+        "force_update" => config.force_update = value,
+        _ => (),
+    }
+    save(config_path, config);
+}

src/http.rs

@@ -1,22 +1,42 @@
+use crate::global;
+use crate::misc;
 use std::{fs, io::Write, path::Path, str};
 
 pub fn get_body(url: &str) -> Vec<u8> {
     let mut res: Vec<u8> = Vec::new();
-    let req = http_req::request::Request::new(&url.try_into().unwrap())
+
+    match http_req::request::Request::new(&url.try_into().unwrap())
         .header(
             "User-Agent",
-            "AlterWare Launcher | github.com/mxve/alterware-launcher",
+            &format!(
+                "AlterWare Launcher | github.com/{}/{}",
+                global::GH_OWNER,
+                global::GH_REPO
+            ),
         )
         .send(&mut res)
-        .unwrap_or_else(|error| {
+    {
-            panic!("\n\n{}:\n{:?}", "Error", error);
+        Ok(req) => {
-        });
+            if req.status_code() == http_req::response::StatusCode::new(302)
-
+                || req.status_code() == http_req::response::StatusCode::new(301)
-    if req.status_code() == http_req::response::StatusCode::new(302) {
+            {
                 let location = req.headers().get("Location").unwrap().as_str();
                 return get_body(location);
             }
 
+            if req.status_code() != http_req::response::StatusCode::new(200) {
+                misc::fatal_error(&format!(
+                    "Could not get body from {}, got {}",
+                    url,
+                    req.status_code()
+                ));
+            }
+        }
+        Err(e) => {
+            misc::fatal_error(&format!("Could not get body from {}, got:\n{}", url, e));
+        }
+    }
+
     res
 }
 
@@ -27,10 +47,38 @@ pub fn get_body_string(url: &str) -> String {
 pub fn download_file(url: &str, file_path: &Path) {
     let body = get_body(url);
 
-    let mut f = fs::File::create(file_path).unwrap_or_else(|error| {
+    match fs::File::create(file_path) {
-        panic!("\n\n{}:\n{:?}", "Error", error);
+        Ok(mut file) => match file.write_all(&body) {
-    });
+            Ok(_) => (),
-    f.write_all(&body).unwrap_or_else(|error| {
+            Err(e) => {
-        panic!("\n\n{}:\n{:?}", "Error", error);
+                misc::fatal_error(&format!(
-    });
+                    "Could not write to file {}, got:\n{}",
+                    file_path.to_str().unwrap(),
+                    e
+                ));
+            }
+        },
+        Err(e) => {
+            match e.kind() {
+                std::io::ErrorKind::NotFound => {
+                    fs::create_dir_all(file_path.parent().unwrap()).unwrap();
+                    return download_file(url, file_path);
+                }
+                std::io::ErrorKind::PermissionDenied => {
+                    misc::fatal_error(&format!(
+                        "Permission to {} denied.\n  Please try:\n    1. Running the launcher as administrator.\n    2. Manually deleting the last downloaded file.\n    3. If your game is in the program files directory try moving it to another location.\n    4. Create an exception/exclusion in your Anti-Virus Software for either the last downloaded file or the entire game directory.\n\n\n{}",
+                        file_path.to_str().unwrap(),
+                        e
+                    ));
+                }
+                _ => (),
+            }
+
+            misc::fatal_error(&format!(
+                "Could not create file {}, got:\n{}",
+                file_path.to_str().unwrap(),
+                e
+            ));
+        }
+    }
 }

src/iw4x.rs

@@ -3,6 +3,7 @@ use crate::global::*;
 use crate::http;
 use crate::misc;
 
+use colored::*;
 use std::{fs, path::Path};
 
 pub fn local_revision(dir: &Path) -> u16 {
@@ -25,7 +26,11 @@ pub fn update(dir: &Path) {
         return;
     }
 
-    println!("Updating IW4x...");
+    println!(
+        "[{}] {}",
+        "Downloading".bright_yellow(),
+        dir.join("iw4x.dll").display()
+    );
     http::download_file(
         &format!(
             "{}/download/iw4x.dll",

src/main.rs

@@ -1,3 +1,4 @@
+mod config;
 mod github;
 mod global;
 mod http;
@@ -9,9 +10,10 @@ mod structs;
 use global::*;
 use structs::*;
 
+use colored::*;
 #[cfg(windows)]
 use mslnk::ShellLink;
-use std::{fs, path::Path, path::PathBuf};
+use std::{borrow::Cow, collections::HashMap, fs, path::Path, path::PathBuf};
 #[cfg(windows)]
 use steamlocate::SteamDir;
 
@@ -21,7 +23,7 @@ fn get_installed_games(games: &Vec<Game>) -> Vec<(u32, PathBuf)> {
     let mut steamdir = match SteamDir::locate() {
         Some(steamdir) => steamdir,
         None => {
-            println!("Steam not found.");
+            println!("{}", "Steam not found!".yellow());
             return installed_games;
         }
     };
@@ -36,25 +38,34 @@ fn get_installed_games(games: &Vec<Game>) -> Vec<(u32, PathBuf)> {
 }
 
 #[cfg(windows)]
-fn setup_client_links(game: &Game, game_dir: &Path) {
+fn create_shortcut(path: &Path, target: &Path, icon: String, args: String) {
-    if game.client.len() > 1 {
+    if let Ok(mut sl) = ShellLink::new(target) {
-        println!("Multiple clients installed, use the shortcuts (launch-<client>.lnk in the game directory or desktop shortcuts) to launch a specific client.");
+        sl.set_arguments(Some(args));
+        sl.set_icon_location(Some(icon));
+        sl.create_lnk(path).unwrap_or_else(|error| {
+            println!("Error creating shortcut.\n{:#?}", error);
+        });
+    } else {
+        println!("Error creating shortcut.");
+    }
 }
 
-    let target = game_dir.join("alterware-launcher.exe");
+#[cfg(windows)]
+fn setup_client_links(game: &Game, game_dir: &Path) {
+    if game.client.len() > 1 {
+        println!("Multiple clients installed, use the shortcuts (launch-<client>.lnk in the game directory or on the desktop) to launch a specific client.");
+    }
 
     for c in game.client.iter() {
-        let lnk = game_dir.join(format!("launch-{}.lnk", c));
+        create_shortcut(
-
+            &game_dir.join(format!("launch-{}.lnk", c)),
-        let mut sl = ShellLink::new(target.clone()).unwrap();
+            &game_dir.join("alterware-launcher.exe"),
-        sl.set_arguments(Some(c.to_string()));
-        sl.set_icon_location(Some(
             game_dir
                 .join(format!("{}.exe", c))
                 .to_string_lossy()
                 .into_owned(),
-        ));
+            c.to_string(),
-        sl.create_lnk(&lnk).unwrap();
+        );
     }
 }
 
@@ -69,19 +80,15 @@ fn setup_desktop_links(path: &Path, game: &Game) {
             std::env::var("USERPROFILE").unwrap()
         ));
 
-        let target = path.join("alterware-launcher.exe");
-
         for c in game.client.iter() {
-            let lnk = desktop.join(format!("{}.lnk", c));
+            create_shortcut(
-
+                &desktop.join(format!("{}.lnk", c)),
-            let mut sl = ShellLink::new(target.clone()).unwrap();
+                &path.join("alterware-launcher.exe"),
-            sl.set_arguments(Some(c.to_string()));
-            sl.set_icon_location(Some(
                 path.join(format!("{}.exe", c))
                     .to_string_lossy()
                     .into_owned(),
-            ));
+                c.to_string(),
-            sl.create_lnk(lnk).unwrap();
+            );
         }
     }
 }
@@ -90,16 +97,18 @@ fn setup_desktop_links(path: &Path, game: &Game) {
 fn auto_install(path: &Path, game: &Game) {
     setup_client_links(game, path);
     setup_desktop_links(path, game);
-    update(game, path);
+    update(game, path, false, false);
 }
 
 #[cfg(windows)]
 fn windows_launcher_install(games: &Vec<Game>) {
-    println!("No game specified/found. Checking for installed Steam games..");
+    println!(
+        "{}",
+        "No game specified/found. Checking for installed Steam games..".yellow()
+    );
     let installed_games = get_installed_games(games);
 
     if !installed_games.is_empty() {
-        // if current directory is in the steamapps/common folder of a game, use that game
         let current_dir = std::env::current_dir().unwrap();
         for (id, path) in installed_games.iter() {
             if current_dir.starts_with(path) {
@@ -165,79 +174,254 @@ fn prompt_client_selection(games: &[Game]) -> String {
 fn manual_install(games: &[Game]) {
     let selection = prompt_client_selection(games);
     let game = games.iter().find(|&g| g.client[0] == selection).unwrap();
-    update(game, &std::env::current_dir().unwrap());
+    update(game, &std::env::current_dir().unwrap(), false, false);
     println!("Installation complete. Please run the launcher again or use a shortcut to launch the game.");
     std::io::stdin().read_line(&mut String::new()).unwrap();
     std::process::exit(0);
 }
 
-fn update(game: &Game, dir: &Path) {
+fn total_download_size(cdn_info: &Vec<CdnFile>, remote_dir: &str) -> u64 {
-    let cdn_info: Vec<CdnFile> = serde_json::from_str(&http::get_body_string(
+    let remote_dir = format!("{}/", remote_dir);
-        format!("{}/files.json", MASTER).as_str(),
+    let mut size: u64 = 0;
-    ))
-    .unwrap();
-
-    let engine_str = format!("{}/", game.engine);
     for file in cdn_info {
-        if !file.name.starts_with(&engine_str) || file.name == "iw4/iw4x.dll" {
+        if !file.name.starts_with(&remote_dir) || file.name == "iw4/iw4x.dll" {
+            continue;
+        }
+        size += file.size as u64;
+    }
+    size
+}
+
+fn update_dir(
+    cdn_info: &Vec<CdnFile>,
+    remote_dir: &str,
+    dir: &Path,
+    hashes: &mut HashMap<String, String>,
+) {
+    let remote_dir_pre = format!("{}/", remote_dir);
+
+    let mut files_to_download: Vec<CdnFile> = vec![];
+
+    for file in cdn_info {
+        if !file.name.starts_with(&remote_dir_pre) || file.name == "iw4/iw4x.dll" {
             continue;
         }
 
-        let file_path = dir.join(&file.name.replace(&format!("{}/", game.engine), ""));
-        if file_path.exists() {
-            let sha1_local = misc::get_file_sha1(&file_path).to_lowercase();
         let sha1_remote = file.hash.to_lowercase();
+        let file_name = &file.name.replace(remote_dir_pre.as_str(), "");
+        let file_path = dir.join(file_name);
+        if file_path.exists() {
+            let sha1_local = hashes
+                .get(file_name)
+                .map(Cow::Borrowed)
+                .unwrap_or_else(|| Cow::Owned(misc::get_file_sha1(&file_path)))
+                .to_string();
+
             if sha1_local != sha1_remote {
-                println!(
+                files_to_download.push(file.clone());
-                    "Updating {}...\nLocal hash: {}\nRemote hash: {}",
+            } else {
-                    file_path.display(),
+                println!("[{}]     {}", "Checked".bright_blue(), file_path.display());
-                    sha1_local,
-                    sha1_remote
-                );
-                http::download_file(&format!("{}/{}", MASTER, file.name), &file_path);
             }
         } else {
-            println!("Downloading {}...", file_path.display());
+            files_to_download.push(file.clone());
+        }
+    }
+
+    if files_to_download.is_empty() {
+        println!(
+            "[{}]        No files to download for {}",
+            "Info".bright_magenta(),
+            remote_dir
+        );
+        return;
+    }
+    println!(
+        "[{}]        Downloading outdated or missing files for {}, {}",
+        "Info".bright_magenta(),
+        remote_dir,
+        misc::human_readable_bytes(total_download_size(&files_to_download, remote_dir))
+    );
+    for file in files_to_download {
+        let file_name = &file.name.replace(&remote_dir_pre, "");
+        let file_path = dir.join(file_name);
+        println!(
+            "[{}] {} ({})",
+            "Downloading".bright_yellow(),
+            file_path.display(),
+            misc::human_readable_bytes(file.size as u64)
+        );
         if let Some(parent) = file_path.parent() {
             if !parent.exists() {
                 fs::create_dir_all(parent).unwrap();
             }
         }
         http::download_file(&format!("{}/{}", MASTER, file.name), &file_path);
+        hashes.insert(file_name.to_owned(), file.hash.to_lowercase());
     }
 }
 
+fn update(game: &Game, dir: &Path, bonus_content: bool, force: bool) {
+    let cdn_info: Vec<CdnFile> = serde_json::from_str(&http::get_body_string(
+        format!("{}/files.json", MASTER).as_str(),
+    ))
+    .unwrap();
+
+    let mut hashes = HashMap::new();
+    let hash_file = dir.join(".sha-sums");
+    if hash_file.exists() && !force {
+        let hash_file = fs::read_to_string(hash_file).unwrap();
+        for line in hash_file.lines() {
+            let mut split = line.split_whitespace();
+            let hash = split.next().unwrap();
+            let file = split.next().unwrap();
+            hashes.insert(file.to_owned(), hash.to_owned());
+        }
+    }
+
+    update_dir(&cdn_info, game.engine, dir, &mut hashes);
+
     if game.engine == "iw4" {
         iw4x::update(dir);
     }
+
+    if bonus_content && !game.bonus.is_empty() {
+        for bonus in game.bonus.iter() {
+            update_dir(&cdn_info, bonus, dir, &mut hashes);
+        }
     }
 
-fn launch(file_path: &PathBuf) {
+    let mut hash_file_content = String::new();
-    println!("Launching {}...", file_path.display());
+    for (file, hash) in hashes.iter() {
+        hash_file_content.push_str(&format!("{} {}\n", hash, file));
+    }
+    fs::write(dir.join(".sha-sums"), hash_file_content).unwrap();
+}
+
+fn launch(file_path: &PathBuf, args: &str) {
+    println!("Launching {} {}", file_path.display(), args);
     std::process::Command::new(file_path)
+        .args(args.trim().split(' '))
+        .current_dir(file_path.parent().unwrap())
         .spawn()
         .expect("Failed to launch the game")
         .wait()
         .expect("Failed to wait for the game process to finish");
 }
 
-fn main() {
+#[cfg(windows)]
-    let mut args: Vec<String> = std::env::args().collect();
+fn setup_env() {
-
+    colored::control::set_virtual_terminal(true).unwrap_or_else(|error| {
-    let mut update_only = false;
+        println!("{:#?}", error);
-    if args.contains(&String::from("update")) {
+        colored::control::SHOULD_COLORIZE.set_override(false);
-        update_only = true;
+    });
-        args.iter()
-            .position(|r| r == "update")
-            .map(|e| args.remove(e));
 }
 
-    if !args.contains(&String::from("skip-launcher-update")) {
+fn arg_value(args: &[String], arg: &str) -> Option<String> {
-        self_update::run(update_only);
-    } else {
     args.iter()
-            .position(|r| r == "skip-launcher-update")
+        .position(|r| r == arg)
-            .map(|e| args.remove(e));
+        .map(|e| args[e + 1].clone())
+}
+
+fn arg_bool(args: &[String], arg: &str) -> bool {
+    args.iter().any(|r| r == arg)
+}
+
+fn arg_remove(args: &mut Vec<String>, arg: &str) {
+    args.iter().position(|r| r == arg).map(|e| args.remove(e));
+}
+
+fn arg_remove_value(args: &mut Vec<String>, arg: &str) {
+    if let Some(e) = args.iter().position(|r| r == arg) {
+        args.remove(e);
+        args.remove(e);
+    };
+}
+
+fn main() {
+    #[cfg(windows)]
+    setup_env();
+
+    let mut args: Vec<String> = std::env::args().collect();
+
+    if arg_bool(&args, "--help") {
+        println!("CLI Args:");
+        println!("    <client>: Specify the client to launch");
+        println!("    --help: Display this help message");
+        println!("    --version: Display the launcher version");
+        println!("    --path/-p <path>: Specify the game directory");
+        println!("    --update/-u: Update only, don't launch the game");
+        println!("    --bonus: Download bonus content");
+        println!("    --force/-f: Force file hash recheck");
+        println!("    --pass <args>: Pass arguments to the game");
+        println!("    --skip-launcher-update: Skip launcher self-update");
+        println!(
+            "\nExample:\n    alterware-launcher.exe iw4x --bonus --pass \"-console -nointro\""
+        );
+        return;
+    }
+
+    if arg_bool(&args, "--version") || arg_bool(&args, "-v") {
+        println!(
+            "{} v{}",
+            "AlterWare Launcher".bright_green(),
+            env!("CARGO_PKG_VERSION")
+        );
+        println!("https://github.com/{}/{}", GH_OWNER, GH_REPO);
+        println!(
+            "\n{}{}{}{}{}{}{}",
+            "For ".on_black(),
+            "Alter".bright_blue().on_black().underline(),
+            "Ware".white().on_black().underline(),
+            ".dev".on_black().underline(),
+            " by ".on_black(),
+            "mxve".bright_magenta().on_black().underline(),
+            ".de".on_black().underline()
+        );
+        return;
+    }
+
+    let install_path: PathBuf;
+    if let Some(path) = arg_value(&args, "--path") {
+        install_path = PathBuf::from(path);
+        arg_remove_value(&mut args, "--path");
+    } else if let Some(path) = arg_value(&args, "-p") {
+        install_path = PathBuf::from(path);
+        arg_remove_value(&mut args, "-p");
+    } else {
+        install_path = std::env::current_dir().unwrap();
+    }
+
+    let mut cfg = config::load(install_path.join("alterware-launcher.json"));
+
+    if !arg_bool(&args, "--skip-launcher-update") && !cfg.skip_self_update {
+        self_update::run(cfg.update_only);
+    } else {
+        arg_remove(&mut args, "--skip-launcher-update");
+    }
+
+    if arg_bool(&args, "--update") || arg_bool(&args, "-u") {
+        cfg.update_only = true;
+        arg_remove(&mut args, "--update");
+        arg_remove(&mut args, "-u");
+    }
+
+    if arg_bool(&args, "--bonus") {
+        cfg.download_bonus_content = true;
+        cfg.ask_bonus_content = false;
+        arg_remove(&mut args, "--bonus");
+    }
+
+    if arg_bool(&args, "--force") || arg_bool(&args, "-f") {
+        cfg.force_update = true;
+        arg_remove(&mut args, "--force");
+        arg_remove(&mut args, "-f");
+    }
+
+    if let Some(pass) = arg_value(&args, "--pass") {
+        cfg.args = pass;
+        arg_remove_value(&mut args, "--pass");
+    } else if cfg.args.is_empty() {
+        cfg.args = String::from("");
     }
 
     let games_json = http::get_body_string(format!("{}/games.json", MASTER).as_str());
@@ -249,9 +433,9 @@ fn main() {
     } else {
         'main: for g in games.iter() {
             for r in g.references.iter() {
-                if std::path::Path::new(r).exists() {
+                if install_path.join(r).exists() {
                     if g.client.len() > 1 {
-                        if update_only {
+                        if cfg.update_only {
                             game = String::from(g.client[0]);
                             break 'main;
                         }
@@ -278,9 +462,30 @@ fn main() {
     for g in games.iter() {
         for c in g.client.iter() {
             if c == &game {
-                update(g, &std::env::current_dir().unwrap());
+                if cfg.ask_bonus_content && !g.bonus.is_empty() {
-                if !update_only {
+                    println!("Download bonus content? (Y/n)");
-                    launch(&PathBuf::from(format!("{}.exe", c)));
+                    let input = misc::stdin().to_ascii_lowercase();
+                    cfg.download_bonus_content = input != "n";
+                    config::save_value(
+                        install_path.join("alterware-launcher.json"),
+                        "download_bonus_content",
+                        cfg.download_bonus_content,
+                    );
+                    config::save_value(
+                        install_path.join("alterware-launcher.json"),
+                        "ask_bonus_content",
+                        false,
+                    );
+                }
+
+                update(
+                    g,
+                    install_path.as_path(),
+                    cfg.download_bonus_content,
+                    cfg.force_update,
+                );
+                if !cfg.update_only {
+                    launch(&install_path.join(format!("{}.exe", c)), &cfg.args);
                 }
                 return;
             }
@@ -293,7 +498,7 @@ fn main() {
     #[cfg(not(windows))]
     manual_install(&games);
 
-    println!("Game not found!");
+    println!("{}", "Game not found!".bright_red());
     println!("Place the launcher in the game folder, if that doesn't work specify the client on the command line (ex. alterware-launcher.exe iw4-sp)");
     println!("Press enter to exit...");
     std::io::stdin().read_line(&mut String::new()).unwrap();

src/misc.rs

@@ -1,5 +1,7 @@
 use std::{fs, path::PathBuf};
 
+use colored::Colorize;
+
 pub fn get_file_sha1(path: &PathBuf) -> String {
     let mut sha1 = sha1_smol::Sha1::new();
     sha1.update(&fs::read(path).unwrap());
@@ -18,3 +20,20 @@ pub fn rev_to_int(rev: &str) -> u16 {
         .parse::<u16>()
         .unwrap_or(0)
 }
+
+pub fn fatal_error(error: &str) {
+    println!("\n\n{}:\n{}", "Error".bright_red(), error);
+    stdin();
+    std::process::exit(1);
+}
+
+pub fn human_readable_bytes(bytes: u64) -> String {
+    let mut bytes = bytes as f64;
+    let mut i = 0;
+    let units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+    while bytes > 1024.0 {
+        bytes /= 1024.0;
+        i += 1;
+    }
+    format!("{:.2} {}", bytes, units[i])
+}

src/self_update.rs

@@ -30,6 +30,7 @@ pub fn run(update_only: bool) {
     use std::{fs, path::PathBuf};
 
     use crate::http;
+    use crate::misc;
 
     let working_dir = std::env::current_dir().unwrap();
     let files = fs::read_dir(&working_dir).unwrap();
@@ -60,10 +61,17 @@ pub fn run(update_only: bool) {
             fs::remove_file(&update_binary).unwrap();
         }
 
+        let launcher_name = if cfg!(target_arch = "x86") {
+            "alterware-launcher-x86.exe"
+        } else {
+            "alterware-launcher.exe"
+        };
+        println!("{}", launcher_name);
         http::download_file(
             &format!(
-                "{}/download/alterware-launcher.exe",
+                "{}/download/{}",
-                github::latest_release_url(GH_OWNER, GH_REPO)
+                github::latest_release_url(GH_OWNER, GH_REPO),
+                launcher_name
             ),
             &file_path,
         );
@@ -75,9 +83,13 @@ pub fn run(update_only: bool) {
 
         self_replace::self_replace("alterware-launcher-update.exe").unwrap();
         fs::remove_file(&file_path).unwrap();
-        println!("Launcher updated. Please run it again.");
+        println!(
+            "Launcher updated. View the changelog at https://github.com/{}/{}/releases/latest",
+            GH_OWNER, GH_REPO,
+        );
+        println!("Please restart the launcher.");
         if !update_only {
-            std::io::stdin().read_line(&mut String::new()).unwrap();
+            misc::stdin();
         }
         std::process::exit(201);
     }

src/structs.rs

@@ -1,4 +1,4 @@
-#[derive(serde::Deserialize, serde::Serialize)]
+#[derive(serde::Deserialize, serde::Serialize, Clone)]
 pub struct CdnFile {
     pub name: String,
     pub size: u32,
@@ -11,4 +11,28 @@ pub struct Game<'a> {
     pub client: Vec<&'a str>,
     pub references: Vec<&'a str>,
     pub app_id: u32,
+    pub bonus: Vec<&'a str>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub struct Config {
+    pub update_only: bool,
+    pub skip_self_update: bool,
+    pub download_bonus_content: bool,
+    pub ask_bonus_content: bool,
+    pub force_update: bool,
+    pub args: String,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            update_only: false,
+            skip_self_update: false,
+            download_bonus_content: false,
+            ask_bonus_content: true,
+            force_update: false,
+            args: String::from(""),
+        }
+    }
 }