update clashmeta core, Imporve UI, merge PR, reset icons, fix CI

src-tauri/src/config/verge.rs

@@ -23,6 +23,9 @@ pub struct IVerge {
     /// maybe be able to set the alpha
     pub theme_blur: Option<bool>,
 
+    /// tray click event
+    pub tray_event: Option<String>,
+
     /// enable traffic graph default is true
     pub traffic_graph: Option<bool>,
 
@@ -166,6 +169,7 @@ impl IVerge {
         patch!(language);
         patch!(theme_mode);
         patch!(theme_blur);
+        patch!(tray_event);
         patch!(traffic_graph);
         patch!(enable_memory_usage);
 

src-tauri/src/core/tray.rs

@@ -107,6 +107,20 @@ impl Tray {
     }
 
     pub fn update_part(app_handle: &AppHandle) -> Result<()> {
+        let zh = { Config::verge().latest().language == Some("zh".into()) };
+
+        let version = app_handle.package_info().version.to_string();
+
+        macro_rules! t {
+            ($en: expr, $zh: expr) => {
+                if zh {
+                    $zh
+                } else {
+                    $en
+                }
+            };
+        }
+
         let mode = {
             Config::clash()
                 .latest()
@@ -143,11 +157,39 @@ impl Tray {
         let _ = tray.get_item("system_proxy").set_selected(*system_proxy);
         let _ = tray.get_item("tun_mode").set_selected(*tun_mode);
 
+        let switch_map = {
+            let mut map = std::collections::HashMap::new();
+            map.insert(true, "on");
+            map.insert(false, "off");
+            map
+        };
+
+        #[cfg(not(target_os = "linux"))]
+        let _ = tray.set_tooltip(&format!(
+            "Clash Verge {version}\n{}: {}\n{}: {}",
+            t!("System Proxy", "系统代理"),
+            switch_map[system_proxy],
+            t!("TUN Mode", "Tun 模式"),
+            switch_map[tun_mode]
+        ));
+
         Ok(())
     }
 
+    pub fn on_left_click(app_handle: &AppHandle) {
+        let tray_event = { Config::verge().latest().tray_event.clone() };
+        let tray_event = tray_event.unwrap_or("main_window".into());
+        match tray_event.as_str() {
+            "system_proxy" => feat::toggle_system_proxy(),
+            "tun_mode" => feat::toggle_tun_mode(),
+            _ => resolve::create_window(app_handle),
+        }
+    }
+
     pub fn on_system_tray_event(app_handle: &AppHandle, event: SystemTrayEvent) {
         match event {
+            #[cfg(not(target_os = "linux"))]
+            SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle),
             SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
                 mode @ ("rule_mode" | "global_mode" | "direct_mode" | "script_mode") => {
                     let mode = &mode[0..mode.len() - 5];
@@ -177,10 +219,6 @@ impl Tray {
                 }
                 _ => {}
             },
-            #[cfg(target_os = "windows")]
-            SystemTrayEvent::LeftClick { .. } => {
-                resolve::create_window(app_handle);
-            }
             _ => {}
         }
     }

src-tauri/src/utils/init.rs

@@ -1,7 +1,7 @@
 use crate::config::*;
 use crate::utils::{dirs, help};
 use anyhow::Result;
-use chrono::{DateTime, Local};
+use chrono::{Local, TimeZone};
 use log::LevelFilter;
 use log4rs::append::console::ConsoleAppender;
 use log4rs::append::file::FileAppender;
@@ -116,7 +116,7 @@ pub fn delete_log() -> Result<()> {
         if file_name.ends_with(".log") {
             let now = Local::now();
             let created_time = parse_time_str(&file_name[0..file_name.len() - 4])?;
-            let file_time = DateTime::<Local>::from_local(created_time, now.offset().clone());
+            let file_time = Local.from_local_datetime(&created_time).single().ok_or(anyhow::anyhow!("invalid local datetime"))?;
 
             let duration = now.signed_duration_since(file_time);
             if duration.num_days() > day {