From 6e40dd98626e27865f17b020c5b2744c2712f93f Mon Sep 17 00:00:00 2001
From: Tunglies <tunglies.work@outlook.com>
Date: Wed, 26 Mar 2025 19:07:09 +0800
Subject: [PATCH] fix: tray icon and tray rate display expression logic bug

---
 package.json                              | 4 ++--
 src-tauri/src/cmd/media_unlock_checker.rs | 4 ++--
 src-tauri/src/cmd/system.rs               | 2 +-
 src-tauri/src/core/core.rs                | 6 +++---
 src-tauri/src/core/tray/mod.rs            | 2 +-
 src-tauri/src/module/lightweight.rs       | 1 -
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 2bec69c2..98ad53e4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "release-version": "node scripts/release_version.mjs",
     "release-alpha-version": "node scripts/release-alpha_version.mjs",
     "prepare": "husky",
-    "clean": "cd ./src-tauri && cargo clean && cd -"
+    "clippy": "cargo clippy  --manifest-path ./src-tauri/Cargo.toml"
   },
   "dependencies": {
     "@dnd-kit/core": "^6.3.1",
@@ -110,4 +110,4 @@
   },
   "type": "module",
   "packageManager": "pnpm@9.13.2"
-}
\ No newline at end of file
+}
diff --git a/src-tauri/src/cmd/media_unlock_checker.rs b/src-tauri/src/cmd/media_unlock_checker.rs
index 08b1ad25..b5c0f935 100644
--- a/src-tauri/src/cmd/media_unlock_checker.rs
+++ b/src-tauri/src/cmd/media_unlock_checker.rs
@@ -623,12 +623,12 @@ async fn check_netflix_cdn(client: &Client) -> UnlockItem {
                     }
 
                     // 如果无法解析区域信息
-                    return UnlockItem {
+                    UnlockItem {
                         name: "Netflix".to_string(),
                         status: "Unknown".to_string(),
                         region: None,
                         check_time: Some(get_local_date_string()),
-                    };
+                    }
                 }
                 Err(e) => {
                     eprintln!("解析Fast.com API响应失败: {}", e);
diff --git a/src-tauri/src/cmd/system.rs b/src-tauri/src/cmd/system.rs
index c978f3bf..43e80458 100644
--- a/src-tauri/src/cmd/system.rs
+++ b/src-tauri/src/cmd/system.rs
@@ -1,6 +1,6 @@
 use super::CmdResult;
 use crate::{
-    core::{self, handle, CoreManager, RunningMode},
+    core::{handle, CoreManager},
     module::sysinfo::PlatformSpecification,
 };
 use once_cell::sync::Lazy;
diff --git a/src-tauri/src/core/core.rs b/src-tauri/src/core/core.rs
index 5b6a38f1..256c62b3 100644
--- a/src-tauri/src/core/core.rs
+++ b/src-tauri/src/core/core.rs
@@ -387,13 +387,13 @@ impl CoreManager {
             Ok(_) => {
                 Config::runtime().apply();
                 logging!(info, Type::Core, true, "Configuration updated successfully");
-                return Ok(());
+                Ok(())
             }
             Err(e) => {
                 let msg = e.to_string();
                 Config::runtime().discard();
                 logging_error!(Type::Core, true, "Failed to update configuration: {}", msg);
-                return Err(msg);
+                Err(msg)
             }
         }
     }
@@ -419,7 +419,7 @@ impl CoreManager {
                 "-d",
                 dirs::path_to_str(&config_dir)?,
                 "-f",
-                dirs::path_to_str(&config_file)?,
+                dirs::path_to_str(config_file)?,
             ])
             .spawn()?;
         let pid = child.pid();
diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs
index d7ce7b7d..a5fff8fd 100644
--- a/src-tauri/src/core/tray/mod.rs
+++ b/src-tauri/src/core/tray/mod.rs
@@ -256,7 +256,7 @@ impl Tray {
                 *icon_bytes_guard = Some(icon_bytes.clone());
             }
 
-            if !enable_tray_speed || (!enable_tray_speed && !enable_tray_icon) {
+            if !enable_tray_speed {
                 let _ = tray.set_icon(Some(tauri::image::Image::from_bytes(
                     &(*icon_bytes_guard).clone().unwrap(),
                 )?));
diff --git a/src-tauri/src/module/lightweight.rs b/src-tauri/src/module/lightweight.rs
index 0e5f5aff..a181ef85 100644
--- a/src-tauri/src/module/lightweight.rs
+++ b/src-tauri/src/module/lightweight.rs
@@ -85,7 +85,6 @@ fn setup_light_weight_timer() -> Result<()> {
     let once_by_minutes = Config::verge()
         .latest()
         .auto_light_weight_minutes
-        .clone()
         .unwrap_or(10);
 
     let task = TaskBuilder::default()