suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 13:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace ConfigSource with bool parameter (#1516)

Browse Source
This commit is contained in:
Mg Pig
2025-11-04 13:48:10 +08:00
committed by GitHub
parent 6bb2fd9a15
commit 89cc75f674
8 changed files with 51 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
easytier-gui/src-tauri/src/lib.rs
View File

@@ -240,12 +240,16 @@ async fn get_config(app: AppHandle, instance_id: String) -> Result<NetworkConfig
}
#[tauri::command]
fn load_configs(configs: Vec<NetworkConfig>, enabled_networks: Vec<String>) -> Result<(), String> {
async fn load_configs(
configs: Vec<NetworkConfig>,
enabled_networks: Vec<String>,
) -> Result<(), String> {
CLIENT_MANAGER
.get()
.unwrap()
.storage
.load_configs(configs, enabled_networks)
.await
.map_err(|e| e.to_string())?;
Ok(())
}
@@ -304,7 +308,7 @@ mod manager {
use super::*;
use async_trait::async_trait;
use dashmap::{DashMap, DashSet};
use easytier::launcher::{ConfigSource, NetworkConfig};
use easytier::launcher::NetworkConfig;
use easytier::proto::rpc_impl::bidirect::BidirectRpcManager;
use easytier::proto::rpc_types::controller::BaseController;
use easytier::rpc_service::remote_client::PersistentConfig;
@@ -334,7 +338,7 @@ mod manager {
}
}
pub(super) fn load_configs(
pub(super) async fn load_configs(
&self,
configs: Vec<NetworkConfig>,
enabled_networks: Vec<String>,
@@ -363,7 +367,7 @@ mod manager {
.get(&uuid)
.map(|i| i.value().1.gen_config())
.ok_or_else(|| anyhow::anyhow!("Config not found"))??;
INSTANCE_MANAGER.run_network_instance(config, ConfigSource::GUI)?;
INSTANCE_MANAGER.run_network_instance(config, true)?;
self.enabled_networks.insert(uuid);
}
}