chore: update CHANGELOG.md

* Scale the font as necessary
* Fix CHUNITHM order
* Fix num-unlocked numpad

CHANGELOG.md

@@ -1,3 +1,35 @@
+## 0.10.1
+
+- Fixed the order of cells in the CHUNITHM keyboard
+- Fixed numpad bindings with numlock disabled
+- Disabled primary monitor cleanup when "don't switch primary monitor" is enabled
+
+## 0.10.0
+
+- Added a global progress bar
+- Fixed issues with downloading under certain conditions
+
+## 0.9.0
+
+- Added a light/dark theme switcher
+
+## 0.8.1
+
+- Hotfixed the program failing to launch if the data dir hadn't already been created
+
+## 0.8.0
+
+- Added support for ChuniIO
+    - CHUNITHM support is now complete
+- Added a context menu option to create a desktop shortcut
+- Added a confirmation prompt before deleting a profile
+- Removed Slow
+
+## 0.7.1
+
+- Hotfixed amdaemon crashing at launch
+- Greyed out packages currently incompatible with STARTLINER
+
 ## 0.7.0
 
 - Hopefully fixed issues with the download button

README.md

@@ -1,6 +1,7 @@
 # STARTLINER
 
-A simple and easy to use launcher, configuration tool and mod manager for O.N.G.E.K.I. and CHUNITHM, using [Rainycolor Watercolor](https://rainy.patafour.zip).
+A simple and easy to use launcher, configuration tool and mod manager
+for O.N.G.E.K.I. and CHUNITHM, using [Rainycolor Watercolor](https://rainy.patafour.zip).
 
 Made with Rust (Tauri) and Vue. Technically multiplatform. Contributions welcome.
 
@@ -8,12 +9,9 @@ Made with Rust (Tauri) and Vue. Technically multiplatform. Contributions welcome
 
 - [Clean](https://gitea.tendokyu.moe/akanyan/STARTLINER/wiki/Architecture-details) data modding
 - Segatools configuration
-- Display configuration with automatic rollback
+- Monitor configuration with automatic rollback
 - Support for multiple configurations pointing at the same data
 
-![Mod list](res/list.png)
-![Configuration](res/cfg.png)
-
 ## Usage
 
 Download a prebuilt binary from [Releases](https://gitea.tendokyu.moe/akanyan/STARTLINER/releases) or build it yourself:
@@ -23,37 +21,22 @@ bun install
 bun run tauri build
 ```
 
-Create a profile, then click on things in the configuration tab (game path, `amfs` and network at the least). STARTLINER expects clean data with unpacked binaries. Anything else you may have in the game directory (segatools, BepInEx, etc.) can be present, but will not be used.
+Create a profile, then click on things in the configuration tab (game path, `amfs` and network at the least).
 
-Once a profile has been set up, it is possible to bypass the GUI:
-
-```sh
-startliner --start --game ongeki --profile <name>
-```
-
-To create a desktop shortcut: `Copy -> Paste Shortcut -> Properties`, and then append `--start --game ongeki --profile <name>` to `Target`.
+STARTLINER expects clean data with unpacked binaries. Anything else you may have in the game directory
+(segatools, BepInEx, etc.) can be present, but will not be used.
 
 ## Package format
 
-- [Package format requirements](https://rainy.patafour.zip/package/create/docs/)
-- A subset of the simple BlueSteel Rainycolor format is currently supported. [Full reference (CW: vore)](https://yozora.bluesteel.737.jp.net/HarmonyPublic/SOS-Kongou/wiki/Create-Module#user-content-rainycolor-simple)
-
-```
-├───app
-│   └───BepInEx
-│       └───*
-├───option
-│   └───Axyz
-│       └───*
-├───icon.png
-├───README.md
-└───manifest.json
-```
-
-More file overrides may be supported in the future.
-
-Arbitrary scripts are not supported by design and that will probably never change.
+Refer to [the wiki](https://gitea.tendokyu.moe/akanyan/STARTLINER/wiki/Package-format).
 
 ## See also
 
-- [BlueSteel launcher (CW: vore)](https://yozora.bluesteel.737.jp.net/HarmonyPublic/SOS-Kongou)
+[BlueSteel launcher (CW: vore)](https://yozora.bluesteel.737.jp.net/HarmonyPublic/SOS-Kongou)
+
+## Screenshots
+
+![Package list](res/list.png)
+![Package store](res/store.png)
+![Configuration](res/cfg.png)
+![Keyboard](res/cfg2.png)

TODO.md

@@ -4,6 +4,5 @@
 
 ### Long-term
 
-- Progress bars and other GUI sugar
 - artemis as a special package
 - Other arcade games (if there is demand)

rust/Cargo.lock

@@ -803,7 +803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

rust/Cargo.toml

@@ -53,5 +53,5 @@ tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
 tauri-plugin-updater = "2"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winsafe = { version = "0.0.23", features = ["user"] }
+winsafe = { version = "0.0.23", features = ["user", "ole", "shell"] }
 displayz = "^0.2.0"

rust/src/appdata.rs

@@ -133,6 +133,8 @@ impl AppData {
     }
 
     fn init_logger(cfg: &GlobalConfig) {
+        _ = std::fs::create_dir_all(util::data_dir());
+
         let mut fern_builder;
         let colors = ColoredLevelConfig::new()
             .debug(Color::Green)

rust/src/cmd.rs

@@ -397,6 +397,13 @@ pub async fn load_segatools_ini(state: State<'_, Mutex<AppData>>, path: PathBuf)
     Ok(())
 }
 
+#[tauri::command]
+pub async fn create_shortcut(app: AppHandle, profile_meta: ProfileMeta) -> Result<(), String> {
+    log::debug!("invoke: create_shortcut({:?})", profile_meta);
+
+    util::create_shortcut(app, &profile_meta).map_err(|e| e.to_string())
+}
+
 #[tauri::command]
 pub async fn list_platform_capabilities() -> Result<Vec<String>, ()> {
     log::debug!("invoke: list_platform_capabilities");

rust/src/download_handler.rs

@@ -1,5 +1,4 @@
 use std::{collections::HashSet, path::PathBuf};
-use futures::Stream;
 use serde::{Deserialize, Serialize};
 use tauri::{AppHandle, Emitter};
 use tokio::fs::File;
@@ -15,7 +14,7 @@ pub struct DownloadHandler {
 #[derive(Serialize, Deserialize, Clone)]
 pub struct DownloadTick {
     pkg_key: PkgKey,
-    ratio: f32
+    ratio: f32,
 }
 
 impl DownloadHandler {
@@ -50,14 +49,15 @@ impl DownloadHandler {
 
         let mut cache_file_w = File::create(&zip_path_part).await?;
         let mut byte_stream = reqwest::get(&rmt.download_url).await?.bytes_stream();
-        let first_hint = byte_stream.size_hint().0 as f32;
+        let mut total_bytes = 0;
 
         log::info!("downloading: {}", rmt.download_url);
         while let Some(item) = byte_stream.next().await {
             let i = item?;
-            app.emit("download-tick", DownloadTick {
+            total_bytes += i.len();
+            _ = app.emit("download-progress", DownloadTick {
                 pkg_key: pkg_key.clone(),
-                ratio: 1.0f32 - (byte_stream.size_hint().0 as f32) / first_hint
+                ratio: (total_bytes as f32) / (rmt.file_size as f32),
             })?;
             cache_file_w.write_all(&mut i.as_ref()).await?;
         }

rust/src/lib.rs

@@ -16,7 +16,7 @@ use appdata::{AppData, ToggleAction};
 use model::misc::Game;
 use pkg::PkgKey;
 use pkg_store::Payload;
-use tauri::{AppHandle, Listener, Manager, RunEvent};
+use tauri::{AppHandle, Emitter, Listener, Manager, RunEvent};
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_cli::CliExt;
 use tokio::{fs, sync::Mutex, try_join};
@@ -66,13 +66,8 @@ pub async fn run(_args: Vec<String>) {
                 log::debug!("{:?} {:?} {:?}", start_arg, game_arg, name_arg);
                 if start_arg.occurrences > 0 {
                     start_immediately = true;
-                    app_data.state.remain_open = false;
                 } else {
-                    tauri::WebviewWindowBuilder::new(app, "main", tauri::WebviewUrl::App("index.html".into()))
-                        .title("STARTLINER")
-                        .inner_size(900f64, 480f64)
-                        .min_inner_size(900f64, 480f64)
-                        .build()?;
+                    open_window(apph.clone())?;
                     start_immediately = false;
                 }
 
@@ -107,14 +102,15 @@ pub async fn run(_args: Vec<String>) {
             });
 
             app.listen("download-end", closure!(clone apph, |ev| {
-                log::debug!("download-end triggered: {}", ev.payload());
                 let raw = ev.payload();
+                log::debug!("download-end triggered: {}", raw);
                 let key = PkgKey(raw[1..raw.len()-1].to_owned());
                 let apph = apph.clone();
                 tauri::async_runtime::spawn(async move {
                     let mutex = apph.state::<Mutex<AppData>>();
                     let mut appd = mutex.lock().await;
-                    log::debug!("download-end install {:?}", appd.pkgs.install_package(&key, true, false).await);
+                    let res = appd.pkgs.install_package(&key, true, false).await;
+                    log::debug!("download-end install {:?}", res);
                 });
             }));
 
@@ -131,19 +127,21 @@ pub async fn run(_args: Vec<String>) {
             }));
 
             app.listen("install-end-prelude", closure!(clone apph, |ev| {
-                log::debug!("install-end-prelude triggered: {}", ev.payload());
                 let payload = serde_json::from_str::<Payload>(ev.payload());
+                log::debug!("install-end-prelude triggered: {:?}", payload);
                 let apph = apph.clone();
                 if let Ok(payload) = payload {
                     tauri::async_runtime::spawn(async move {
                         let mutex = apph.state::<Mutex<AppData>>();
                         let mut appd = mutex.lock().await;
+                        let res = appd.toggle_package(payload.pkg.clone(), ToggleAction::EnableSelf);
                         log::debug!(
                             "install-end-prelude toggle {:?}",
-                            appd.toggle_package(payload.pkg.clone(), ToggleAction::EnableSelf)
+                            res
                         );
                         use tauri::Emitter;
-                        log::debug!("install-end {:?}", apph.emit("install-end", payload));
+                        let res = apph.emit("install-end", payload);
+                        log::debug!("install-end {:?}", res);
                     });
                 } else {
                     log::error!("install-end-prelude: invalid payload: {}", ev.payload());
@@ -157,13 +155,20 @@ pub async fn run(_args: Vec<String>) {
                     {
                         let mut appd = mtx.lock().await;
                         if let Err(e) = appd.pkgs.reload_all().await {
-                            log::error!("Unable to reload packages: {}", e);
+                            log::error!("unable to reload packages: {}", e);
                             apph.exit(1);
                         }
                     }
                     if let Err(e) = cmd::startline(apph.clone(), false).await {
-                        log::error!("Unable to launch: {}", e);
-                        apph.exit(1);
+                        log::error!("unable to launch: {}", e);
+                        _ = open_window(apph.clone());
+                        // stupid but effective
+                        std::thread::sleep(std::time::Duration::from_secs(3));
+                        _ = apph.emit("launch-error", e.to_string());
+                    } else {
+                        let mut appd = mtx.lock().await;
+                        appd.state.remain_open = false;
+                        log::info!("started quietly");
                     }
                 });
             } else {
@@ -199,6 +204,7 @@ pub async fn run(_args: Vec<String>) {
             cmd::sync_current_profile,
             cmd::save_current_profile,
             cmd::load_segatools_ini,
+            cmd::create_shortcut,
 
             cmd::get_global_config,
             cmd::set_global_config,
@@ -229,7 +235,8 @@ pub async fn run(_args: Vec<String>) {
                         let mutex = app.state::<Mutex<AppData>>();
                         let appd = mutex.lock().await;
                         if let Some(p) = &appd.profile {
-                            log::debug!("save: {:?}", p.save());
+                            let res = p.save();
+                            log::debug!("save: {:?}", res);
                             app.exit(0);
                         }
                     });
@@ -320,5 +327,16 @@ async fn update(app: tauri::AppHandle) -> tauri_plugin_updater::Result<()> {
 
     log::info!("ending auto-update check");
 
+    Ok(())
+}
+
+fn open_window(apph: AppHandle) -> anyhow::Result<()> {
+    let config = apph.config().clone();
+    tauri::WebviewWindowBuilder::new(&apph, "main", tauri::WebviewUrl::App("index.html".into()))
+        .title(format!("STARTLINER {}", config.version.unwrap_or_default()))
+        .inner_size(900f64, 480f64)
+        .min_inner_size(900f64, 480f64)
+        .build()?;
+
     Ok(())
 }

rust/src/model/misc.rs

@@ -20,6 +20,13 @@ impl Game {
         }
     }
 
+    pub fn print(&self) -> &'static str {
+        match self {
+            Game::Ongeki => "O.N.G.E.K.I.",
+            Game::Chunithm => "CHUNITHM"
+        }
+    }
+
     pub fn hook_exe(&self) -> &'static str {
         match self {
             Game::Ongeki => "mu3hook.dll",
@@ -88,9 +95,10 @@ pub enum StartCheckError {
 }
 
 #[derive(Default, Serialize, Deserialize, Clone)]
-#[serde(default)]
 pub struct ConfigHook {
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub allnet_auth: Option<ConfigHookAuth>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub aime: Option<ConfigHookAime>,
 }
 

rust/src/model/profile.rs

@@ -13,6 +13,14 @@ pub enum Aime {
     Other(PkgKey),
 }
 
+#[derive(Deserialize, Serialize, Clone, Default, PartialEq, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum IOSelection {
+    Hardware,
+    #[default] SegatoolsBuiltIn,
+    Custom(PkgKey)
+}
+
 #[derive(Deserialize, Serialize, Clone, Debug)]
 #[serde(default)]
 pub struct AMNet {
@@ -32,7 +40,9 @@ impl Default for AMNet {
 pub struct Segatools {
     pub target: PathBuf,
     pub hook: Option<PkgKey>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub io: Option<PkgKey>,
+    pub io2: IOSelection,
     pub aime: Aime,
     pub amfs: PathBuf,
     pub option: PathBuf,
@@ -51,6 +61,7 @@ impl Segatools {
                 Game::Chunithm => Some(PkgKey("segatools-chusanhook".to_owned()))
             },
             io: None,
+            io2: IOSelection::SegatoolsBuiltIn,
             amfs: PathBuf::default(),
             option: PathBuf::default(),
             appdata: PathBuf::from("appdata"),

rust/src/model/rainy.rs

@@ -22,4 +22,5 @@ pub struct V1Version {
     pub icon: String,
     pub dependencies: BTreeSet<PkgKeyVersion>,
     pub download_url: String,
+    pub file_size: i64,
 }

rust/src/modules/display_windows.rs

@@ -6,14 +6,14 @@ use tauri::{AppHandle, Listener};
 
 #[derive(Clone)]
 pub struct DisplayInfo {
-    pub primary: String,
+    pub primary: Option<String>,
     pub set: Option<DisplaySet>,
 }
 
 impl Default for DisplayInfo {
     fn default() -> Self {
         DisplayInfo {
-            primary: "default".to_owned(),
+            primary: None,
             set: query_displays().ok(),
         }
     }
@@ -60,7 +60,7 @@ impl Display {
             .ok_or_else(|| anyhow!("Unable to query display settings"))?;
 
         let res = DisplayInfo {
-            primary: primary.name().to_owned(),
+            primary: if self.dont_switch_primary { None } else { Some(primary.name().to_owned()) },
             set: Some(display_set.clone()),
         };
 
@@ -132,12 +132,14 @@ impl Display {
         let display_set = info.set.as_ref()
             .ok_or_else(|| anyhow!("Unable to clean up displays: no display set"))?;
 
-        let primary = display_set
-            .displays()
-            .find(|display| display.name() == info.primary)
-            .ok_or_else(|| anyhow!("Display {} not found", info.primary))?;
+        if let Some(info_primary) = &info.primary {
+            let primary = display_set
+                .displays()
+                .find(|display| display.name() == info_primary)
+                .ok_or_else(|| anyhow!("Display {} not found", info_primary))?;
 
-        primary.set_primary()?;
+            primary.set_primary()?;
+        }
 
         display_set.apply()?;
         displayz::refresh()?;

rust/src/modules/keyboard.rs

@@ -75,6 +75,12 @@ impl Keyboard {
 
     // This is assumed to run in sync after the segatools module
     pub fn line_up(&self, ini: &mut Ini) -> Result<()> {
+        if let Some(enable) = ini.section(Some("io4")).and_then(|s| s.get("enable")) {
+            // io4 was disabled by the Segatools module -> abort
+            if enable == "0" {
+                return Ok(());
+            }
+        }
         match self {
             Keyboard::Ongeki(kb) => {
                 if kb.enabled {
@@ -95,7 +101,19 @@ impl Keyboard {
                         .set("mouse", if kb.use_mouse { "1" } else { "0" });
                 } else {
                     ini.with_section(Some("io4"))
-                        .set("enable", "0");
+                        .set("test", "0")
+                        .set("service", "0")
+                        .set("coin", "0")
+                        .set("left1", "0")
+                        .set("left2", "0")
+                        .set("left3", "0")
+                        .set("right1", "0")
+                        .set("right2", "0")
+                        .set("right3", "0")
+                        .set("leftSide", "0")
+                        .set("rightSide", "0")
+                        .set("leftMenu", "0")
+                        .set("rightMenu", "0");
                 }
             }
             Keyboard::Chunithm(kb) => {
@@ -109,14 +127,21 @@ impl Keyboard {
                     ini.with_section(Some("io3"))
                         .set("test", kb.test.to_string())
                         .set("service", kb.svc.to_string())
-                        .set("coin", kb.coin.to_string())
-                        .set("ir", "0");
+                        .set("coin", kb.coin.to_string());
                 } else {
-                    ini.with_section(Some("io4"))
-                        .set("enable", "0");
-                    ini.with_section(Some("slider"))
-                        .set("enable", "0");
+                    for (i, _) in kb.cell.iter().enumerate() {
+                        ini.with_section(Some("slider")).set(format!("cell{}", i + 1), "0");
+                    }
+                    for (i, _) in kb.ir.iter().enumerate() {
+                        ini.with_section(Some("ir")).set(format!("ir{}", i + 1), "0");
+                    }
+                    ini.with_section(Some("io3"))
+                        .set("test", "0")
+                        .set("service", "0")
+                        .set("coin", "0");
                 }
+                ini.with_section(Some("io3"))
+                    .set("ir", "0");
             }
         }
 

rust/src/modules/segatools.rs

@@ -1,7 +1,7 @@
 use std::path::{PathBuf, Path};
 use anyhow::{anyhow, Result};
 use ini::Ini;
-use crate::{model::{misc::{ConfigHook, ConfigHookAime, ConfigHookAimeUnit, ConfigHookAuth, Game}, profile::{Aime, Segatools}}, profiles::ProfilePaths, util::{self, PathStr}};
+use crate::{model::{misc::{ConfigHook, ConfigHookAime, ConfigHookAimeUnit, ConfigHookAuth, Game}, profile::{Aime, IOSelection, Segatools}}, profiles::ProfilePaths, util::{self, PathStr}};
 use crate::pkg_store::PackageStore;
 
 impl Segatools {
@@ -21,8 +21,8 @@ impl Segatools {
         if let Some(key) = &self.hook {
             remove_if_nonpresent!(self.hook, key, None, store);
         }
-        if let Some(key) = &self.io {
-            remove_if_nonpresent!(self.io, key, None, store);
+        if let IOSelection::Custom(key) = &self.io2 {
+            remove_if_nonpresent!(self.io2, key, IOSelection::default(), store);
         }
         match &self.aime {
             Aime::AMNet(key) => remove_if_nonpresent!(self.aime, key, Aime::BuiltIn, store),
@@ -134,6 +134,9 @@ impl Segatools {
                 if self.amnet.name.len() > 0 {
                     aimeio.set("serverName", &self.amnet.name);
                 }
+            } else if let Aime::Other(key) = &self.aime {
+                ini_out.with_section(Some("aimeio"))
+                    .set("path", util::pkg_dir().join(key.to_string()).join("segatools").join("aimeio.dll").stringify()?);
             }
         } else {
             ini_out.with_section(Some("aime"))
@@ -141,7 +144,7 @@ impl Segatools {
         }
 
         if game == Game::Ongeki {
-            if let Some(io) = &self.io {
+            if let IOSelection::Custom(io) = &self.io2 {
                 ini_out.with_section(Some("mu3io"))
                     .set("path", util::pkg_dir().join(io.to_string()).join("segatools").join("mu3io.dll").stringify()?);
             } else {
@@ -149,6 +152,44 @@ impl Segatools {
                     .set("path", "");
             }
         }
+        match game {
+            Game::Ongeki => {
+                match &self.io2 {
+                    IOSelection::Custom(io) => {
+                        ini_out.with_section(Some("mu3io"))
+                            .set("path", util::pkg_dir().join(io.to_string()).join("segatools").join("mu3io.dll").stringify()?);
+                    }
+                    IOSelection::SegatoolsBuiltIn => {
+                        ini_out.with_section(Some("mu3io"))
+                            .set("path", "");
+                    }
+                    IOSelection::Hardware => {
+                        ini_out.with_section(Some("io4"))
+                            .set("enable", "0");
+                    }
+                }
+            },
+            Game::Chunithm => {
+                match &self.io2 {
+                    IOSelection::Custom(io) => {
+                        ini_out.with_section(Some("chuniio"))
+                            .set("path32", util::pkg_dir().join(io.to_string()).join("segatools").join("chuniio32.dll").stringify()?)
+                            .set("path64", util::pkg_dir().join(io.to_string()).join("segatools").join("chuniio64.dll").stringify()?);
+                    }
+                    IOSelection::SegatoolsBuiltIn => {
+                        ini_out.with_section(Some("chuniio"))
+                            .set("path32", "")
+                            .set("path64", "");
+                    }
+                    IOSelection::Hardware => {
+                        ini_out.with_section(Some("io4"))
+                            .set("enable", "0");
+                        ini_out.with_section(Some("slider"))
+                            .set("enable", "0");
+                    }
+                }
+            }
+        };
 
         log::debug!("option dir: {:?} -> {:?}", opt_dir_in, opt_dir_out);
 

rust/src/pkg.rs

@@ -81,6 +81,7 @@ pub struct Remote {
     pub nsfw: bool,
     pub categories: Vec<String>,
     pub dependencies: BTreeSet<PkgKey>,
+    pub file_size: i64,
 }
 
 impl PkgKey {
@@ -112,7 +113,8 @@ impl Package {
                 nsfw: p.has_nsfw_content,
                 version: v.version_number,
                 categories: p.categories,
-                dependencies: Self::sanitize_deps(v.dependencies)
+                dependencies: Self::sanitize_deps(v.dependencies),
+                file_size: v.file_size
             }),
             source: PackageSource::Rainy,
         })
@@ -128,7 +130,7 @@ impl Package {
             .unwrap()
             .to_owned();
 
-        let status = Self::parse_status(&mft);
+        let status = Self::parse_status(&mft, &dir);
         let dependencies = Self::sanitize_deps(mft.dependencies);
 
         Ok(Package {
@@ -221,9 +223,15 @@ impl Package {
         res
     }
 
-    fn parse_status(mft: &PackageManifest) -> Status {
+    fn parse_status(mft: &PackageManifest, dir: impl AsRef<Path>) -> Status {
         if mft.installers.len() == 0 {
-            return Status::OK(make_bitflags!(Feature::Mod), DLLs { game: None, amd: None }); //Unchecked
+            if dir.as_ref().join("post_load.ps1").exists() {
+                return Status::Unsupported;
+            }
+            if dir.as_ref().join("app").join("data").exists() {
+                return Status::Unsupported;
+            }
+            return Status::OK(make_bitflags!(Feature::Mod), DLLs { game: None, amd: None });
         } else {
             let mut flags = BitFlags::default();
             let mut game_dll = None;
@@ -233,20 +241,14 @@ impl Package {
                     if id == "rainycolor" {
                         flags |= Feature::Mod;
                     } else if id == "segatools" {
-                        // Multiple features in the same dll (yubideck etc.) should be supported at some point
                         if let Some(serde_json::Value::String(module)) = installer.get("module") {
-                            if module == "mu3hook" {
-                                flags |= Feature::Mu3Hook;
-                            } else if module == "chusanhook" {
-                                flags |= Feature::ChusanHook;
-                            } else if module == "amnet" {
-                                flags |= Feature::AMNet | Feature::Aime;
-                            } else if module == "aimeio" {
-                                flags |= Feature::Aime;
-                            } else if module == "mu3io" {
-                                flags |= Feature::Mu3IO;
-                            } else if module == "chuniio" {
-                                flags |= Feature::ChuniIO;
+                            flags |= Self::parse_segatools_module(&module);
+                        }
+                        if let Some(serde_json::Value::Array(arr)) = installer.get("module") {
+                            for elem in arr {
+                                if let serde_json::Value::String(module) = elem {
+                                    flags |= Self::parse_segatools_module(module);
+                                }
                             }
                         }
                     } else if id == "native_mod" {
@@ -274,4 +276,16 @@ impl Package {
             Status::OK(flags, DLLs { game: game_dll, amd: amd_dll })
         }
     }
+
+    fn parse_segatools_module(module: &str) -> BitFlags<Feature, u16> {
+        match module {
+            "mu3hook" =>    make_bitflags!(Feature::Mu3Hook),
+            "chusanhook" => make_bitflags!(Feature::ChusanHook),
+            "amnet" =>      make_bitflags!(Feature::{AMNet | Aime}),
+            "aimeio" =>     make_bitflags!(Feature::Aime),
+            "mu3io" =>      make_bitflags!(Feature::Mu3IO),
+            "chuniio" =>    make_bitflags!(Feature::ChuniIO),
+            _ => BitFlags::default()
+        }
+    }
 }

rust/src/pkg_store.rs

@@ -21,7 +21,7 @@ pub struct PackageStore {
     offline: bool,
 }
 
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct Payload {
     pub pkg: PkgKey
 }

rust/src/profiles/mod.rs

@@ -1,6 +1,6 @@
 pub use types::{Profile, ProfileData, ProfileMeta, ProfilePaths, StartPayload};
 use std::{collections::{BTreeMap, BTreeSet}, path::{Path, PathBuf}};
-use crate::{model::{misc::Game, patch::{PatchFileVec, PatchSelection}, profile::{Aime, ChunithmKeyboard, Keyboard, Mu3Ini, OngekiKeyboard, ProfileModule}}, modules::{display_windows::DisplayInfo, package::prepare_packages}, pkg::PkgKey, pkg_store::PackageStore, util};
+use crate::{model::{misc::Game, patch::{PatchFileVec, PatchSelection}, profile::{Aime, ChunithmKeyboard, IOSelection, Keyboard, Mu3Ini, OngekiKeyboard, ProfileModule}}, modules::{display_windows::DisplayInfo, package::prepare_packages}, pkg::PkgKey, pkg_store::PackageStore, util};
 use tauri::Emitter;
 use std::process::Stdio;
 use crate::model::profile::BepInEx;
@@ -59,8 +59,14 @@ impl Profile {
             log::debug!("{:?}", data);
 
             // Backwards compat
-            if game == Game::Ongeki && data.keyboard.is_none() {
-                data.keyboard = Some(Keyboard::Ongeki(OngekiKeyboard::default()));
+            if game == Game::Ongeki {
+                if data.keyboard.is_none() {
+                    data.keyboard = Some(Keyboard::Ongeki(OngekiKeyboard::default()));
+                }
+                if let Some(io) = data.sgt.io {
+                    data.sgt.io2 = IOSelection::Custom(io);
+                    data.sgt.io = None;
+                }
             }
             if game == Game::Chunithm {
                 if data.keyboard.is_none() {
@@ -112,7 +118,7 @@ impl Profile {
         if let Some(hook) = &self.data.sgt.hook {
             res.push(hook.clone());
         }
-        if let Some(io) = &self.data.sgt.io {
+        if let IOSelection::Custom(io) = &self.data.sgt.io2 {
             res.push(io.clone());
         }
         if let Aime::AMNet(aime) = &self.data.sgt.aime {

rust/src/util.rs

@@ -173,4 +173,44 @@ pub async fn remove_dir_all(path: impl AsRef<Path>) -> Result<()> {
     } else {
         Err(anyhow!("invalid remove_dir_all target: not in a data directory"))
     }
+}
+
+#[cfg(target_os = "windows")]
+pub fn create_shortcut(
+    apph: AppHandle,
+    meta: &crate::profiles::ProfileMeta
+) -> Result<()> {
+    use winsafe::{co, prelude::{ole_IPersistFile, ole_IUnknown, shell_IShellLink}, CoCreateInstance, CoInitializeEx, IPersistFile};
+    let _com_guard = CoInitializeEx(
+        co::COINIT::APARTMENTTHREADED
+        | co::COINIT::DISABLE_OLE1DDE,
+    )?;
+    let obj = CoCreateInstance::<winsafe::IShellLink>(
+        &co::CLSID::ShellLink,
+        None,
+        co::CLSCTX::INPROC_SERVER,
+    )?;
+
+    let target_dir = apph.path().cache_dir()?.join(NAME);
+    let target_path = target_dir.join("startliner.exe");
+    let lnk_path = apph.path().desktop_dir()?.join(format!("{} {}.lnk", &meta.game.print(), &meta.name));
+
+    obj.SetPath(target_path.to_str().ok_or_else(|| anyhow!("Illegal target path"))?)?;
+    obj.SetDescription(&format!("{} – {} (STARTLINER)", &meta.game.print(), &meta.name))?;
+    obj.SetArguments(&format!("--start --game {} --profile {}", &meta.game, &meta.name))?;
+    obj.SetIconLocation(
+        target_dir.join(format!("icon-{}.ico", &meta.game)).to_str().ok_or_else(|| anyhow!("Illegal icon path"))?, 
+        0
+    )?;
+
+    match meta.game {
+        Game::Ongeki => std::fs::write(target_dir.join("icon-ongeki.ico"), include_bytes!("../../res/icon-ongeki.ico")),
+        Game::Chunithm => std::fs::write(target_dir.join("icon-chunithm.ico"), include_bytes!("../../res/icon-chunithm.ico"))
+    }?;
+
+    let file = obj.QueryInterface::<IPersistFile>()?;
+
+    file.Save(Some(lnk_path.to_str().ok_or_else(|| anyhow!("Illegal shortcut path"))?), true)?;
+
+    Ok(())
 }

rust/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://schema.tauri.app/config/2",
     "productName": "STARTLINER",
-    "version": "0.7.0",
+    "version": "0.10.1",
     "identifier": "zip.patafour.startliner",
     "build": {
         "beforeDevCommand": "bun run dev",
@@ -66,7 +66,7 @@
     "bundle": {
         "active": true,
         "targets": "all",
-        "icon": ["icons/slow.png", "icons/slow.ico"],
+        "icon": ["icons/icon.png", "icons/icon.ico"],
         "createUpdaterArtifacts": true
     }
 }

src/components/App.vue

@@ -28,7 +28,9 @@ import {
     usePrfStore,
 } from '../stores';
 import { Dirs } from '../types';
-import { messageSplit } from '../util';
+import { messageSplit, shouldPreferDark } from '../util';
+
+document.documentElement.classList.toggle('use-dark-mode', shouldPreferDark());
 
 const pkg = usePkgStore();
 const prf = usePrfStore();
@@ -80,6 +82,66 @@ listen<{ message: string; header: string }>('invoke-error', (event) => {
     errorMessage.value = event.payload.message;
     errorHeader.value = event.payload.header;
 });
+
+listen<string>('launch-error', (event) => {
+    errorVisible.value = true;
+    errorMessage.value = event.payload;
+    errorHeader.value = 'Launch error';
+});
+
+interface DownloadingStatus {
+    ratio: number;
+    pkg_key: string;
+}
+const downloading_status: Ref<DownloadingStatus[]> = ref([]);
+
+const download_value = computed(() => {
+    return (
+        downloading_status.value.map((v) => v.ratio).reduce((a, v) => a * v) *
+        100
+    );
+});
+
+const downloadProgressText = computed(() => {
+    if (download_value.value < 7) {
+        return '';
+    }
+    let pkgs = `${downloading_status.value.length} package${downloading_status.value.length === 1 ? '' : 's'}`;
+    if (download_value.value < 14) {
+        return pkgs;
+    } else {
+        return `${pkgs} (${Math.floor(download_value.value)}%)`;
+    }
+});
+
+listen<DownloadingStatus>('download-progress', (event) => {
+    let status = downloading_status.value.find(
+        (v) => v.pkg_key === event.payload.pkg_key
+    );
+
+    if (status === undefined) {
+        status = {
+            ratio: 0,
+            pkg_key: event.payload.pkg_key,
+        };
+        downloading_status.value.push(status);
+    }
+    status.ratio = event.payload.ratio;
+
+    const remove = () => {
+        if (status !== undefined) {
+            downloading_status.value = downloading_status.value.filter(
+                (v) => v.pkg_key !== event.payload.pkg_key
+            );
+        }
+    };
+
+    if (status.ratio === 1.0) {
+        remove();
+    }
+
+    setTimeout(() => remove, 10_000);
+});
 </script>
 
 <template>
@@ -94,6 +156,16 @@ listen<{ message: string; header: string }>('invoke-error', (event) => {
                     : 'main-scale-xl'
         "
     >
+        <div
+            v-if="downloading_status.length > 0"
+            class="download-progress-bg"
+        ></div>
+        <ProgressBar
+            v-if="downloading_status.length > 0"
+            :value="download_value"
+            class="download-progress"
+            >{{ downloadProgressText }}</ProgressBar
+        >
         <ConfirmDialog>
             <template #message="{ message }">
                 <ScrollPanel
@@ -122,7 +194,7 @@ listen<{ message: string; header: string }>('invoke-error', (event) => {
                 {{ errorMessage }}
                 <Button
                     class="m-auto"
-                    label="A sad state of affairs"
+                    label="OK"
                     @click="errorVisible = false"
                 />
             </div>
@@ -154,7 +226,10 @@ listen<{ message: string; header: string }>('invoke-error', (event) => {
                         ><div class="pi pi-box"></div
                     ></Tab>
                     <Tab
-                        v-if="prf.current?.meta.game === 'chunithm'"
+                        v-if="
+                            prf.current?.meta.game === 'chunithm' &&
+                            prf.current.data.sgt.target.length > 0
+                        "
                         value="patches"
                         ><div class="pi pi-ticket"></div
                     ></Tab>
@@ -255,6 +330,20 @@ listen<{ message: string; header: string }>('invoke-error', (event) => {
                     <div v-else>
                         Patches require <code>mempatcher</code> to be installed
                         and enabled.
+
+                        <div>
+                            <Button
+                                label="Add mempatcher"
+                                icon="pi pi-plus"
+                                class="mt-3"
+                                @click="
+                                    () =>
+                                        pkg.installFromKey(
+                                            'mempatcher-mempatcher'
+                                        )
+                                "
+                            />
+                        </div>
                     </div>
                 </TabPanel>
                 <TabPanel value="info">
@@ -328,4 +417,23 @@ body {
 .p-progressbar-label {
     transition-duration: 0s !important;
 }
+
+.download-progress {
+    position: fixed !important;
+    bottom: 0;
+    left: 5vw;
+    width: 90vw;
+    z-index: 10000 !important;
+    margin: 20px auto;
+}
+.download-progress-bg {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100vw;
+    height: 60px;
+    background-color: var(--p-surface-900);
+    border-top: 1px solid var(--p-surface-600);
+    z-index: 998;
+}
 </style>

src/components/InstallButton.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from 'vue';
 import Button from 'primevue/button';
 import { invoke } from '../invoke';
 import { usePkgStore } from '../stores';
@@ -11,20 +12,26 @@ const props = defineProps({
     pkg: Object as () => Package,
 });
 
+const deleting = ref(false);
+
 const remove = async () => {
     if (props.pkg === undefined) {
         return;
     }
 
+    deleting.value = true;
+
     await invoke('delete_package', {
         key: pkgKey(props.pkg),
     });
+
+    deleting.value = false;
 };
 </script>
 
 <template>
     <Button
-        v-if="pkg?.loc && !pkg?.js.busy"
+        v-if="pkg?.loc && !pkg?.js.downloading"
         rounded
         icon="pi pi-trash"
         severity="danger"
@@ -32,7 +39,7 @@ const remove = async () => {
         size="small"
         class="self-center ml-4"
         style="width: 2rem; height: 2rem"
-        :loading="pkg?.js.busy"
+        :loading="deleting"
         v-on:click="remove()"
     />
 
@@ -45,7 +52,7 @@ const remove = async () => {
         size="small"
         class="self-center ml-4"
         style="width: 2rem; height: 2rem"
-        :loading="pkg?.js.busy"
+        :loading="pkg?.js.downloading"
         v-on:click="async () => await pkgs.install(pkg)"
     />
 </template>

src/components/KeyboardKey.vue

@@ -15,9 +15,51 @@ const handleKey = (
 ) => {
     event.preventDefault();
 
-    const keycode = toKeycode(event.code);
+    let keycode = toKeycode(event.code);
+
     if (keycode !== null && button !== undefined) {
         const data = prf.current!.data.keyboard!.data as any;
+
+        if (event.getModifierState('NumLock') === false) {
+            switch (event.code) {
+                case 'NumpadDecimal':
+                    keycode = toKeycode('Delete');
+                    break;
+                case 'Numpad0':
+                    keycode = toKeycode('Insert');
+                    break;
+                case 'Numpad1':
+                    keycode = toKeycode('End');
+                    break;
+                case 'Numpad2':
+                    keycode = toKeycode('ArrowDown');
+                    break;
+                case 'Numpad3':
+                    keycode = toKeycode('PageDown');
+                    break;
+                case 'Numpad4':
+                    keycode = toKeycode('ArrowLeft');
+                    break;
+                case 'Numpad5':
+                    keycode = toKeycode('Clear');
+                    break;
+                case 'Numpad6':
+                    keycode = toKeycode('ArrowRight');
+                    break;
+                case 'Numpad7':
+                    keycode = toKeycode('Home');
+                    break;
+                case 'Numpad8':
+                    keycode = toKeycode('ArrowUp');
+                    break;
+                case 'Numpad9':
+                    keycode = toKeycode('PageUp');
+                    break;
+                default:
+                    break;
+            }
+        }
+
         if (index !== undefined) {
             data[button][index] = keycode;
         } else {
@@ -75,7 +117,7 @@ const handleMouse = (
     }
 };
 
-const getKey = (key: keyof OngekiButtons, index?: number) =>
+const getKey = (key: keyof OngekiButtons, index?: number): any =>
     computed(() => {
         const data = prf.current!.data.keyboard?.data as any;
         const keycode =
@@ -93,6 +135,7 @@ const KEY_MAP: { [key: number]: string } = {
     6: 'M5',
     8: 'Backspace',
     9: 'Tab',
+    12: 'Clear',
     13: 'Enter',
     19: 'Pause',
     20: 'CapsLock',
@@ -204,28 +247,45 @@ const toKeycode = (key: string): number | null => {
     return res ? parseInt(res) : null;
 };
 
-defineProps({
+const props = defineProps({
     small: Boolean,
-    verySmall: Boolean,
     tall: Boolean,
     tooltip: String,
     button: String,
     color: String,
     index: Number,
 });
+
+const modelValue = computed(() => {
+    return getKey(props.button as keyof OngekiButtons, props.index).value;
+});
+
+const fontSize = computed(() => {
+    if (!props.small) {
+        return '1rem';
+    }
+    const len = modelValue.value.length;
+    if (len < 5) {
+        return '1rem';
+    }
+    if (len < 7) {
+        return '0.75rem';
+    }
+    return '0.5rem';
+});
 </script>
 
 <template>
     <InputText
         :style="{
-            width: small ? '3em' : '5em',
-            height: small ? '3em' : tall ? '10em' : '5em',
-            fontSize: small ? '0.9em' : '1em',
+            width: small ? '2.8rem' : '5rem',
+            height: small ? '2.8rem' : tall ? '10rem' : '5rem',
+            fontSize,
             backgroundColor: color,
         }"
         unstyled
         class="text-center buttoninputtext"
-        v-tooltip="tooltip"
+        v-tooltip="tooltip ? `${tooltip}: ${modelValue}` : undefined"
         @contextmenu.prevent="() => {}"
         @keydown="(ev: KeyboardEvent) => handleKey(button, ev, index)"
         @mousedown="
@@ -233,7 +293,7 @@ defineProps({
                 handleMouse(button as keyof OngekiButtons, ev, index)
         "
         @focusout="() => (hasClickedM1Once = false)"
-        :model-value="getKey(button as keyof OngekiButtons, index) as any"
+        :model-value="modelValue"
     />
 </template>
 
@@ -241,5 +301,7 @@ defineProps({
 .buttoninputtext {
     border-radius: 6px;
     border: 1px solid rgba(200, 200, 200, 0.3);
+    overflow: scroll !important;
+    text-align: center !important;
 }
 </style>

src/components/ModList.vue

@@ -15,7 +15,6 @@ const props = defineProps({
 
 const pkgs = usePkgStore();
 const prf = usePrfStore();
-const groupCallIndex = ref(0);
 const empty = ref(false);
 const gameSublist: Ref<string[]> = ref([]);
 
@@ -46,10 +45,7 @@ const group = computed(() => {
             ({ namespace }) => namespace
         )
     );
-    if (groupCallIndex.value > 0) {
-        empty.value = Object.keys(res).length === 0;
-    }
-    groupCallIndex.value += 1;
+    empty.value = Object.keys(res).length === 0;
     return res;
 });
 

src/components/ModListEntry.vue

@@ -26,19 +26,32 @@ const model = computed({
         await prf.togglePkg(props.pkg, value);
     },
 });
+
+const unsupported = computed(() => props.pkg!.loc!.status === 'Unsupported');
+
+if (unsupported.value === true && model.value === true) {
+    prf.togglePkg(props.pkg, false);
+}
 </script>
 
 <template>
     <div class="flex items-center">
         <ModTitlecard show-version show-icon show-description :pkg="pkg" />
         <UpdateButton :pkg="pkg" />
-        <ToggleSwitch
-            v-if="hasFeature(pkg, Feature.Mod)"
-            class="scale-[1.33] shrink-0"
-            inputId="switch"
-            :disabled="pkg!.loc!.status === 'Unsupported'"
-            v-model="model"
-        />
+        <span
+            v-tooltip="
+                unsupported &&
+                'This package is currently incompatible with STARTLINER.'
+            "
+        >
+            <ToggleSwitch
+                v-if="hasFeature(pkg, Feature.Mod) || unsupported === true"
+                class="scale-[1.33] shrink-0"
+                inputId="switch"
+                :disabled="unsupported === true"
+                v-model="model"
+            />
+        </span>
         <InstallButton :pkg="pkg" />
         <Button
             rounded

src/components/PatchEntry.vue

@@ -3,7 +3,7 @@ import InputNumber from 'primevue/inputnumber';
 import ToggleSwitch from 'primevue/toggleswitch';
 import OptionRow from './OptionRow.vue';
 import { usePrfStore } from '../stores';
-import { Patch } from '@/types';
+import { Patch } from '../types';
 
 const prf = usePrfStore();
 

src/components/ProfileListEntry.vue

@@ -2,6 +2,7 @@
 import { ref } from 'vue';
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
+import { useConfirm } from 'primevue/useconfirm';
 import * as path from '@tauri-apps/api/path';
 import { invoke } from '../invoke';
 import { useGeneralStore, usePrfStore } from '../stores';
@@ -9,6 +10,8 @@ import { ProfileMeta } from '../types';
 
 const general = useGeneralStore();
 const prf = usePrfStore();
+const confirmDialog = useConfirm();
+
 const isEditing = ref(false);
 
 const props = defineProps({
@@ -54,6 +57,14 @@ const deleteProfile = async () => {
     await prf.reloadList();
     await prf.reload();
 };
+
+const promptDeleteProfile = async () => {
+    confirmDialog.require({
+        message: `Are you sure you want to delete ${props.p?.game}-${props.p?.name}?`,
+        header: 'Delete profile',
+        accept: deleteProfile,
+    });
+};
 </script>
 
 <template>
@@ -90,7 +101,7 @@ const deleteProfile = async () => {
             size="small"
             class="self-center ml-2"
             style="width: 2rem; height: 2rem"
-            @click="deleteProfile"
+            @click="promptDeleteProfile"
         />
         <Button
             rounded

src/components/StartButton.vue

@@ -85,6 +85,15 @@ listen('launch-end', () => {
     getCurrentWindow().setFocus();
 });
 
+const createShortcut = async () => {
+    const current = prf.current;
+    if (current !== null) {
+        await invoke('create_shortcut', {
+            profileMeta: current.meta,
+        });
+    }
+};
+
 const menuItems = [
     {
         label: 'Refresh and start',
@@ -96,6 +105,11 @@ const menuItems = [
         icon: 'pi pi-exclamation-circle',
         command: async () => await startline(true, false),
     },
+    {
+        label: 'Create desktop shortcut',
+        icon: 'pi pi-link',
+        command: createShortcut,
+    },
 ];
 const menu = ref();
 

src/components/UpdateButton.vue

@@ -20,17 +20,15 @@ const install = async () => {
         });
     } catch (err) {
         if (props.pkg !== undefined) {
-            props.pkg.js.busy = false;
+            props.pkg.js.downloading = false;
         }
     }
-
-    //if (rv === 'Deferred') { /* download progress */ }
 };
 </script>
 
 <template>
     <Button
-        v-if="needsUpdate(pkg) && !pkg?.js.busy"
+        v-if="needsUpdate(pkg) && !pkg?.js.downloading"
         rounded
         icon="pi pi-download"
         severity="success"

src/components/options/Aime.vue

@@ -84,6 +84,7 @@ load();
         </OptionRow>
         <OptionRow
             title="Aime code"
+            tooltip="Only applicable with the segatools built-in emulation or with compatible third-party packages"
             v-if="prf.current!.data.sgt.aime !== 'Disabled'"
         >
             <InputText

src/components/options/Keyboard.vue

@@ -11,7 +11,10 @@ const prf = usePrfStore();
 
 <template>
     <OptionCategory title="Keyboard">
-        <OptionRow title="Enable">
+        <OptionRow
+            title="Enable"
+            tooltip="Only applicable if the IO module is set to segatools built-in (keyboard) or a compatible third-party module (like mu3io.NET)"
+        >
             <ToggleSwitch v-model="prf.current!.data.keyboard!.data.enabled" />
         </OptionRow>
         <OptionRow
@@ -30,6 +33,7 @@ const prf = usePrfStore();
             />
         </OptionRow>
         <div
+            v-if="prf.current!.data.keyboard!.data.enabled"
             :style="`position: relative; height: ${prf.current!.data.keyboard!.game === 'Ongeki' ? 400 : 250}px`"
         >
             <div
@@ -120,7 +124,7 @@ const prf = usePrfStore();
                         <div
                             v-for="idx in Array(16)
                                 .fill(0)
-                                .map((_, i) => 16 - i)"
+                                .map((_, i) => 32 - 2 * i - 1)"
                         >
                             <KeyboardKey
                                 button="cell"
@@ -138,7 +142,7 @@ const prf = usePrfStore();
                         <div
                             v-for="idx in Array(16)
                                 .fill(0)
-                                .map((_, i) => 32 - i)"
+                                .map((_, i) => 32 - 2 * i)"
                         >
                             <KeyboardKey
                                 button="cell"

src/components/options/Segatools.vue

@@ -126,17 +126,28 @@ const checkSegatoolsIni = async (target: string) => {
         </OptionRow>
         <OptionRow
             :title="names.io"
-            v-if="prf.current?.meta.game === 'ongeki'"
             tooltip="IO plugins can be downloaded from the package store."
         >
             <Select
-                v-model="prf.current!.data.sgt.io"
-                placeholder="segatools built-in"
+                v-model="prf.current!.data.sgt.io2"
                 :options="[
-                    { title: 'segatools built-in', value: null },
-                    ...pkgs.byFeature(Feature.Mu3IO).map((p) => {
-                        return { title: pkgKey(p), value: pkgKey(p) };
-                    }),
+                    { title: 'native io4', value: 'hardware' },
+                    {
+                        title: 'segatools built-in (keyboard)',
+                        value: 'segatools_built_in',
+                    },
+                    ...pkgs
+                        .byFeature(
+                            prf.current?.meta.game === 'ongeki'
+                                ? Feature.Mu3IO
+                                : Feature.ChuniIO
+                        )
+                        .map((p) => {
+                            return {
+                                title: pkgKey(p),
+                                value: { custom: pkgKey(p) },
+                            };
+                        }),
                 ]"
                 option-label="title"
                 option-value="value"

src/components/options/Startliner.vue

@@ -34,6 +34,15 @@ const verboseModel = computed({
         await client.setVerbose(value);
     },
 });
+
+const themeModel = computed({
+    get() {
+        return client.theme;
+    },
+    async set(value: 'light' | 'dark' | 'system') {
+        await client.setTheme(value);
+    },
+});
 </script>
 
 <template>
@@ -67,5 +76,18 @@ const verboseModel = computed({
         >
             <ToggleSwitch v-model="verboseModel" />
         </OptionRow>
+        <OptionRow title="Theme">
+            <SelectButton
+                v-model="themeModel"
+                :options="[
+                    { title: 'System', value: 'system' },
+                    { title: 'Light', value: 'light' },
+                    { title: 'Dark', value: 'dark' },
+                ]"
+                :allow-empty="false"
+                option-label="title"
+                option-value="value"
+            />
+        </OptionRow>
     </OptionCategory>
 </template>

src/main.ts

@@ -17,6 +17,9 @@ app.use(pinia);
 app.use(PrimeVue, {
     theme: {
         preset: Preset,
+        options: {
+            darkModeSelector: '.use-dark-mode',
+        },
     },
 });
 app.use(ConfirmationService);

src/stores.ts

@@ -6,7 +6,12 @@ import { PhysicalSize, getCurrentWindow } from '@tauri-apps/api/window';
 import { readTextFile, writeTextFile } from '@tauri-apps/plugin-fs';
 import { invoke, invoke_nopopup } from './invoke';
 import { Dirs, Feature, Game, Package, Profile, ProfileMeta } from './types';
-import { changePrimaryColor, hasFeature, pkgKey } from './util';
+import {
+    changePrimaryColor,
+    hasFeature,
+    pkgKey,
+    shouldPreferDark,
+} from './util';
 
 type InstallStatus = {
     pkg: string;
@@ -114,13 +119,13 @@ export const usePkgStore = defineStore('pkg', {
             listen<InstallStatus>('install-start', async (ev) => {
                 const key = ev.payload.pkg;
                 await this.reload(key);
-                this.pkg[key].js.busy = true;
+                this.pkg[key].js.downloading = true;
             });
 
             listen<InstallStatus>('install-end', async (ev) => {
                 const key = ev.payload.pkg;
                 await this.reload(key);
-                this.pkg[key].js.busy = false;
+                this.pkg[key].js.downloading = false;
             });
         },
 
@@ -147,17 +152,22 @@ export const usePkgStore = defineStore('pkg', {
 
         async reloadWith(key: string, pkg: Package) {
             if (this.pkg[key] === undefined) {
-                this.pkg[key] = { js: { busy: false } } as Package;
+                this.pkg[key] = { js: { downloading: false } } as Package;
             } else {
                 this.pkg[key].loc = null;
                 this.pkg[key].rmt = null;
             }
             Object.assign(this.pkg[key], pkg);
 
+            if (!pkg.js) {
+                pkg.js = { downloading: false };
+            }
+
             if (pkg.rmt !== null) {
                 pkg.rmt.categories.forEach((c) =>
                     this.availableCategories.add(c)
                 );
+                pkg.js.downloading = false;
             }
         },
 
@@ -188,9 +198,8 @@ export const usePkgStore = defineStore('pkg', {
                     force: true,
                 });
             } catch (err) {
-                console.error(err);
                 if (pkg !== undefined) {
-                    pkg.js.busy = false;
+                    pkg.js.downloading = false;
                 }
             }
         },
@@ -329,7 +338,7 @@ export const usePrfStore = defineStore('prf', () => {
             if (timeout !== null) {
                 clearTimeout(timeout);
             }
-            timeout = setTimeout(() => invoke('save_current_profile'), 2000);
+            timeout = setTimeout(() => invoke('save_current_profile'), 600);
         }
     });
 
@@ -356,6 +365,7 @@ export const useClientStore = defineStore('client', () => {
     const offlineMode = ref(false);
     const enableAutoupdates = ref(true);
     const verbose = ref(false);
+    const theme: Ref<'light' | 'dark' | 'system'> = ref('system');
 
     const scaleValue = (value: ScaleType) =>
         value === 's' ? 1 : value === 'm' ? 1.25 : value === 'l' ? 1.5 : 2;
@@ -406,6 +416,11 @@ export const useClientStore = defineStore('client', () => {
             if (input.scaleFactor) {
                 await setScaleFactor(input.scaleFactor);
             }
+
+            if (input.theme) {
+                theme.value = input.theme;
+            }
+            await setTheme(theme.value);
         } catch (e) {
             console.error(`Error reading client options: ${e}`);
         }
@@ -436,6 +451,7 @@ export const useClientStore = defineStore('client', () => {
                     w: Math.floor(size.width),
                     h: Math.floor(size.height),
                 },
+                theme: theme.value,
             })
         );
     };
@@ -468,6 +484,21 @@ export const useClientStore = defineStore('client', () => {
         await invoke('set_global_config', { field: 'verbose', value });
     };
 
+    const setTheme = async (value: 'light' | 'dark' | 'system') => {
+        if (value === 'dark') {
+            document.documentElement.classList.add('use-dark-mode');
+        } else if (value === 'light') {
+            document.documentElement.classList.remove('use-dark-mode');
+        } else {
+            document.documentElement.classList.toggle(
+                'use-dark-mode',
+                shouldPreferDark()
+            );
+        }
+        theme.value = value;
+        await save();
+    };
+
     getCurrentWindow().onResized(async ({ payload }) => {
         // For whatever reason this is 0 when minimized
         if (payload.width > 0) {
@@ -480,6 +511,7 @@ export const useClientStore = defineStore('client', () => {
         offlineMode,
         enableAutoupdates,
         verbose,
+        theme,
         timeout,
         scaleModel,
         load,
@@ -488,5 +520,6 @@ export const useClientStore = defineStore('client', () => {
         setOfflineMode,
         setAutoupdates,
         setVerbose,
+        setTheme,
     };
 });

src/types.ts

@@ -19,7 +19,7 @@ export interface Package {
         icon: string;
     } | null;
     js: {
-        busy: boolean;
+        downloading: boolean;
     };
 }
 
@@ -66,7 +66,7 @@ export interface ProfileData {
 export interface SegatoolsConfig {
     target: string;
     hook: string | null;
-    io: string | null;
+    io2: 'segatools_built_in' | 'hardware' | { custom: string };
     amfs: string;
     option: string;
     appdata: string;

src/util.ts

@@ -59,3 +59,7 @@ export const hasFeature = (pkg: Package | undefined, feature: Feature) => {
 export const messageSplit = (message: any) => {
     return message.message?.split('\n');
 };
+
+export const shouldPreferDark = () => {
+    return window.matchMedia('(prefers-color-scheme: dark)').matches;
+};