Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-14 00:31:33 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(process): fix poorly designed parsing for executables with spaces

Browse Source
This commit is contained in:
DecDuck
2024-12-28 10:13:26 +11:00
parent d7b0302bdd
commit 7c90d2b8fd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src-tauri/src/process/process_manager.rs
View File

@ -60,18 +60,24 @@ impl ProcessManager<'_> {
} }
} }
// There's no easy way to distinguish between an executable name with
// spaces and it's arguments.
// I think if we just join the install_dir to whatever the user provides us, we'll be alright
// In future, we should have a separate field for executable name and it's arguments
fn process_command(&self, install_dir: &String, raw_command: String) -> (PathBuf, Vec<String>) { fn process_command(&self, install_dir: &String, raw_command: String) -> (PathBuf, Vec<String>) {
let command_components = raw_command.split(" ").collect::<Vec<&str>>(); // let command_components = raw_command.split(" ").collect::<Vec<&str>>();
let root = command_components[0].to_string(); let root = raw_command;
let install_dir = Path::new(install_dir); let install_dir = Path::new(install_dir);
let absolute_exe = install_dir.join(root); let absolute_exe = install_dir.join(root);
/*
let args = command_components[1..] let args = command_components[1..]
.iter() .iter()
.map(|v| v.to_string()) .map(|v| v.to_string())
.collect(); .collect();
(absolute_exe, args) */
(absolute_exe, Vec::new())
} }
fn on_process_finish(&mut self, game_id: String, result: Result<ExitStatus, std::io::Error>) { fn on_process_finish(&mut self, game_id: String, result: Result<ExitStatus, std::io::Error>) {
@ -90,9 +96,10 @@ impl ProcessManager<'_> {
let current_state = db_handle.games.statuses.get(&game_id).cloned(); let current_state = db_handle.games.statuses.get(&game_id).cloned();
if let Some(saved_state) = current_state { if let Some(saved_state) = current_state {
if let GameStatus::SetupRequired { if let GameStatus::SetupRequired {
version_name, version_name,
install_dir, install_dir,
} = saved_state { } = saved_state
{
if let Ok(exit_code) = result { if let Ok(exit_code) = result {
if exit_code.success() { if exit_code.success() {
db_handle.games.statuses.insert( db_handle.games.statuses.insert(