From 76b6cac979f0728d23aa1ea1bbf05c34de823842 Mon Sep 17 00:00:00 2001 From: Samuel Walker Date: Sun, 23 Jun 2024 00:49:03 -0600 Subject: [PATCH] Added launch prism command --- FCLauncher/src-tauri/src/main.rs | 2 +- FCLauncher/src-tauri/src/prism.rs | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/FCLauncher/src-tauri/src/main.rs b/FCLauncher/src-tauri/src/main.rs index 8b5d86a..e7f5437 100644 --- a/FCLauncher/src-tauri/src/main.rs +++ b/FCLauncher/src-tauri/src/main.rs @@ -31,7 +31,7 @@ fn greet(name: &str) -> String { fn main() { prism::install_prism(); tauri::Builder::default() - .invoke_handler(tauri::generate_handler![greet, modpack::get_modpacks, modpack::launch_modpack]) + .invoke_handler(tauri::generate_handler![greet, modpack::get_modpacks, modpack::launch_modpack, prism::launch_prism]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/FCLauncher/src-tauri/src/prism.rs b/FCLauncher/src-tauri/src/prism.rs index bc50ffc..b062a03 100644 --- a/FCLauncher/src-tauri/src/prism.rs +++ b/FCLauncher/src-tauri/src/prism.rs @@ -1,9 +1,9 @@ -use std::{env, fs::File, io::{BufRead, Cursor, Seek, Write}, path::PathBuf, str::FromStr}; +use std::{env, fs::File, io::{BufRead, Cursor, Seek, Write}, path::PathBuf, process::Command, str::FromStr}; use flate2::read::GzDecoder; use tar::Archive; use tauri::api::file; -use crate::{ftp, java, system_dirs::get_local_data_directory}; +use crate::{ftp, java, system_dirs::{get_local_data_directory, get_prism_executable}}; pub fn check_prism() -> bool { @@ -59,3 +59,10 @@ pub fn install_prism() -> Result<(), Box>{ Ok(()) } + + +#[tauri::command] +pub fn launch_prism() { + + let mut child = Command::new(get_local_data_directory().join("prism").join(get_prism_executable())).spawn().unwrap(); +}