mirror/clash-verge-rev-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

refactor: translate Chinese log messages to English in core modules

Browse Source
This commit is contained in:
vffuunnyy
2025-08-16 04:00:00 +07:00
parent 6051bd6d06
commit 902256d461
21 changed files with 356 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ pub async fn update_profile(
option: Option<PrfOption>,
auto_refresh: Option<bool>,
) -> Result<()> {
logging!(info, Type::Config, true, "[订阅更新] 开始更新订阅 {}", uid);
logging!(info, Type::Config, true, "[Subscription Update] Start updating subscription {}", uid);
let auto_refresh = auto_refresh.unwrap_or(true); // 默认为true，保持兼容性
let url_opt = {
@@ -41,14 +41,14 @@ pub async fn update_profile(
let is_remote = item.itype.as_ref().is_some_and(|s| s == "remote");
if !is_remote {
log::info!(target: "app", "[订阅更新] {uid} 不是远程订阅，跳过更新");
log::info!(target: "app", "[Subscription Update] {uid} is not a remote subscription, skipping update");
None // 非远程订阅直接更新
} else if item.url.is_none() {
log::warn!(target: "app", "[订阅更新] {uid} 缺少URL，无法更新");
log::warn!(target: "app", "[Subscription Update] {uid} is missing URL, cannot update");
bail!("failed to get the profile item url");
} else {
log::info!(target: "app",
"[订阅更新] {} 是远程订阅，URL: {}",
"[Subscription Update] {} is a remote subscription, URL: {}",
uid,
item.url.clone().unwrap()
);
@@ -58,24 +58,24 @@ pub async fn update_profile(
let should_update = match url_opt {
Some((url, opt)) => {
log::info!(target: "app", "[订阅更新] 开始下载新的订阅内容");
log::info!(target: "app", "[Subscription Update] Start downloading new subscription content");
let merged_opt = PrfOption::merge(opt.clone(), option.clone());
// 尝试使用正常设置更新
match PrfItem::from_url(&url, None, None, merged_opt.clone()).await {
Ok(item) => {
log::info!(target: "app", "[订阅更新] 更新订阅配置成功");
log::info!(target: "app", "[Subscription Update] Subscription config updated successfully");
let profiles = Config::profiles();
let mut profiles = profiles.latest();
profiles.update_item(uid.clone(), item)?;
let is_current = Some(uid.clone()) == profiles.get_current();
log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}");
log::info!(target: "app", "[Subscription Update] Is current active subscription: {is_current}");
is_current && auto_refresh
}
Err(err) => {
// 首次更新失败，尝试使用Clash代理
log::warn!(target: "app", "[订阅更新] 正常更新失败: {err}，尝试使用Clash代理更新");
log::warn!(target: "app", "[Subscription Update] Normal update failed: {err}, trying to update via Clash proxy");
// 发送通知
handle::Handle::notice_message("update_retry_with_clash", uid.clone());
@@ -92,7 +92,7 @@ pub async fn update_profile(
// 使用Clash代理重试
match PrfItem::from_url(&url, None, None, Some(fallback_opt)).await {
Ok(mut item) => {
log::info!(target: "app", "[订阅更新] 使用Clash代理更新成功");
log::info!(target: "app", "[Subscription Update] Update via Clash proxy succeeded");
// 恢复原始代理设置到item
if let Some(option) = item.option.as_mut() {
@@ -112,11 +112,11 @@ pub async fn update_profile(
handle::Handle::notice_message("update_with_clash_proxy", profile_name);
let is_current = Some(uid.clone()) == profiles.get_current();
log::info!(target: "app", "[订阅更新] 是否为当前使用的订阅: {is_current}");
log::info!(target: "app", "[Subscription Update] Is current active subscription: {is_current}");
is_current && auto_refresh
}
Err(retry_err) => {
log::error!(target: "app", "[订阅更新] 使用Clash代理更新仍然失败: {retry_err}");
log::error!(target: "app", "[Subscription Update] Update via Clash proxy still failed: {retry_err}");
handle::Handle::notice_message(
"update_failed_even_with_clash",
format!("{retry_err}"),
@@ -131,14 +131,14 @@ pub async fn update_profile(
};
if should_update {
logging!(info, Type::Config, true, "[订阅更新] 更新内核配置");
logging!(info, Type::Config, true, "[Subscription Update] Update core configuration");
match CoreManager::global().update_config().await {
Ok(_) => {
logging!(info, Type::Config, true, "[订阅更新] 更新成功");
logging!(info, Type::Config, true, "[Subscription Update] Update succeeded");
handle::Handle::refresh_clash();
}
Err(err) => {
logging!(error, Type::Config, true, "[订阅更新] 更新失败: {}", err);
logging!(error, Type::Config, true, "[Subscription Update] Update failed: {}", err);
handle::Handle::notice_message("update_failed", format!("{err}"));
log::error!(target: "app", "{err}");
}

40
src-tauri/src/feat/window.rs
View File

@@ -25,14 +25,14 @@ fn open_or_close_dashboard_internal(bypass_debounce: bool) {
use crate::process::AsyncHandler;
use crate::utils::window_manager::WindowManager;
log::info!(target: "app", "Attempting to open/close dashboard (绕过防抖: {bypass_debounce})");
log::info!(target: "app", "Attempting to open/close dashboard (bypass debounce: {bypass_debounce})");
// 热键调用调度到主线程执行，避免 WebView 创建死锁
if bypass_debounce {
log::info!(target: "app", "热键调用，调度到主线程执行窗口操作");
log::info!(target: "app", "Hotkey invoked, dispatching window operation to main thread");
AsyncHandler::spawn(move || async move {
log::info!(target: "app", "主线程中执行热键窗口操作");
log::info!(target: "app", "Executing hotkey window operation on main thread");
if crate::module::lightweight::is_in_lightweight_mode() {
log::info!(target: "app", "Currently in lightweight mode, exiting lightweight mode");
@@ -64,7 +64,7 @@ fn open_or_close_dashboard_internal(bypass_debounce: bool) {
/// 异步优化的应用退出函数
pub fn quit() {
use crate::process::AsyncHandler;
logging!(debug, Type::System, true, "启动退出流程");
logging!(debug, Type::System, true, "Start exit process");
// 获取应用句柄并设置退出标志
let app_handle = handle::Handle::global().app_handle().unwrap();
@@ -73,19 +73,19 @@ pub fn quit() {
// 优先关闭窗口，提供立即反馈
if let Some(window) = handle::Handle::global().get_window() {
let _ = window.hide();
log::info!(target: "app", "窗口已隐藏");
log::info!(target: "app", "Window hidden");
}
// 使用异步任务处理资源清理，避免阻塞
AsyncHandler::spawn(move || async move {
logging!(info, Type::System, true, "开始异步清理资源");
logging!(info, Type::System, true, "Start asynchronous resource cleanup");
let cleanup_result = clean_async().await;
logging!(
info,
Type::System,
true,
"资源清理完成，退出代码: {}",
"Resource cleanup completed, exit code: {}",
if cleanup_result { 0 } else { 1 }
);
app_handle.exit(if cleanup_result { 0 } else { 1 });
@@ -95,7 +95,7 @@ pub fn quit() {
async fn clean_async() -> bool {
use tokio::time::{timeout, Duration};
logging!(info, Type::System, true, "开始执行异步清理操作...");
logging!(info, Type::System, true, "Start executing asynchronous cleanup...");
// 1. 处理TUN模式
let tun_task = async {
@@ -112,11 +112,11 @@ async fn clean_async() -> bool {
.await
{
Ok(_) => {
log::info!(target: "app", "TUN模式已禁用");
log::info!(target: "app", "TUN mode disabled");
true
}
Err(_) => {
log::warn!(target: "app", "禁用TUN模式超时");
log::warn!(target: "app", "Timeout disabling TUN mode");
false
}
}
@@ -134,11 +134,11 @@ async fn clean_async() -> bool {
.await
{
Ok(_) => {
log::info!(target: "app", "系统代理已重置");
log::info!(target: "app", "System proxy reset");
true
}
Err(_) => {
log::warn!(target: "app", "重置系统代理超时");
log::warn!(target: "app", "Timeout resetting system proxy");
false
}
}
@@ -148,11 +148,11 @@ async fn clean_async() -> bool {
let core_task = async {
match timeout(Duration::from_secs(3), CoreManager::global().stop_core()).await {
Ok(_) => {
log::info!(target: "app", "核心服务已停止");
log::info!(target: "app", "Core service stopped");
true
}
Err(_) => {
log::warn!(target: "app", "停止核心服务超时");
log::warn!(target: "app", "Timeout stopping core service");
false
}
}
@@ -168,11 +168,11 @@ async fn clean_async() -> bool {
.await
{
Ok(_) => {
log::info!(target: "app", "DNS设置已恢复");
log::info!(target: "app", "DNS settings restored");
true
}
Err(_) => {
log::warn!(target: "app", "恢复DNS设置超时");
log::warn!(target: "app", "Timeout restoring DNS settings");
false
}
}
@@ -192,7 +192,7 @@ async fn clean_async() -> bool {
info,
Type::System,
true,
"异步清理操作完成 - TUN: {}, 代理: {}, 核心: {}, DNS: {}, 总体: {}",
"Asynchronous cleanup completed - TUN: {}, Proxy: {}, Core: {}, DNS: {}, Overall: {}",
tun_success,
proxy_success,
core_success,
@@ -209,7 +209,7 @@ pub fn clean() -> bool {
let (tx, rx) = std::sync::mpsc::channel();
AsyncHandler::spawn(move || async move {
logging!(info, Type::System, true, "开始执行清理操作...");
logging!(info, Type::System, true, "Start executing cleanup...");
// 使用已有的异步清理函数
let cleanup_result = clean_async().await;
@@ -220,7 +220,7 @@ pub fn clean() -> bool {
match rx.recv_timeout(std::time::Duration::from_secs(8)) {
Ok(result) => {
logging!(info, Type::System, true, "清理操作完成，结果: {}", result);
logging!(info, Type::System, true, "Cleanup completed, result: {}", result);
result
}
Err(_) => {
@@ -228,7 +228,7 @@ pub fn clean() -> bool {
warn,
Type::System,
true,
"清理操作超时，返回成功状态避免阻塞"
"Cleanup timed out, returning success to avoid blocking"
);
true
}