From 573571978cfa59602b8b9fb4afbf99ee5eed310d Mon Sep 17 00:00:00 2001 From: GyDi Date: Thu, 21 Apr 2022 14:24:35 +0800 Subject: [PATCH] chore: adjust --- src-tauri/src/core/clash.rs | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src-tauri/src/core/clash.rs b/src-tauri/src/core/clash.rs index 2e5d402..4257e42 100644 --- a/src-tauri/src/core/clash.rs +++ b/src-tauri/src/core/clash.rs @@ -47,20 +47,15 @@ impl ClashInfo { }, }; + // `external-controller` could be + // "127.0.0.1:9090" or ":9090" + // "9090" or 9090 (clash do not support this) let server = match config.get(&key_server) { Some(value) => match value { - 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) - } + Value::String(val_str) => match val_str.starts_with(":") { + true => Some(format!("127.0.0.1{val_str}")), + false => Some(val_str.clone()), + }, _ => None, }, _ => None, @@ -115,13 +110,6 @@ impl Clash { ) } - /// todo: delete - /// update the clash info - pub fn update_config(&mut self) { - self.config = Clash::read_config(); - self.info = ClashInfo::from(&self.config); - } - /// patch update the clash config /// if the port is changed then return true pub fn patch_config(&mut self, patch: Mapping) -> Result {