Merge pull request #28 from NotAShelf/optimize-daemon

daemon: optimize

Author: NotAShelf

Cargo.lock

@@ -13,7 +13,8 @@ dirs = "6.0"
 clap = { version = "4.0", features = ["derive"] }
 num_cpus = "1.16"
 ctrlc = "3.4"
-notify = { version = "8.0.0", features = ["serde"] }
 chrono = "0.4"
 log = "0.4"
 env_logger = "0.11"
+thiserror = "2.0"
+anyhow = "1.0"

Cargo.toml

@@ -74,7 +74,7 @@ pub fn set_battery_charge_thresholds(start_threshold: u8, stop_threshold: u8) ->
     // Validate thresholds using `BatteryChargeThresholds`
     let thresholds =
         BatteryChargeThresholds::new(start_threshold, stop_threshold).map_err(|e| match e {
-            crate::config::types::ConfigError::ValidationError(msg) => {
+            crate::config::types::ConfigError::Validation(msg) => {
                 ControlError::InvalidValueError(msg)
             }
             _ => ControlError::InvalidValueError(format!("Invalid battery threshold values: {e}")),

src/battery.rs

@@ -26,7 +26,7 @@ pub fn load_config_from_path(specific_path: Option<&str>) -> Result<AppConfig, C
         if path.exists() {
             return load_and_parse_config(path);
         }
-        return Err(ConfigError::IoError(std::io::Error::new(
+        return Err(ConfigError::Io(std::io::Error::new(
             std::io::ErrorKind::NotFound,
             format!("Specified config file not found: {}", path.display()),
         )));
@@ -80,10 +80,9 @@ pub fn load_config_from_path(specific_path: Option<&str>) -> Result<AppConfig, C
 
 /// Load and parse a configuration file
 fn load_and_parse_config(path: &Path) -> Result<AppConfig, ConfigError> {
-    let contents = fs::read_to_string(path).map_err(ConfigError::IoError)?;
+    let contents = fs::read_to_string(path).map_err(ConfigError::Io)?;
 
-    let toml_app_config =
-        toml::from_str::<AppConfigToml>(&contents).map_err(ConfigError::TomlError)?;
+    let toml_app_config = toml::from_str::<AppConfigToml>(&contents).map_err(ConfigError::Toml)?;
 
     // Handle inheritance of values from global to profile configs
     let mut charger_profile = toml_app_config.charger.clone();

src/config/load.rs

@@ -1,6 +1,5 @@
 pub mod load;
 pub mod types;
-pub mod watcher;
 
 pub use load::*;
 pub use types::*;