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

refactor: get_bypass func

Browse Source
This commit is contained in:
huzibaca 2024-10-05 02:58:41 +08:00
parent 30678904ee
commit e0d96c0ce1
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ static DEFAULT_BYPASS: &str =
"127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>"; "127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>";
fn get_bypass() -> String { fn get_bypass() -> String {
// let bypass = DEFAULT_BYPASS.to_string();
let use_default = Config::verge().latest().use_default_bypass.unwrap_or(true); let use_default = Config::verge().latest().use_default_bypass.unwrap_or(true);
let res = { let res = {
let verge = Config::verge(); let verge = Config::verge();
@ -41,17 +40,7 @@ fn get_bypass() -> String {
Some(bypass) => bypass, Some(bypass) => bypass,
None => "".to_string(), None => "".to_string(),
}; };
#[cfg(target_os = "windows")]
let bypass = if custom_bypass.is_empty() {
DEFAULT_BYPASS.to_string()
} else {
if use_default {
format!("{};{}", DEFAULT_BYPASS, custom_bypass)
} else {
custom_bypass
}
};
#[cfg(not(target_os = "windows"))]
let bypass = if custom_bypass.is_empty() { let bypass = if custom_bypass.is_empty() {
DEFAULT_BYPASS.to_string() DEFAULT_BYPASS.to_string()
} else if use_default { } else if use_default {
@ -59,7 +48,6 @@ fn get_bypass() -> String {
} else { } else {
custom_bypass custom_bypass
}; };
bypass bypass
} }