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

feat: adjust clash info parsing logs

Browse Source
This commit is contained in:
GyDi
2022-08-15 20:21:43 +08:00
committed by GitHub
parent 7c0129b911
commit 12afa005d9
4 changed files with 56 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,14 +135,17 @@ impl Core {
/// Patch Clash
/// handle the clash config changed
pub fn patch_clash(&self, patch: Mapping, app_handle: &AppHandle) -> Result<()> {
let ((changed_port, changed_mode), port) = {
let has_port = patch.contains_key(&Value::from("mixed-port"));
let has_mode = patch.contains_key(&Value::from("mode"));
let port = {
let mut clash = self.clash.lock();
(clash.patch_config(patch)?, clash.info.port.clone())
clash.patch_config(patch)?;
clash.info.port.clone()
};
// todo: port check
if changed_port {
if has_port && port.is_some() {
let mut service = self.service.lock();
service.restart()?;
drop(service);
@@ -154,7 +157,7 @@ impl Core {
sysopt.init_sysproxy(port, &verge);
}
if changed_mode {
if has_mode {
self.update_systray_clash(app_handle)?;
}