shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 03:23:57 +08:00
Code Packages Projects Releases Activity

fix: tray icon and tray rate display expression logic bug

Browse Source
This commit is contained in:
Tunglies 2025-03-26 19:07:09 +08:00
parent 42db9ea0bb
commit 6e40dd9862
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -20,7 +20,7 @@
"release-version": "node scripts/release_version.mjs", "release-version": "node scripts/release_version.mjs",
"release-alpha-version": "node scripts/release-alpha_version.mjs", "release-alpha-version": "node scripts/release-alpha_version.mjs",
"prepare": "husky", "prepare": "husky",
"clean": "cd ./src-tauri && cargo clean && cd -" "clippy": "cargo clippy --manifest-path ./src-tauri/Cargo.toml"
}, },
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",

4
src-tauri/src/cmd/media_unlock_checker.rs
View File

@ -623,12 +623,12 @@ async fn check_netflix_cdn(client: &Client) -> UnlockItem {
} }
// 如果无法解析区域信息 // 如果无法解析区域信息
return UnlockItem { UnlockItem {
name: "Netflix".to_string(), name: "Netflix".to_string(),
status: "Unknown".to_string(), status: "Unknown".to_string(),
region: None, region: None,
check_time: Some(get_local_date_string()), check_time: Some(get_local_date_string()),
}; }
} }
Err(e) => { Err(e) => {
eprintln!("解析Fast.com API响应失败: {}", e); eprintln!("解析Fast.com API响应失败: {}", e);

2
src-tauri/src/cmd/system.rs
View File

@ -1,6 +1,6 @@
use super::CmdResult; use super::CmdResult;
use crate::{ use crate::{
core::{self, handle, CoreManager, RunningMode}, core::{handle, CoreManager},
module::sysinfo::PlatformSpecification, module::sysinfo::PlatformSpecification,
}; };
use once_cell::sync::Lazy; use once_cell::sync::Lazy;

6
src-tauri/src/core/core.rs
View File

@ -387,13 +387,13 @@ impl CoreManager {
Ok(_) => { Ok(_) => {
Config::runtime().apply(); Config::runtime().apply();
logging!(info, Type::Core, true, "Configuration updated successfully"); logging!(info, Type::Core, true, "Configuration updated successfully");
return Ok(()); Ok(())
} }
Err(e) => { Err(e) => {
let msg = e.to_string(); let msg = e.to_string();
Config::runtime().discard(); Config::runtime().discard();
logging_error!(Type::Core, true, "Failed to update configuration: {}", msg); logging_error!(Type::Core, true, "Failed to update configuration: {}", msg);
return Err(msg); Err(msg)
} }
} }
} }
@ -419,7 +419,7 @@ impl CoreManager {
"-d", "-d",
dirs::path_to_str(&config_dir)?, dirs::path_to_str(&config_dir)?,
"-f", "-f",
dirs::path_to_str(&config_file)?, dirs::path_to_str(config_file)?,
]) ])
.spawn()?; .spawn()?;
let pid = child.pid(); let pid = child.pid();

2
src-tauri/src/core/tray/mod.rs
View File

@ -256,7 +256,7 @@ impl Tray {
*icon_bytes_guard = Some(icon_bytes.clone()); *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( let _ = tray.set_icon(Some(tauri::image::Image::from_bytes(
&(*icon_bytes_guard).clone().unwrap(), &(*icon_bytes_guard).clone().unwrap(),
)?)); )?));

1
src-tauri/src/module/lightweight.rs
View File

@ -85,7 +85,6 @@ fn setup_light_weight_timer() -> Result<()> {
let once_by_minutes = Config::verge() let once_by_minutes = Config::verge()
.latest() .latest()
.auto_light_weight_minutes .auto_light_weight_minutes
.clone()
.unwrap_or(10); .unwrap_or(10);
let task = TaskBuilder::default() let task = TaskBuilder::default()