root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: handle tray icon event to reduce always spawn thread

Browse Source
This commit is contained in:
oomeow
2025-12-13 16:49:55 +08:00
parent c5fa64a213
commit af9b67186e
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src-tauri/src/core/tray/mod.rs
View File

@@ -480,8 +480,7 @@ impl Tray {
let show_menu_on_left_click = { let show_menu_on_left_click = {
// TODO 优化这里 复用 verge // TODO 优化这里 复用 verge
let tray_event = { Config::verge().await.latest_arc().tray_event.clone() }; let tray_event = { Config::verge().await.latest_arc().tray_event.clone() };
let tray_event: String = tray_event.unwrap_or_else(|| "main_window".into()); tray_event.is_some_and(|v| v == "tray_menu")
tray_event.as_str() == "tray_menu"
}; };
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
@@ -508,16 +507,16 @@ impl Tray {
.. ..
} = event } = event
{ {
// 添加防抖检查，防止快速连击
if !should_handle_tray_click() {
logging!(info, Type::Tray, "click tray icon too fast, ignore");
return;
}
AsyncHandler::spawn(|| async move { AsyncHandler::spawn(|| async move {
let tray_event = { Config::verge().await.latest_arc().tray_event.clone() }; let tray_event = { Config::verge().await.latest_arc().tray_event.clone() };
let tray_event: String = tray_event.unwrap_or_else(|| "main_window".into()); let tray_event: String = tray_event.unwrap_or_else(|| "main_window".into());
logging!(debug, Type::Tray, "tray event: {tray_event:?}"); logging!(debug, Type::Tray, "tray event: {tray_event:?}");
// 添加防抖检查，防止快速连击
if !should_handle_tray_click() {
return;
}
match tray_event.as_str() { match tray_event.as_str() {
"system_proxy" => feat::toggle_system_proxy().await, "system_proxy" => feat::toggle_system_proxy().await,
"tun_mode" => feat::toggle_tun_mode(None).await, "tun_mode" => feat::toggle_tun_mode(None).await,
@@ -526,7 +525,9 @@ impl Tray {
WindowManager::show_main_window().await; WindowManager::show_main_window().await;
}; };
} }
_ => {} _ => {
logging!(warn, Type::Tray, "invalid tray event: {}", tray_event);
}
}; };
}); });
} }
@@ -725,7 +726,7 @@ async fn create_tray_menu(
i18n::sync_locale().await; i18n::sync_locale().await;
// TODO: mihomo 请求的超时机制未起作用，需要排查 // TODO: should update tray menu again when it was timeout error
let proxy_nodes_data = tokio::time::timeout( let proxy_nodes_data = tokio::time::timeout(
Duration::from_millis(1000), Duration::from_millis(1000),
handle::Handle::mihomo().await.get_proxies(), handle::Handle::mihomo().await.get_proxies(),
@@ -976,7 +977,7 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
AsyncHandler::spawn(|| async move { AsyncHandler::spawn(|| async move {
match event.id.as_ref() { match event.id.as_ref() {
mode @ (MenuIds::RULE_MODE | MenuIds::GLOBAL_MODE | MenuIds::DIRECT_MODE) => { mode @ (MenuIds::RULE_MODE | MenuIds::GLOBAL_MODE | MenuIds::DIRECT_MODE) => {
// Removing the the "tray_" preffix and "_mode" suffix // Removing the the "tray_" prefix and "_mode" suffix
let mode = &mode[5..mode.len() - 5]; let mode = &mode[5..mode.len() - 5];
logging!(info, Type::ProxyMode, "Switch Proxy Mode To: {}", mode); logging!(info, Type::ProxyMode, "Switch Proxy Mode To: {}", mode);
feat::change_clash_mode(mode.into()).await; feat::change_clash_mode(mode.into()).await;

2
src-tauri/src/feat/profile.rs
View File

@@ -111,7 +111,7 @@ async fn perform_profile_update(
let profile_name = profiles_arc let profile_name = profiles_arc
.get_name_by_uid(uid) .get_name_by_uid(uid)
.cloned() .cloned()
.unwrap_or_else(|| String::from("UnKown Profile")); .unwrap_or_else(|| String::from("UnKnown Profile"));
let mut last_err; let mut last_err;