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

refactor: profile config

Browse Source
This commit is contained in:
GyDi
2022-03-01 08:58:47 +08:00
parent 04aa963b9a
commit 4903c70686
15 changed files with 567 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src-tauri/src/utils/resolve.rs
View File

@@ -1,5 +1,5 @@
use super::{init, server};
use crate::{core::Profiles, states};
use crate::{core::Profiles, log_if_err, states};
use tauri::{App, AppHandle, Manager};
/// handle something when start app
@@ -21,14 +21,10 @@ pub fn resolve_setup(app: &App) {
let mut verge = verge_state.0.lock().unwrap();
let mut profiles = profiles_state.0.lock().unwrap();
if let Err(err) = clash.run_sidecar() {
log::error!("{err}");
}
log_if_err!(clash.run_sidecar());
*profiles = Profiles::read_file();
if let Err(err) = profiles.activate(&clash) {
log::error!("{err}");
}
log_if_err!(clash.activate(&profiles));
verge.init_sysproxy(clash.info.port.clone());
// enable tun mode
@@ -41,9 +37,7 @@ pub fn resolve_setup(app: &App) {
}
verge.init_launch();
if let Err(err) = verge.sync_launch() {
log::error!("{err}");
}
log_if_err!(verge.sync_launch());
}
/// reset system proxy