From 4111b770e588a083c170bb66f02ac3b1276310f1 Mon Sep 17 00:00:00 2001 From: DaLaw2 Date: Thu, 11 Sep 2025 23:26:39 +0800 Subject: [PATCH] refactor: Remove unused log modules, replace `tracing::error` with `macros::log` --- macros/src/log.rs | 4 ++-- src/core/backup/backup_engine.rs | 5 ++--- src/core/schedule/schedule_timer.rs | 6 +++--- src/model/error/mod.rs | 13 +++++++++++++ src/model/log/event.rs | 8 -------- src/model/log/io.rs | 8 -------- src/model/log/misc.rs | 8 -------- src/model/log/mod.rs | 4 ---- src/model/log/task.rs | 8 -------- src/ui/execution_page.rs | 12 ++++++------ src/ui/schedule_page.rs | 20 ++++++++++---------- 11 files changed, 36 insertions(+), 60 deletions(-) delete mode 100644 src/model/log/event.rs delete mode 100644 src/model/log/io.rs delete mode 100644 src/model/log/misc.rs delete mode 100644 src/model/log/task.rs diff --git a/macros/src/log.rs b/macros/src/log.rs index ff56b3f..c2e1d11 100644 --- a/macros/src/log.rs +++ b/macros/src/log.rs @@ -31,7 +31,7 @@ pub fn log_impl(input: TokenStream) -> TokenStream { if let Some(debug_info) = &input.debug_info { quote! { { - let error = #error_expr; + let error = &#error_expr; let level = error.level(); let message = error.to_string(); let debug_info = #debug_info; @@ -48,7 +48,7 @@ pub fn log_impl(input: TokenStream) -> TokenStream { } else { quote! { { - let error = #error_expr; + let error = &#error_expr; let level = error.level(); let message = error.to_string(); diff --git a/src/core/backup/backup_engine.rs b/src/core/backup/backup_engine.rs index 2bc5ec3..90a59d4 100644 --- a/src/core/backup/backup_engine.rs +++ b/src/core/backup/backup_engine.rs @@ -20,7 +20,6 @@ use std::path::{Path, PathBuf}; use std::sync::Arc; use tokio::sync::oneshot; use tokio::task::JoinHandle; -use tracing::error; use uuid::Uuid; use crate::model::core::gui::communication::{ExecutionErrors, ExecutionProgress, FolderProcess}; @@ -272,7 +271,7 @@ impl ExecutionRunner { .publish_event::(event) .await { - error!("{}", err); + log!(err); } } } @@ -286,7 +285,7 @@ impl ExecutionRunner { .save_execution(execution.uuid, current_level, errors) .await { - error!("{}", err); + log!(err); } break; } else { diff --git a/src/core/schedule/schedule_timer.rs b/src/core/schedule/schedule_timer.rs index 1844799..f2f0eda 100644 --- a/src/core/schedule/schedule_timer.rs +++ b/src/core/schedule/schedule_timer.rs @@ -8,11 +8,11 @@ use crate::model::error::Error; use async_trait::async_trait; use chrono::{Duration, Utc}; use std::sync::Arc; +use macros::log; use tokio::select; use tokio::sync::Notify; use tokio::sync::oneshot; use tokio::time::sleep; -use tracing::error; pub struct ScheduleTimer { app_config: Arc, @@ -82,7 +82,7 @@ impl Runnable for ScheduleTimer { Ok(Some(duration)) => duration, Ok(None) => Duration::seconds(self.app_config.default_wakeup_time), Err(err) => { - error!("{}", err); + log!(err); Duration::seconds(self.app_config.default_wakeup_time) } }; @@ -99,7 +99,7 @@ impl Runnable for ScheduleTimer { .send_command(ScheduleManagerCommand::ExecuteReadySchedules) .await { - error!("{}", err); + log!(err); } } } diff --git a/src/model/error/mod.rs b/src/model/error/mod.rs index fea2212..02884ec 100644 --- a/src/model/error/mod.rs +++ b/src/model/error/mod.rs @@ -10,6 +10,7 @@ use crate::model::error::misc::MiscError; use crate::model::error::system::SystemError; use crate::model::error::task::TaskError; use serde::{Deserialize, Serialize}; +use tracing::Level; #[derive(Clone, Debug, thiserror::Error, Serialize, Deserialize)] pub enum Error { @@ -25,6 +26,18 @@ pub enum Error { Task(TaskError), } +impl Error { + pub fn level(&self) -> Level { + match self { + Error::Database(err) => err.level(), + Error::IO(err) => err.level(), + Error::Misc(err) => err.level(), + Error::System(err) => err.level(), + Error::Task(err) => err.level(), + } + } +} + impl From for Error { fn from(error: DatabaseError) -> Self { Self::Database(error) diff --git a/src/model/log/event.rs b/src/model/log/event.rs deleted file mode 100644 index ca39f66..0000000 --- a/src/model/log/event.rs +++ /dev/null @@ -1,8 +0,0 @@ -use macros::loggable; - -loggable! { - EventLog { - #[error("Placeholder")] - Placeholder => tracing::Level::INFO, - } -} diff --git a/src/model/log/io.rs b/src/model/log/io.rs deleted file mode 100644 index 328afca..0000000 --- a/src/model/log/io.rs +++ /dev/null @@ -1,8 +0,0 @@ -use macros::loggable; - -loggable! { - IOLog { - #[error("Placeholder")] - Placeholder => tracing::Level::INFO, - } -} diff --git a/src/model/log/misc.rs b/src/model/log/misc.rs deleted file mode 100644 index f19d1cd..0000000 --- a/src/model/log/misc.rs +++ /dev/null @@ -1,8 +0,0 @@ -use macros::loggable; - -loggable! { - MiscLog { - #[error("Placeholder")] - Placeholder => tracing::Level::INFO, - } -} diff --git a/src/model/log/mod.rs b/src/model/log/mod.rs index 0bc2529..2a36f2a 100644 --- a/src/model/log/mod.rs +++ b/src/model/log/mod.rs @@ -1,6 +1,2 @@ pub mod database; -pub mod event; -pub mod io; -pub mod misc; pub mod system; -pub mod task; diff --git a/src/model/log/task.rs b/src/model/log/task.rs deleted file mode 100644 index 3515a11..0000000 --- a/src/model/log/task.rs +++ /dev/null @@ -1,8 +0,0 @@ -use macros::loggable; - -loggable! { - TaskLog { - #[error("Placeholder")] - Placeholder => tracing::Level::INFO, - } -} diff --git a/src/ui/execution_page.rs b/src/ui/execution_page.rs index 694d51a..1ee1889 100644 --- a/src/ui/execution_page.rs +++ b/src/ui/execution_page.rs @@ -13,8 +13,8 @@ use std::collections::HashSet; use std::path::PathBuf; use std::sync::Arc; use std::time::{Duration, Instant}; +use macros::log; use tokio::sync::broadcast; -use tracing::error; use uuid::Uuid; pub struct ExecutionPage { @@ -344,21 +344,21 @@ impl ExecutionPage { BackupState::Pending => { if ui.button("▶ Start").clicked() { if let Err(err) = self.handle_start_execution(uuid) { - error!("{}", err); + log!(err); } } } BackupState::Suspended => { if ui.button("▶ Resume").clicked() { if let Err(err) = self.handle_resume_execution(uuid) { - error!("{}", err); + log!(err); } } } BackupState::Running => { if ui.button("⏸ Pause").clicked() { if let Err(err) = self.handle_suspend_execution(uuid) { - error!("{}", err); + log!(err); } } } @@ -367,7 +367,7 @@ impl ExecutionPage { if ui.button("🗑").clicked() { if let Err(err) = self.handle_remove_execution(uuid) { - error!("{}", err); + log!(err); } } }); @@ -519,7 +519,7 @@ impl ExecutionPage { self.reset_form(); } Err(err) => { - error!("{}", err); + log!(err); } } } diff --git a/src/ui/schedule_page.rs b/src/ui/schedule_page.rs index 5426748..293fea3 100644 --- a/src/ui/schedule_page.rs +++ b/src/ui/schedule_page.rs @@ -12,7 +12,7 @@ use futures::executor::block_on; use std::path::PathBuf; use std::sync::Arc; use std::time::{Duration, Instant}; -use tracing::error; +use macros::log; use uuid::Uuid; pub struct SchedulePage { @@ -105,7 +105,7 @@ impl SchedulePage { self.schedules = schedules; } Err(err) => { - error!("{}", err); + log!(err); } } } @@ -322,21 +322,21 @@ impl SchedulePage { ScheduleState::Active => { if ui.button("⏸ Pause").clicked() { if let Err(err) = self.handle_pause_schedule(schedule.uuid) { - error!("{}", err); + log!(err); } } } ScheduleState::Paused => { if ui.button("▶ Resume").clicked() { if let Err(err) = self.handle_active_schedule(schedule.uuid) { - error!("{}", err); + log!(err); } } } ScheduleState::Disabled => { if ui.button("▶ Enable").clicked() { if let Err(err) = self.handle_active_schedule(schedule.uuid) { - error!("{}", err); + log!(err); } } } @@ -346,13 +346,13 @@ impl SchedulePage { && ui.button("❌ Disable").clicked() { if let Err(err) = self.handle_disable_schedule(schedule.uuid) { - error!("{}", err); + log!(err); } } if ui.button("🗑").clicked() { if let Err(err) = self.handle_remove_schedule(schedule.uuid) { - error!("{}", err); + log!(err); } } }); @@ -540,7 +540,7 @@ impl SchedulePage { }; if let Err(err) = self.handle_add_schedule(schedule) { - error!("{}", err); + log!(err); } self.reset_schedule_form(); @@ -739,7 +739,7 @@ impl SchedulePage { editing_schedule.updated_at = chrono::Utc::now().naive_utc(); if let Err(err) = self.handle_modify_schedule(editing_schedule) { - error!("{}", err); + log!(err); } self.reset_edit_schedule_form(); @@ -874,7 +874,7 @@ impl SchedulePage { if run_now_clicked { if let Err(err) = self.handle_run_schedule_now(schedule.clone()) { - error!("Failed to run schedule now: {}", err); + log!(err); } else { self.load_schedules(); }