Merge branch 'steam-beta'

Author: Raphiiko

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project (now) adheres to [Calendar Versioning](https://calver.org/#scheme).
 
+## [25.6.5]
+
+### Fixed
+
+- Moved sidecar process logs to the correct log directory
+- Parsing of some cli parameters
+
 ## [25.6.4]
 
 ### Fixed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oyasumi",
-  "version": "25.6.4",
+  "version": "25.6.5",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",

src-core/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr"
-version = "25.6.4"
+version = "25.6.5"
 description = ""
 authors = ["Raphiiko"]
 license = "MIT"

src-core/Cargo.toml

@@ -70,9 +70,16 @@ async fn main() {
         .plugin(tauri_plugin_store::Builder::default().build())
         .plugin(configure_tauri_plugin_aptabase())
         .setup(|app| {
-            let matches = app.cli().matches().unwrap();
+            let matches = match app.cli().matches() {
+                Ok(matches) => Some(matches),
+                Err(e) => {
+                    eprintln!("Error parsing command line arguments: {e}");
+                    app.handle().exit(1);
+                    None
+                }
+            };
             futures::executor::block_on(async {
-                *globals::TAURI_CLI_MATCHES.lock().await = Some(matches);
+                *globals::TAURI_CLI_MATCHES.lock().await = matches;
             });
             match futures::executor::block_on(tauri::async_runtime::spawn(app_setup(
                 app.handle().clone(),

src-core/src/main.rs

@@ -67,7 +67,7 @@
   },
   "productName": "OyasumiVR",
   "mainBinaryName": "OyasumiVR",
-  "version": "25.6.4",
+  "version": "25.6.5",
   "identifier": "co.raphii.oyasumi",
   "plugins": {
     "cli": {
@@ -87,8 +87,8 @@
           "short": "c",
           "description": "Mode for running the core module",
           "longDescription": "See developer notes for more information",
-          "maxValues": 1,
           "takesValue": true,
+          "multiple": false,
           "possibleValues": [
             "release",
             "dev"
@@ -99,20 +99,8 @@
           "short": "o",
           "description": "Mode for handling the overlay sidecar",
           "longDescription": "See developer notes for more information",
-          "maxValues": 1,
-          "takesValue": true,
-          "possibleValues": [
-            "release",
-            "dev"
-          ]
-        },
-        {
-          "name": "mdns-sidecar-mode",
-          "short": "m",
-          "description": "Mode for handling the mdns sidecar",
-          "longDescription": "See developer notes for more information",
-          "maxValues": 1,
           "takesValue": true,
+          "multiple": false,
           "possibleValues": [
             "release",
             "dev"
@@ -151,7 +139,7 @@
         "skipTaskbar": true,
         "minimizable": false,
         "focus": true,
-        "userAgent": "OyasumiVR/25.6.4 (https://github.com/Raphiiko/OyasumiVR)",
+        "userAgent": "OyasumiVR/25.6.5 (https://github.com/Raphiiko/OyasumiVR)",
         "useHttpsScheme": false
       },
       {
@@ -167,7 +155,7 @@
         "theme": "Dark",
         "visible": false,
         "transparent": true,
-        "userAgent": "OyasumiVR/25.6.4 (https://github.com/Raphiiko/OyasumiVR)",
+        "userAgent": "OyasumiVR/25.6.5 (https://github.com/Raphiiko/OyasumiVR)",
         "useHttpsScheme": false
       }
     ],

src-core/tauri.conf.json

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumivr-elevated-sidecar"
-version = "25.6.4"
+version = "25.6.5"
 authors = ["Raphiiko"]
 license = "MIT"
 edition = "2021"

src-elevated-sidecar/Cargo.lock

@@ -30,10 +30,10 @@ async fn main() {
     // Initialize logging
     let log_path = if let Some(base_dirs) = BaseDirs::new() {
         base_dirs
-            .preference_dir()
-            .join("co.raphii.oyasumi/logs/OyasumiSidecar.log")
+            .data_local_dir()
+            .join("co.raphii.oyasumi/logs/OyasumiVR_Elevated_Sidecar.log")
     } else {
-        Path::new("co.raphii.oyasumi/logs/OyasumiSidecar.log").to_path_buf()
+        Path::new("co.raphii.oyasumi/logs/OyasumiVR_Elevated_Sidecar.log").to_path_buf()
     };
     CombinedLogger::init(vec![
         TermLogger::new(

src-elevated-sidecar/Cargo.toml

@@ -12,7 +12,7 @@ public static class LogConfigurator {
 
   public static void Init()
   {
-    var logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+    var logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
       "co.raphii.oyasumi\\logs\\OyasumiVR_Overlay_Sidecar_.log");
     var config = new LoggerConfiguration()
       .Filter.ByExcluding(Matching.FromSource("Microsoft"))