shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 04:43:44 +08:00
Code Packages Projects Releases Activity

Refactor hotkey logging with structured logging macro

Browse Source
This commit is contained in:
Tunglies 2025-03-26 01:18:28 +08:00
parent df5424d55e
commit 14347f60d5
2 changed files with 117 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
src-tauri/src/core/hotkey.rs
View File

@ -1,6 +1,9 @@
use crate::{ use crate::{
config::Config, core::handle, feat, log_err, module::lightweight::entry_lightweight_mode, config::Config,
utils::resolve, core::handle,
feat, log_err, logging,
module::lightweight::entry_lightweight_mode,
utils::{logging::Type, resolve},
}; };
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
@ -26,22 +29,27 @@ impl Hotkey {
let verge = Config::verge(); let verge = Config::verge();
let enable_global_hotkey = verge.latest().enable_global_hotkey.unwrap_or(true); let enable_global_hotkey = verge.latest().enable_global_hotkey.unwrap_or(true);
println!( logging!(
"Initializing hotkeys, global hotkey enabled: {}", info,
Type::Hotkey,
true,
"Initializing hotkeys with enable: {}",
enable_global_hotkey enable_global_hotkey
); );
log::info!(target: "app", "Initializing hotkeys, global hotkey enabled: {}", enable_global_hotkey);
// 如果全局热键被禁用，则不注册热键 // 如果全局热键被禁用，则不注册热键
if !enable_global_hotkey { if !enable_global_hotkey {
println!("Global hotkey is disabled, skipping registration");
log::info!(target: "app", "Global hotkey is disabled, skipping registration");
return Ok(()); return Ok(());
} }
if let Some(hotkeys) = verge.latest().hotkeys.as_ref() { if let Some(hotkeys) = verge.latest().hotkeys.as_ref() {
println!("Found {} hotkeys to register", hotkeys.len()); logging!(
log::info!(target: "app", "Found {} hotkeys to register", hotkeys.len()); info,
Type::Hotkey,
true,
"Has {} hotkeys need to register",
hotkeys.len()
);
for hotkey in hotkeys.iter() { for hotkey in hotkeys.iter() {
let mut iter = hotkey.split(','); let mut iter = hotkey.split(',');
@ -50,28 +58,52 @@ impl Hotkey {
match (key, func) { match (key, func) {
(Some(key), Some(func)) => { (Some(key), Some(func)) => {
println!("Registering hotkey: {} -> {}", key, func); logging!(
log::info!(target: "app", "Registering hotkey: {} -> {}", key, func); info,
Type::Hotkey,
true,
"Registering hotkey: {} -> {}",
key,
func
);
if let Err(e) = self.register(key, func) { if let Err(e) = self.register(key, func) {
println!("Failed to register hotkey {} -> {}: {:?}", key, func, e); logging!(
log::error!(target: "app", "Failed to register hotkey {} -> {}: {:?}", key, func, e); error,
Type::Hotkey,
true,
"Failed to register hotkey {} -> {}: {:?}",
key,
func,
e
);
} else { } else {
println!("Successfully registered hotkey {} -> {}", key, func); logging!(
log::info!(target: "app", "Successfully registered hotkey {} -> {}", key, func); info,
Type::Hotkey,
true,
"Successfully registered hotkey {} -> {}",
key,
func
);
} }
} }
_ => { _ => {
let key = key.unwrap_or("None"); let key = key.unwrap_or("None");
let func = func.unwrap_or("None"); let func = func.unwrap_or("None");
println!("Invalid hotkey configuration: `{key}`:`{func}`"); logging!(
log::error!(target: "app", "Invalid hotkey configuration: `{key}`:`{func}`"); error,
Type::Hotkey,
true,
"Invalid hotkey configuration: `{}`:`{}`",
key,
func
);
} }
} }
} }
self.current.lock().clone_from(hotkeys); self.current.lock().clone_from(hotkeys);
} else { } else {
println!("No hotkeys configured"); logging!(info, Type::Hotkey, true, "No hotkeys configured");
log::info!(target: "app", "No hotkeys configured");
} }
Ok(()) Ok(())
@ -88,45 +120,60 @@ impl Hotkey {
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
let manager = app_handle.global_shortcut(); let manager = app_handle.global_shortcut();
println!( logging!(
info,
Type::Hotkey,
true,
"Attempting to register hotkey: {} for function: {}", "Attempting to register hotkey: {} for function: {}",
hotkey, func hotkey,
func
); );
log::info!(target: "app", "Attempting to register hotkey: {} for function: {}", hotkey, func);
if manager.is_registered(hotkey) { if manager.is_registered(hotkey) {
println!( logging!(
info,
Type::Hotkey,
true,
"Hotkey {} was already registered, unregistering first", "Hotkey {} was already registered, unregistering first",
hotkey hotkey
); );
log::info!(target: "app", "Hotkey {} was already registered, unregistering first", hotkey);
manager.unregister(hotkey)?; manager.unregister(hotkey)?;
} }
let f = match func.trim() { let f = match func.trim() {
"open_or_close_dashboard" => { "open_or_close_dashboard" => {
println!("Registering open_or_close_dashboard function"); logging!(
log::info!(target: "app", "Registering open_or_close_dashboard function"); info,
Type::Hotkey,
true,
"Registering open_or_close_dashboard function"
);
|| { || {
println!("=== Hotkey Dashboard Window Operation Start ==="); logging!(
log::info!(target: "app", "=== Hotkey Dashboard Window Operation Start ==="); info,
Type::Hotkey,
true,
"=== Hotkey Dashboard Window Operation Start ==="
);
// 使用 spawn_blocking 来确保在正确的线程上执行 // 使用 spawn_blocking 来确保在正确的线程上执行
async_runtime::spawn_blocking(|| { async_runtime::spawn_blocking(|| {
println!("Toggle dashboard window visibility"); logging!(
log::info!(target: "app", "Toggle dashboard window visibility"); info,
Type::Hotkey,
true,
"Toggle dashboard window visibility"
);
// 检查窗口是否存在 // 检查窗口是否存在
if let Some(window) = handle::Handle::global().get_window() { if let Some(window) = handle::Handle::global().get_window() {
// 如果窗口可见，则隐藏它 // 如果窗口可见，则隐藏它
if window.is_visible().unwrap_or(false) { if window.is_visible().unwrap_or(false) {
println!("Window is visible, hiding it"); logging!(info, Type::Window, true, "Window is visible, hiding it");
log::info!(target: "app", "Window is visible, hiding it");
let _ = window.hide(); let _ = window.hide();
} else { } else {
// 如果窗口不可见，则显示它 // 如果窗口不可见，则显示它
println!("Window is hidden, showing it"); logging!(info, Type::Window, true, "Window is hidden, showing it");
log::info!(target: "app", "Window is hidden, showing it");
if window.is_minimized().unwrap_or(false) { if window.is_minimized().unwrap_or(false) {
let _ = window.unminimize(); let _ = window.unminimize();
} }
@ -135,14 +182,22 @@ impl Hotkey {
} }
} else { } else {
// 如果窗口不存在，创建一个新窗口 // 如果窗口不存在，创建一个新窗口
println!("Window does not exist, creating a new one"); logging!(
log::info!(target: "app", "Window does not exist, creating a new one"); info,
Type::Window,
true,
"Window does not exist, creating a new one"
);
resolve::create_window(); resolve::create_window();
} }
}); });
println!("=== Hotkey Dashboard Window Operation End ==="); logging!(
log::info!(target: "app", "=== Hotkey Dashboard Window Operation End ==="); info,
Type::Hotkey,
true,
"=== Hotkey Dashboard Window Operation End ==="
);
} }
} }
"clash_mode_rule" => || feat::change_clash_mode("rule".into()), "clash_mode_rule" => || feat::change_clash_mode("rule".into()),
@ -156,8 +211,7 @@ impl Hotkey {
"hide" => || feat::hide(), "hide" => || feat::hide(),
_ => { _ => {
println!("Invalid function: {}", func); logging!(error, Type::Hotkey, true, "Invalid function: {}", func);
log::error!(target: "app", "Invalid function: {}", func);
bail!("invalid function \"{func}\""); bail!("invalid function \"{func}\"");
} }
}; };
@ -166,21 +220,18 @@ impl Hotkey {
let _ = manager.on_shortcut(hotkey, move |app_handle, hotkey, event| { let _ = manager.on_shortcut(hotkey, move |app_handle, hotkey, event| {
if event.state == ShortcutState::Pressed { if event.state == ShortcutState::Pressed {
println!("Hotkey pressed: {:?}", hotkey); logging!(info, Type::Hotkey, true, "Hotkey pressed: {:?}", hotkey);
log::info!(target: "app", "Hotkey pressed: {:?}", hotkey);
if hotkey.key == Code::KeyQ && is_quit { if hotkey.key == Code::KeyQ && is_quit {
if let Some(window) = app_handle.get_webview_window("main") { if let Some(window) = app_handle.get_webview_window("main") {
if window.is_focused().unwrap_or(false) { if window.is_focused().unwrap_or(false) {
println!("Executing quit function"); logging!(info, Type::Hotkey, true, "Executing quit function");
log::info!(target: "app", "Executing quit function");
f(); f();
} }
} }
} else { } else {
// 直接执行函数，不做任何状态检查 // 直接执行函数，不做任何状态检查
println!("Executing function directly"); logging!(info, Type::Hotkey, true, "Executing function directly");
log::info!(target: "app", "Executing function directly");
// 获取全局热键状态 // 获取全局热键状态
let is_enable_global_hotkey = Config::verge() let is_enable_global_hotkey = Config::verge()
@ -203,8 +254,14 @@ impl Hotkey {
} }
}); });
println!("Successfully registered hotkey {} for {}", hotkey, func); logging!(
log::info!(target: "app", "Successfully registered hotkey {} for {}", hotkey, func); info,
Type::Hotkey,
true,
"Successfully registered hotkey {} for {}",
hotkey,
func
);
Ok(()) Ok(())
} }
@ -212,7 +269,7 @@ impl Hotkey {
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
let manager = app_handle.global_shortcut(); let manager = app_handle.global_shortcut();
manager.unregister(hotkey)?; manager.unregister(hotkey)?;
log::debug!(target: "app", "unregister hotkey {hotkey}"); logging!(debug, Type::Hotkey, true, "Unregister hotkey {}", hotkey);
Ok(()) Ok(())
} }
@ -285,7 +342,13 @@ impl Drop for Hotkey {
fn drop(&mut self) { fn drop(&mut self) {
let app_handle = handle::Handle::global().app_handle().unwrap(); let app_handle = handle::Handle::global().app_handle().unwrap();
if let Err(e) = app_handle.global_shortcut().unregister_all() { if let Err(e) = app_handle.global_shortcut().unregister_all() {
log::error!(target:"app", "Error unregistering all hotkeys: {:?}", e); logging!(
error,
Type::Hotkey,
true,
"Error unregistering all hotkeys: {:?}",
e
);
} }
} }
} }

4
src-tauri/src/utils/logging.rs
View File

@ -4,6 +4,8 @@ use std::fmt;
pub enum Type { pub enum Type {
Core, Core,
Service, Service,
Hotkey,
Window,
} }
impl fmt::Display for Type { impl fmt::Display for Type {
@ -11,6 +13,8 @@ impl fmt::Display for Type {
match self { match self {
Type::Core => write!(f, "[Core]"), Type::Core => write!(f, "[Core]"),
Type::Service => write!(f, "[Service]"), Type::Service => write!(f, "[Service]"),
Type::Hotkey => write!(f, "[Hotkey]"),
Type::Window => write!(f, "[Window]"),
} }
} }
} }