EZPPFarm/EZPPLauncher
2
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Activity

Merge branch 'tauri' of https://git.ez-pp.farm/EZPPFarm/EZPPLauncher into tauri

Browse Source
This commit is contained in:
HorizonCode
2025-07-14 19:39:41 +02:00
parent 86033e2d6a 1a563e64d5
commit 307e0c9747
11 changed files with 132 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src-tauri/src/commands.rs
View File

@@ -14,7 +14,7 @@ use tokio::time::{Duration, sleep};
use crate::presence;
use crate::utils::{
check_folder_completeness, get_osu_config, get_osu_user_config, get_window_title_by_pid,
set_osu_config_vals, set_osu_user_config_vals,
set_osu_config_vals, set_osu_user_config_vals, is_wmctrl_available, is_osuwinello_available
};
#[tauri::command]
@@ -282,8 +282,6 @@ pub fn set_osu_config_values(
#[tauri::command]
pub async fn run_osu_updater(folder: String) -> Result<(), String> {
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
#[cfg(windows)]
const DETACHED_PROCESS: u32 = 0x00000008;
#[cfg(windows)]
@@ -292,6 +290,7 @@ pub async fn run_osu_updater(folder: String) -> Result<(), String> {
let mut updater_process = {
#[cfg(windows)]
{
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
Command::new(&osu_exe_path)
.arg("-repair")
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
@@ -301,7 +300,7 @@ pub async fn run_osu_updater(folder: String) -> Result<(), String> {
#[cfg(not(windows))]
{
Command::new(&osu_exe_path)
Command::new("osu-wine")
.arg("-repair")
.spawn()
.map_err(|e| format!("Failed to spawn updater: {}", e))?
@@ -372,8 +371,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
/* #[cfg(windows)]
use std::os::windows::process::CommandExt; */
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
#[cfg(windows)]
const DETACHED_PROCESS: u32 = 0x00000008;
#[cfg(windows)]
@@ -382,6 +379,7 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
let mut game_process = {
#[cfg(windows)]
{
let osu_exe_path = PathBuf::from(&folder).join("osu!.exe");
Command::new(&osu_exe_path)
.arg("-devserver")
.arg("ez-pp.farm")
@@ -392,8 +390,8 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
#[cfg(not(windows))]
{
Command::new(&osu_exe_path)
.arg("-devserver")
Command::new("osu-wine")
.arg("--devserver")
.arg("ez-pp.farm")
.spawn()
.map_err(|e| format!("Failed to spawn updater: {}", e))?
@@ -416,13 +414,6 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
.spawn()
.map_err(|e| format!("Failed to run patcher: {e}"))?;
}
#[cfg(not(windows))]
{
let _ = Command::new(&patcher_exe_path)
.spawn()
.map_err(|e| format!("Failed to run patcher: {e}"))?;
}
}
}
@@ -715,3 +706,13 @@ pub async fn presence_update_user(user: PresenceUser) {
pub async fn presence_is_connected() -> bool {
presence::has_presence().await
}
#[tauri::command]
pub fn has_wmctrl() -> bool {
is_wmctrl_available()
}
#[tauri::command]
pub fn has_osuwinello() -> bool {
is_osuwinello_available()
}