root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update & fmt & clippy

Browse Source
This commit is contained in:
MystiPanda
2024-06-12 10:00:22 +08:00
parent fb6ffd8e09
commit 75cd7dd4b9
18 changed files with 100 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src-tauri/src/core/sysopt.rs
View File

@@ -44,11 +44,12 @@ static DEFAULT_BYPASS: &str =
fn get_bypass() -> String {
let bypass = DEFAULT_BYPASS.to_string();
let custom_bypass = match {
let res = {
let verge = Config::verge();
let verge = verge.latest();
verge.system_proxy_bypass.clone()
} {
};
let custom_bypass = match res {
Some(bypass) => bypass,
None => "".to_string(),
};
@@ -65,7 +66,7 @@ fn get_bypass() -> String {
format!("{},{}", bypass, custom_bypass)
};
bypass.into()
bypass
}
impl Sysopt {
@@ -152,19 +153,18 @@ impl Sysopt {
verge.proxy_auto_config.unwrap_or(false),
)
};
if pac {
if cur_autoproxy.is_none() || old_autoproxy.is_none() {
drop(cur_autoproxy);
drop(old_autoproxy);
return self.init_sysproxy();
}
} else {
if cur_sysproxy.is_none() || old_sysproxy.is_none() {
drop(cur_sysproxy);
drop(old_sysproxy);
return self.init_sysproxy();
}
if pac && (cur_autoproxy.is_none() || old_autoproxy.is_none()) {
drop(cur_autoproxy);
drop(old_autoproxy);
return self.init_sysproxy();
}
if !pac && (cur_sysproxy.is_none() || old_sysproxy.is_none()) {
drop(cur_sysproxy);
drop(old_sysproxy);
return self.init_sysproxy();
}
let port = Config::verge()
.latest()
.verge_mixed_port