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

refactor: wip

Browse Source
This commit is contained in:
GyDi
2022-11-17 17:07:13 +08:00
parent abdbf158d1
commit 63b474a32c
21 changed files with 324 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
use crate::config::Config;
use crate::log_err;
use crate::{config::VergeN, core::*, utils::init, utils::server};
use crate::{core::*, utils::init, utils::server};
use tauri::{App, AppHandle, Manager};
/// handle something when start app
@@ -19,10 +20,7 @@ pub fn resolve_setup(app: &mut App) {
log_err!(tray::Tray::update_systray(&app.app_handle()));
let silent_start = {
let verge = VergeN::global().config.lock();
verge.enable_silent_start.clone()
};
let silent_start = { Config::verge().data().enable_silent_start.clone() };
if !silent_start.unwrap_or(false) {
create_window(&app.app_handle());
}

6
src-tauri/src/utils/server.rs
View File

@@ -1,14 +1,14 @@
extern crate warp;
use super::resolve;
use crate::config::VergeN;
use crate::config::IVerge;
use port_scanner::local_port_available;
use tauri::AppHandle;
use warp::Filter;
/// check whether there is already exists
pub fn check_singleton() -> Result<(), ()> {
let port = VergeN::get_singleton_port();
let port = IVerge::get_singleton_port();
if !local_port_available(port) {
tauri::async_runtime::block_on(async {
@@ -25,7 +25,7 @@ pub fn check_singleton() -> Result<(), ()> {
/// maybe it can be used as pac server later
pub fn embed_server(app_handle: AppHandle) {
let app_handle = app_handle.clone();
let port = VergeN::get_singleton_port();
let port = IVerge::get_singleton_port();
tauri::async_runtime::spawn(async move {
let commands = warp::path!("commands" / "visible").map(move || {