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: unify and simplify the call of app_handle

Browse Source
This commit is contained in:
huzibaca
2024-09-23 16:31:58 +08:00
parent 0a9182519d
commit 60e0f972d0
10 changed files with 135 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src-tauri/src/feat.rs
View File

@@ -10,22 +10,18 @@ use crate::log_err;
use crate::utils::resolve;
use anyhow::{bail, Result};
use serde_yaml::{Mapping, Value};
use tauri::{AppHandle, Manager};
use tauri::AppHandle;
use tauri_plugin_clipboard_manager::ClipboardExt;
// 打开面板
pub fn open_or_close_dashboard() {
let handle = handle::Handle::global();
let app_handle = handle.app_handle.lock().clone();
if let Some(app_handle) = app_handle.as_ref() {
if let Some(window) = app_handle.get_webview_window("main") {
if let Ok(true) = window.is_focused() {
let _ = window.close();
return;
}
if let Some(window) = handle::Handle::global().get_window() {
if let Ok(true) = window.is_focused() {
let _ = window.close();
return;
}
resolve::create_window(app_handle);
}
resolve::create_window();
}
// 重启clash
@@ -104,14 +100,11 @@ pub fn toggle_tun_mode() {
}
pub fn quit() {
let handle = handle::Handle::global();
let app_handle = handle.app_handle.lock().clone();
if let Some(app_handle) = app_handle.as_ref() {
let _ = resolve::save_window_size_position(&app_handle, true);
resolve::resolve_reset();
app_handle.exit(0);
std::process::exit(0);
}
let app_handle: AppHandle = handle::Handle::global().app_handle().unwrap();
let _ = resolve::save_window_size_position(true);
resolve::resolve_reset();
app_handle.exit(0);
std::process::exit(0);
}
/// 修改clash的订阅
@@ -319,7 +312,8 @@ async fn update_core_config() -> Result<()> {
}
/// copy env variable
pub fn copy_clash_env(app_handle: &AppHandle) {
pub fn copy_clash_env() {
let app_handle = handle::Handle::global().app_handle().unwrap();
let port = { Config::verge().latest().verge_mixed_port.unwrap_or(7897) };
let http_proxy = format!("http://127.0.0.1:{}", port);
let socks5_proxy = format!("socks5://127.0.0.1:{}", port);