Skip to content

Commit cbdb54b

Browse files
committed
fix: 修复State类型问题;Timer触发条件问题;配置文件自动升级问题(这些问题是重构造成的)
1 parent e3e353b commit cbdb54b

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎src-tauri/src/config/app_config.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub struct Config {
1818
pub settings: Settings,
1919
#[serde(default = "default_value::empty_vec")]
2020
pub favorites: Vec<FavoriteTreeNode>,
21+
#[serde(default = "default_value::default_quick_action_settings")]
2122
pub quick_action: QuickActionsSettings,
2223
}
2324

‎src-tauri/src/default_value.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use crate::cloud_sync::{Backend, CloudSettings};
1+
use crate::{
2+
cloud_sync::{Backend, CloudSettings},
3+
config::QuickActionsSettings,
4+
};
25

36
pub fn default_false() -> bool {
47
false
@@ -30,3 +33,6 @@ pub fn empty_vec<T>() -> Vec<T> {
3033
pub fn default_none<T>() -> Option<T> {
3134
None
3235
}
36+
pub fn default_quick_action_settings() -> QuickActionsSettings {
37+
QuickActionsSettings::default()
38+
}

‎src-tauri/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ fn main() {
3939

4040
// Init app
4141
let app = tauri::Builder::default()
42-
.manage(Arc::new(Mutex::new(
42+
.manage(Arc::new(
4343
// 自动备份间隔,启动时默认为无(不自动备份)
4444
quick_actions::AutoBackupDuration::new(0),
45-
)))
45+
))
4646
.invoke_handler(tauri::generate_handler![
4747
ipc_handler::open_url,
4848
ipc_handler::choose_save_file,

‎src-tauri/src/quick_actions/timer.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ pub fn setup_timer(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
2525
counter = 1;
2626
}
2727

28-
if counter >= duration {
28+
// 时间间隔必须大于0,因为0表示禁用
29+
if duration > 0 && (counter >= duration) {
2930
quick_backup(game, QuickActionType::Timer).await;
3031
counter = 0;
3132
}

0 commit comments

Comments
 (0)