mirror/clash-verge-rev-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

refactor: verge

Browse Source
This commit is contained in:
GyDi
2022-04-20 11:17:54 +08:00
committed by GitHub
parent b8ad328cde
commit 5f7a1fa5cd
5 changed files with 42 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,8 +70,8 @@ impl Core {
let clash = self.clash.lock();
let verge = self.verge.lock();
let silent_start = verge.config.enable_silent_start.clone();
let auto_launch = verge.config.enable_auto_launch.clone();
let silent_start = verge.enable_silent_start.clone();
let auto_launch = verge.enable_auto_launch.clone();
// silent start
if silent_start.unwrap_or(false) {
@@ -143,7 +143,7 @@ impl Core {
}
/// Patch Verge
pub fn patch_verge(&self, patch: VergeConfig, app_handle: &AppHandle) -> Result<()> {
pub fn patch_verge(&self, patch: Verge, app_handle: &AppHandle) -> Result<()> {
let tun_mode = patch.enable_tun_mode.clone();
let auto_launch = patch.enable_auto_launch.clone();
let system_proxy = patch.enable_system_proxy.clone();
@@ -195,8 +195,8 @@ impl Core {
let verge = self.verge.lock();
let tray = app_handle.tray_handle();
let system_proxy = verge.config.enable_system_proxy.as_ref();
let tun_mode = verge.config.enable_tun_mode.as_ref();
let system_proxy = verge.enable_system_proxy.as_ref();
let tun_mode = verge.enable_tun_mode.as_ref();
tray
.get_item("system_proxy")
@@ -235,7 +235,7 @@ impl Core {
let config = {
let verge = self.verge.lock();
let tun_mode = verge.config.enable_tun_mode.unwrap_or(false);
let tun_mode = verge.enable_tun_mode.unwrap_or(false);
Clash::_tun_mode(config, tun_mode)
};
@@ -277,7 +277,7 @@ impl Core {
let tun_mode = {
let verge = self.verge.lock();
verge.config.enable_tun_mode.unwrap_or(false)
verge.enable_tun_mode.unwrap_or(false)
};
let info = {