From a7f156189c0a1dabfa1378d8cea35391569cc60c Mon Sep 17 00:00:00 2001 From: Tunglies Date: Thu, 17 Apr 2025 15:20:12 +0800 Subject: [PATCH] 2.2.4-alpha.0 --- package.json | 2 +- src-tauri/src/cmd/network.rs | 4 ++-- src-tauri/src/config/clash.rs | 14 ++++---------- src-tauri/src/core/sysopt.rs | 10 ++++++++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 530ff426..deb4ad16 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clash-verge", - "version": "2.2.4-alpha", + "version": "2.2.4-alpha.0", "license": "GPL-3.0-only", "scripts": { "dev": "cross-env RUST_BACKTRACE=1 tauri dev -f verge-dev -- --profile fast-dev", diff --git a/src-tauri/src/cmd/network.rs b/src-tauri/src/cmd/network.rs index ec2dabbf..104c4386 100644 --- a/src-tauri/src/cmd/network.rs +++ b/src-tauri/src/cmd/network.rs @@ -35,7 +35,7 @@ pub fn get_auto_proxy() -> CmdResult { #[tauri::command] pub fn get_system_hostname() -> CmdResult { use gethostname::gethostname; - + // 获取系统主机名,处理可能的非UTF-8字符 let hostname = match gethostname().into_string() { Ok(name) => name, @@ -46,7 +46,7 @@ pub fn get_system_hostname() -> CmdResult { fallback.trim_matches('"').to_string() } }; - + Ok(hostname) } diff --git a/src-tauri/src/config/clash.rs b/src-tauri/src/config/clash.rs index 6866cbf4..8e5a296b 100644 --- a/src-tauri/src/config/clash.rs +++ b/src-tauri/src/config/clash.rs @@ -214,7 +214,7 @@ impl IClashTemp { .and_then(|value| match value.as_str() { Some(val_str) => { let val_str = val_str.trim(); - + if val_str.is_empty() { return None; } @@ -238,7 +238,7 @@ impl IClashTemp { if value.is_empty() { return value; } - + match SocketAddr::from_str(value.as_str()) { Ok(mut socket) => { if socket.ip().is_unspecified() { @@ -297,10 +297,7 @@ fn test_clash_info() { get_result(8888, "127.0.0.1:8888") ); - assert_eq!( - get_case(8888, " :98888 "), - get_result(8888, "") - ); + assert_eq!(get_case(8888, " :98888 "), get_result(8888, "")); assert_eq!( get_case(8888, "0.0.0.0:8080 "), @@ -322,10 +319,7 @@ fn test_clash_info() { get_result(8888, "192.168.1.1:8080") ); - assert_eq!( - get_case(8888, "192.168.1.1:80800"), - get_result(8888, "") - ); + assert_eq!(get_case(8888, "192.168.1.1:80800"), get_result(8888, "")); } #[derive(Default, Debug, Clone, Deserialize, Serialize, PartialEq, Eq)] diff --git a/src-tauri/src/core/sysopt.rs b/src-tauri/src/core/sysopt.rs index 173535f6..c727a1cb 100644 --- a/src-tauri/src/core/sysopt.rs +++ b/src-tauri/src/core/sysopt.rs @@ -82,7 +82,10 @@ impl Sysopt { ( verge.enable_system_proxy.unwrap_or(false), verge.proxy_auto_config.unwrap_or(false), - verge.proxy_host.clone().unwrap_or_else(|| String::from("127.0.0.1")), + verge + .proxy_host + .clone() + .unwrap_or_else(|| String::from("127.0.0.1")), ) }; @@ -265,7 +268,10 @@ impl Sysopt { verge.enable_proxy_guard.unwrap_or(false), verge.proxy_guard_duration.unwrap_or(10), verge.proxy_auto_config.unwrap_or(false), - verge.proxy_host.clone().unwrap_or_else(|| String::from("127.0.0.1")), + verge + .proxy_host + .clone() + .unwrap_or_else(|| String::from("127.0.0.1")), ) };