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

refactor: use async instead of block_on

Browse Source
This commit is contained in:
MystiPanda
2024-06-29 19:02:37 +08:00
parent 041522f94e
commit b85929772e
11 changed files with 81 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/enhance/mod.rs
View File

@@ -18,7 +18,7 @@ type ResultLog = Vec<(String, String)>;
/// Enhance mode
/// 返回最终订阅、该订阅包含的键、和script执行的结果
pub fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
// config.yaml 的订阅
let clash_config = { Config::clash().latest().0.clone() };
@@ -149,7 +149,7 @@ pub fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
});
}
config = use_tun(config, enable_tun);
config = use_tun(config, enable_tun).await;
config = use_sort(config);
let mut exists_set = HashSet::new();

8
src-tauri/src/enhance/tun.rs
View File

@@ -1,4 +1,4 @@
use crate::core::service;
use crate::{core::service, log_err};
use serde_yaml::{Mapping, Value};
macro_rules! revise {
@@ -18,7 +18,7 @@ macro_rules! append {
};
}
pub fn use_tun(mut config: Mapping, enable: bool) -> Mapping {
pub async fn use_tun(mut config: Mapping, enable: bool) -> Mapping {
let tun_key = Value::from("tun");
let tun_val = config.get(&tun_key);
@@ -35,10 +35,10 @@ pub fn use_tun(mut config: Mapping, enable: bool) -> Mapping {
revise!(config, "tun", tun_val);
if enable {
let _ = service::set_dns_by_service();
log_err!(service::set_dns_by_service().await);
use_dns_for_tun(config)
} else {
let _ = service::unset_dns_by_service();
log_err!(service::unset_dns_by_service().await);
config
}
}