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

feat: support to change external controller

Browse Source
This commit is contained in:
GyDi
2022-11-06 23:23:26 +08:00
parent b967cfc775
commit 0aaf4bfde8
5 changed files with 131 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src-tauri/src/core/mod.rs
View File

@@ -112,18 +112,21 @@ impl Core {
/// Patch Clash
/// handle the clash config changed
pub fn patch_clash(&self, patch: Mapping) -> Result<()> {
let has_port = patch.contains_key(&Value::from("mixed-port"));
let has_mode = patch.contains_key(&Value::from("mode"));
let patch_cloned = patch.clone();
let clash_mode = patch.get("mode");
let mixed_port = patch.get("mixed-port");
let external = patch.get("external-controller");
let secret = patch.get("secret");
let port = {
let valid_port = {
let global = Data::global();
let mut clash = global.clash.lock();
clash.patch_config(patch)?;
clash.info.port.clone()
clash.patch_config(patch_cloned)?;
clash.info.port.is_some()
};
// todo: port check
if has_port && port.is_some() {
if (mixed_port.is_some() && valid_port) || external.is_some() || secret.is_some() {
let mut service = self.service.lock();
service.restart()?;
drop(service);
@@ -134,7 +137,7 @@ impl Core {
sysopt.init_sysproxy()?;
}
if has_mode {
if clash_mode.is_some() {
let handle = self.handle.lock();
handle.update_systray_part()?;
}