From 7ebf27ba52a4d7ebd251eb65bebf96014bbc06dc Mon Sep 17 00:00:00 2001 From: Slinetrac Date: Wed, 11 Mar 2026 14:56:15 +0800 Subject: [PATCH] refactor: do not trigger autobackup on profile change (#6464) * refactor: do not trigger autobackup on profile change * chore: i18n --- Changelog.md | 1 + src-tauri/src/cmd/profile.rs | 5 ----- src-tauri/src/cmd/save_profile.rs | 2 +- src-tauri/src/module/auto_backup.rs | 2 -- src/locales/ar/profiles.json | 4 ++-- src/locales/ar/settings.json | 2 +- src/locales/de/profiles.json | 4 ++-- src/locales/de/settings.json | 2 +- src/locales/en/settings.json | 2 +- src/locales/es/profiles.json | 4 ++-- src/locales/es/settings.json | 2 +- src/locales/fa/profiles.json | 4 ++-- src/locales/fa/settings.json | 2 +- src/locales/id/profiles.json | 4 ++-- src/locales/id/settings.json | 2 +- src/locales/jp/profiles.json | 4 ++-- src/locales/jp/settings.json | 2 +- src/locales/ko/settings.json | 2 +- src/locales/ru/profiles.json | 4 ++-- src/locales/ru/settings.json | 2 +- src/locales/tr/profiles.json | 4 ++-- src/locales/tr/settings.json | 2 +- src/locales/tt/profiles.json | 4 ++-- src/locales/tt/settings.json | 2 +- src/locales/zh/settings.json | 2 +- src/locales/zhtw/profiles.json | 4 ++-- src/locales/zhtw/settings.json | 2 +- 27 files changed, 35 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 51da621b0..784352bcd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -23,5 +23,6 @@ - 优化首次启动节点信息刷新 - Linux 默认使用内置窗口控件 - 实现排除自定义网段的校验 +- 移除冗余的自动备份触发条件 diff --git a/src-tauri/src/cmd/profile.rs b/src-tauri/src/cmd/profile.rs index f11f1521f..a2bc99b04 100644 --- a/src-tauri/src/cmd/profile.rs +++ b/src-tauri/src/cmd/profile.rs @@ -12,7 +12,6 @@ use crate::{ }, core::{CoreManager, handle, timer::Timer, tray::Tray}, feat, - module::auto_backup::{AutoBackupManager, AutoBackupTrigger}, process::AsyncHandler, utils::{dirs, help}, }; @@ -108,7 +107,6 @@ pub async fn import_profile(url: std::string::String, option: Option) } logging!(info, Type::Cmd, "[导入订阅] 导入完成: {}", help::mask_url(&url)); - AutoBackupManager::trigger_backup(AutoBackupTrigger::ProfileChange); Ok(()) } @@ -141,7 +139,6 @@ pub async fn create_profile(item: PrfItem, file_data: Option) -> CmdResu handle::Handle::notify_profile_changed(uid); } Config::profiles().await.apply(); - AutoBackupManager::trigger_backup(AutoBackupTrigger::ProfileChange); Ok(()) } Err(err) => { @@ -184,7 +181,6 @@ pub async fn delete_profile(index: String) -> CmdResult { // 发送配置变更通知 logging!(info, Type::Cmd, "[删除订阅] 发送配置变更通知: {}", index); handle::Handle::notify_profile_changed(&index); - AutoBackupManager::trigger_backup(AutoBackupTrigger::ProfileChange); } Err(e) => { logging!(error, Type::Cmd, "{}", e); @@ -438,7 +434,6 @@ pub async fn patch_profile(index: String, profile: PrfItem) -> CmdResult { }); } - AutoBackupManager::trigger_backup(AutoBackupTrigger::ProfileChange); Ok(()) } diff --git a/src-tauri/src/cmd/save_profile.rs b/src-tauri/src/cmd/save_profile.rs index 39de7a09b..90dc7360d 100644 --- a/src-tauri/src/cmd/save_profile.rs +++ b/src-tauri/src/cmd/save_profile.rs @@ -21,7 +21,7 @@ pub async fn save_profile_file(index: String, file_data: Option) -> CmdR let backup_trigger = match index.as_str() { "Merge" => Some(AutoBackupTrigger::GlobalMerge), "Script" => Some(AutoBackupTrigger::GlobalScript), - _ => Some(AutoBackupTrigger::ProfileChange), + _ => None, }; // 在异步操作前获取必要元数据并释放锁 diff --git a/src-tauri/src/module/auto_backup.rs b/src-tauri/src/module/auto_backup.rs index 67e61530c..a8688c86f 100644 --- a/src-tauri/src/module/auto_backup.rs +++ b/src-tauri/src/module/auto_backup.rs @@ -34,7 +34,6 @@ pub enum AutoBackupTrigger { Scheduled, GlobalMerge, GlobalScript, - ProfileChange, } impl AutoBackupTrigger { @@ -43,7 +42,6 @@ impl AutoBackupTrigger { Self::Scheduled => "scheduled", Self::GlobalMerge => "merge", Self::GlobalScript => "script", - Self::ProfileChange => "profile", } } diff --git a/src/locales/ar/profiles.json b/src/locales/ar/profiles.json index 28264c07f..9e8a8d28a 100644 --- a/src/locales/ar/profiles.json +++ b/src/locales/ar/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/ar/settings.json b/src/locales/ar/settings.json index cb5837fdd..e6537ef9e 100644 --- a/src/locales/ar/settings.json +++ b/src/locales/ar/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/de/profiles.json b/src/locales/de/profiles.json index 1628bb116..16da1157d 100644 --- a/src/locales/de/profiles.json +++ b/src/locales/de/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/de/settings.json b/src/locales/de/settings.json index f793ce051..4a243ad26 100644 --- a/src/locales/de/settings.json +++ b/src/locales/de/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index cb1b59c30..75366e3bd 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/es/profiles.json b/src/locales/es/profiles.json index 050ed8b21..d56eca5e7 100644 --- a/src/locales/es/profiles.json +++ b/src/locales/es/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/es/settings.json b/src/locales/es/settings.json index 09a101ce9..2ad3a1308 100644 --- a/src/locales/es/settings.json +++ b/src/locales/es/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/fa/profiles.json b/src/locales/fa/profiles.json index 0bd044d10..00972e68b 100644 --- a/src/locales/fa/profiles.json +++ b/src/locales/fa/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/fa/settings.json b/src/locales/fa/settings.json index 3e082d282..1e948aa3f 100644 --- a/src/locales/fa/settings.json +++ b/src/locales/fa/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/id/profiles.json b/src/locales/id/profiles.json index e88b19012..e80463a5f 100644 --- a/src/locales/id/profiles.json +++ b/src/locales/id/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/id/settings.json b/src/locales/id/settings.json index ac23a0e0e..4d67aaed4 100644 --- a/src/locales/id/settings.json +++ b/src/locales/id/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/jp/profiles.json b/src/locales/jp/profiles.json index 6d34770bd..b9cc3489e 100644 --- a/src/locales/jp/profiles.json +++ b/src/locales/jp/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/jp/settings.json b/src/locales/jp/settings.json index 651f1b028..1d3d9eb2f 100644 --- a/src/locales/jp/settings.json +++ b/src/locales/jp/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json index b2f0865ed..556009118 100644 --- a/src/locales/ko/settings.json +++ b/src/locales/ko/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/ru/profiles.json b/src/locales/ru/profiles.json index 85c104a11..bac61fd7e 100644 --- a/src/locales/ru/profiles.json +++ b/src/locales/ru/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json index 8a4bebf70..71826eb2a 100644 --- a/src/locales/ru/settings.json +++ b/src/locales/ru/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/tr/profiles.json b/src/locales/tr/profiles.json index 5a8ab7c58..fe904ebe5 100644 --- a/src/locales/tr/profiles.json +++ b/src/locales/tr/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/tr/settings.json b/src/locales/tr/settings.json index c73c2a92a..e92c65eb0 100644 --- a/src/locales/tr/settings.json +++ b/src/locales/tr/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/tt/profiles.json b/src/locales/tt/profiles.json index 9c1697af0..28a0ef5db 100644 --- a/src/locales/tt/profiles.json +++ b/src/locales/tt/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/tt/settings.json b/src/locales/tt/settings.json index d1c8ac5a2..c81df7e88 100644 --- a/src/locales/tt/settings.json +++ b/src/locales/tt/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "Create local backups in the background at the configured interval.", "intervalLabel": "Backup frequency", "changeLabel": "Backup on critical changes", - "changeHelper": "Automatically back up when the global extend config/script or subscriptions are added, removed, or edited.", + "changeHelper": "Automatically backup when Global Extend Config/Script changes.", "options": { "hours": "Every {{n}} hours", "days": "Every {{n}} days" diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json index 76750da73..9f460e814 100644 --- a/src/locales/zh/settings.json +++ b/src/locales/zh/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "按设定频率在后台创建本地备份文件。", "intervalLabel": "备份频率", "changeLabel": "关键变更时自动备份", - "changeHelper": "全局扩展配置/脚本或订阅增删改后会自动备份。", + "changeHelper": "全局扩展覆写配置/脚本更改后自动备份。", "options": { "hours": "每 {{n}} 小时", "days": "每 {{n}} 天" diff --git a/src/locales/zhtw/profiles.json b/src/locales/zhtw/profiles.json index 0bc5cc89b..9c2946113 100644 --- a/src/locales/zhtw/profiles.json +++ b/src/locales/zhtw/profiles.json @@ -72,8 +72,8 @@ }, "more": { "global": { - "merge": "Global Merge", - "script": "Global Script" + "merge": "Global Extend Config", + "script": "Global Extend Script" }, "chips": { "merge": "Merge", diff --git a/src/locales/zhtw/settings.json b/src/locales/zhtw/settings.json index b7301cf3d..20330a0e5 100644 --- a/src/locales/zhtw/settings.json +++ b/src/locales/zhtw/settings.json @@ -359,7 +359,7 @@ "scheduleHelper": "依設定頻率在背景建立本機備份檔案。", "intervalLabel": "備份頻率", "changeLabel": "關鍵變更時自動備份", - "changeHelper": "全域擴充配置/腳本或訂閱新增、刪除、修改時自動備份。", + "changeHelper": "Global Extend Config/Script 變更後自動備份。", "options": { "hours": "每 {{n}} 小時", "days": "每 {{n}} 天"