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

fix: parse external-controller

Browse Source
This commit is contained in:
GyDi 2022-03-12 21:35:20 +08:00
parent 6c9b6007a3
commit 9f171a01e8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src-tauri/src/core/clash.rs
View File

@ -95,7 +95,18 @@ impl Clash {
let server = match clash_config.get(&key_server) { let server = match clash_config.get(&key_server) {
Some(value) => match value { Some(value) => match value {
Value::String(val_str) => Some(val_str.clone()), Value::String(val_str) => {
// `external-controller` could be
// "127.0.0.1:9090" or ":9090"
// Todo: maybe it could support single port
let server = val_str.clone();
let server = match server.starts_with(":") {
true => format!("127.0.0.1{server}"),
false => server,
};
Some(server)
}
_ => None, _ => None,
}, },
_ => None, _ => None,
@ -258,14 +269,8 @@ impl Clash {
config::save_yaml(temp_path.clone(), &config, Some("# Clash Verge Temp File"))?; config::save_yaml(temp_path.clone(), &config, Some("# Clash Verge Temp File"))?;
tauri::async_runtime::spawn(async move { tauri::async_runtime::spawn(async move {
// `external-controller` could be
// "127.0.0.1:9090" or ":9090"
// Todo: maybe it could support single port
let server = info.server.unwrap(); let server = info.server.unwrap();
let server = match server.starts_with(":") { let server = format!("http://{server}/configs");
true => format!("http://127.0.0.1{server}/configs"),
false => format!("http://{server}/configs"),
};
let mut headers = HeaderMap::new(); let mut headers = HeaderMap::new();
headers.insert("Content-Type", "application/json".parse().unwrap()); headers.insert("Content-Type", "application/json".parse().unwrap());