chore: implement otd commands, check if otd daemon is already running
This commit is contained in:
3 files changed
+14
-6
No files matched your search
@@ -14,10 +14,11 @@ use crate::commands::{
|
|||||||
find_osu_installation, get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid,
|
find_osu_installation, get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid,
|
||||||
get_launcher_version, get_osu_release_stream, get_osu_skin, get_osu_version, get_platform,
|
get_launcher_version, get_osu_release_stream, get_osu_skin, get_osu_version, get_platform,
|
||||||
get_skins, get_skins_count, has_net8, has_osuwinello, has_wmctrl, install_ezpp_launcher_update,
|
get_skins, get_skins_count, has_net8, has_osuwinello, has_wmctrl, install_ezpp_launcher_update,
|
||||||
is_osu_running, open_url_in_browser, opened_urls, presence_connect, presence_disconnect,
|
is_open_tablet_driver_running, is_osu_running, open_url_in_browser, opened_urls,
|
||||||
presence_is_connected, presence_update_button, presence_update_status, presence_update_user,
|
presence_connect, presence_disconnect, presence_is_connected, presence_update_button,
|
||||||
read_theme_info, replace_ui_files, run_osu, run_osu_updater, set_osu_config_values,
|
presence_update_status, presence_update_user, read_theme_info, replace_ui_files,
|
||||||
set_osu_user_config_values, valid_osu_folder,
|
run_open_tablet_driver, run_osu, run_osu_updater, set_osu_config_values,
|
||||||
|
set_osu_user_config_values, stop_open_tablet_driver, valid_osu_folder,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct OpenedUrls(Mutex<Vec<PathBuf>>);
|
struct OpenedUrls(Mutex<Vec<PathBuf>>);
|
||||||
@@ -119,7 +120,10 @@ pub fn run() {
|
|||||||
install_ezpp_launcher_update,
|
install_ezpp_launcher_update,
|
||||||
read_theme_info,
|
read_theme_info,
|
||||||
extract_theme,
|
extract_theme,
|
||||||
download_and_extract_theme
|
download_and_extract_theme,
|
||||||
|
run_open_tablet_driver,
|
||||||
|
stop_open_tablet_driver,
|
||||||
|
is_open_tablet_driver_running
|
||||||
])
|
])
|
||||||
.plugin(tauri_plugin_fs::init())
|
.plugin(tauri_plugin_fs::init())
|
||||||
.plugin(tauri_plugin_dialog::init())
|
.plugin(tauri_plugin_dialog::init())
|
||||||
|
|||||||
@@ -149,3 +149,4 @@ export const getSkins = async (folder: string) =>
|
|||||||
export const startOpenTabletDriver = async (otdDaemonPath: string) =>
|
export const startOpenTabletDriver = async (otdDaemonPath: string) =>
|
||||||
await invoke('run_open_tablet_driver', { path: otdDaemonPath });
|
await invoke('run_open_tablet_driver', { path: otdDaemonPath });
|
||||||
export const stopOpenTabletDriver = async () => await invoke('stop_open_tablet_driver');
|
export const stopOpenTabletDriver = async () => await invoke('stop_open_tablet_driver');
|
||||||
|
export const isOpenTabletDriverRunning = async () => await invoke('is_open_tablet_driver_running');
|
||||||
@@ -65,6 +65,7 @@
|
|||||||
hasOsuWinello,
|
hasOsuWinello,
|
||||||
hasWMCTRL,
|
hasWMCTRL,
|
||||||
installUpdate,
|
installUpdate,
|
||||||
|
isOpenTabletDriverRunning,
|
||||||
isOsuCorrupted,
|
isOsuCorrupted,
|
||||||
isOsuRunning,
|
isOsuRunning,
|
||||||
isValidOsuFolder,
|
isValidOsuFolder,
|
||||||
@@ -575,8 +576,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
let otd_run = false;
|
let otd_run = false;
|
||||||
|
|
||||||
if ($openTabletDriverEnabled && $openTabletDriverPath.length > 0) {
|
if ($openTabletDriverEnabled && $openTabletDriverPath.length > 0) {
|
||||||
|
const otdRunning = await isOpenTabletDriverRunning();
|
||||||
|
if (!otdRunning) {
|
||||||
try {
|
try {
|
||||||
await startOpenTabletDriver($openTabletDriverPath);
|
await startOpenTabletDriver($openTabletDriverPath);
|
||||||
otd_run = true;
|
otd_run = true;
|
||||||
@@ -584,6 +586,7 @@
|
|||||||
console.log('Failed to start OpenTabletDriver:', err);
|
console.log('Failed to start OpenTabletDriver:', err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
await runOsu(osuPath, true);
|
await runOsu(osuPath, true);
|
||||||
if ($trackingEnabled) umami.track('app_exit_osu');
|
if ($trackingEnabled) umami.track('app_exit_osu');
|
||||||
|
|||||||
Reference in new issue
Block a user