Merge pull request #735 from Zagrios/bugfix/reduce-dll-deps-and-add-logs-file-to-external-scripts

Reduce DLL dependencies for "oculus-allow-dev-sideloaded.exe"  and add logging for external scripts

Author: Zagrios

.gitignore

@@ -29,4 +29,4 @@ npm-debug.log.*
 *.scss.d.ts
 
 # externals
-externals/**/target/*
+externals/**/target/**

assets/scripts/oculus-allow-dev-sideloaded.exe

@@ -4,13 +4,18 @@ version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 
+[dependencies]
+simplelog = { version = "0.12.2", default-features = false }
+log = "0.4.24"
+
 [build-dependencies]
 winres = "0.1.12"
 
 [profile.release]
 codegen-units = 1
 lto = true
 opt-level = "z"
+panic = "abort"
 
 [package.metadata.winres]
 FileDescription = "Start Beat Saber as Admin"

assets/scripts/start_beat_saber_admin.exe

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.77.0"

externals/bs-admin-start/Cargo.lock

@@ -1,5 +1,10 @@
 
 use std::{process::Command, path::Path};
+use std::env::current_exe;
+use std::fs::File;
+use std::path::PathBuf;
+use log::{error, info, LevelFilter};
+use simplelog::{CombinedLogger, Config, WriteLogger};
 
 const EXECUTABLE_NAME: &str = "Beat Saber.exe";
 const AUTORIZED_ARGS: [&str; 8] = [
@@ -14,18 +19,37 @@ const AUTORIZED_ARGS: [&str; 8] = [
 ];
 
 fn main() {
+
+    let default_log_file_path = current_exe().unwrap().with_file_name("bs-admin-start.log");
+    let args: Vec<String> = std::env::args().collect();
+
+    let log_file_path: PathBuf = if let Some(pos) = args.iter().position(|arg| arg == "--log-path") {
+        if let Some(log_path) = args.get(pos + 1) {
+            PathBuf::from(log_path)
+        } else {
+            default_log_file_path
+        }
+    } else {
+        default_log_file_path
+    };
+
+    CombinedLogger::init(
+        vec![
+            WriteLogger::new(LevelFilter::Info, Config::default(), File::create(log_file_path).unwrap()),
+        ]
+    ).unwrap();
+
+
     let args: Vec<String> = std::env::args().collect();
 
     let executable_path = Path::new(&args[1]);
 
     if executable_path.file_name().unwrap() != EXECUTABLE_NAME {
-        eprintln!("Executable path is not Beat Saber.exe.");
-        return;
+        return error!("Executable path is not Beat Saber.exe.");
     }
 
     if !executable_path.exists() || !executable_path.is_file() {
-        eprintln!("Executable path is not valid.");
-        return;
+        return error!("Executable path is not valid.");
     }
 
     let mut command = Command::new(executable_path);
@@ -43,5 +67,11 @@ fn main() {
 
     command.env("SteamAppId", "620980");
 
-    let _ = command.spawn();
+    let res = command.spawn();
+
+    if let Err(e) = res {
+        return error!("Failed to start Beat Saber ({}): {}", executable_path.display(), e);
+    }
+
+    info!("Beat Saber started ({})", executable_path.display());
 }