refactor: done

src-tauri/src/cmds.rs

@@ -5,7 +5,7 @@ use crate::{
     utils::{dirs, help},
 };
 use crate::{ret_err, wrap_err};
-use anyhow::Result;
+use anyhow::{Context, Result};
 use serde_yaml::Mapping;
 use std::collections::{HashMap, VecDeque};
 use sysproxy::Sysproxy;
@@ -19,7 +19,9 @@ pub fn get_profiles() -> CmdResult<IProfiles> {
 
 #[tauri::command]
 pub async fn enhance_profiles() -> CmdResult {
-    wrap_err!(feat::handle_activate().await)
+    wrap_err!(CoreManager::global().update_config().await)?;
+    handle::Handle::refresh_clash();
+    Ok(())
 }
 
 #[deprecated]
@@ -40,75 +42,41 @@ pub async fn update_profile(index: String, option: Option<PrfOption>) -> CmdResu
     wrap_err!(feat::update_profile(index, option).await)
 }
 
-#[tauri::command]
-pub async fn select_profile(index: String) -> CmdResult {
-    wrap_err!({ Config::profiles().draft().put_current(index) })?;
-
-    match feat::handle_activate().await {
-        Ok(_) => {
-            Config::profiles().apply();
-            wrap_err!(Config::profiles().data().save_file())?;
-            Ok(())
-        }
-        Err(err) => {
-            Config::profiles().discard();
-            log::error!(target: "app", "{err}");
-            Err(format!("{err}"))
-        }
-    }
-}
-
-/// change the profile chain
-#[tauri::command]
-pub async fn change_profile_chain(chain: Option<Vec<String>>) -> CmdResult {
-    wrap_err!({ Config::profiles().draft().put_chain(chain) })?;
-
-    match feat::handle_activate().await {
-        Ok(_) => {
-            Config::profiles().apply();
-            wrap_err!(Config::profiles().data().save_file())?;
-            Ok(())
-        }
-        Err(err) => {
-            Config::profiles().discard();
-            log::error!(target: "app", "{err}");
-            Err(format!("{err}"))
-        }
-    }
-}
-
-#[tauri::command]
-pub async fn change_profile_valid(valid: Option<Vec<String>>) -> CmdResult {
-    wrap_err!({ Config::profiles().draft().put_valid(valid) })?;
-
-    match feat::handle_activate().await {
-        Ok(_) => {
-            Config::profiles().apply();
-            wrap_err!(Config::profiles().data().save_file())?;
-            Ok(())
-        }
-        Err(err) => {
-            Config::profiles().discard();
-            log::error!(target: "app", "{err}");
-            Err(format!("{err}"))
-        }
-    }
-}
-
 #[tauri::command]
 pub async fn delete_profile(index: String) -> CmdResult {
     let should_update = wrap_err!({ Config::profiles().data().delete_item(index) })?;
     if should_update {
-        wrap_err!(feat::handle_activate().await)?;
+        wrap_err!(CoreManager::global().update_config().await)?;
+        handle::Handle::refresh_clash();
     }
 
     Ok(())
 }
 
+/// 修改profiles的
+#[tauri::command]
+pub async fn patch_profiles_config(profiles: IProfiles) -> CmdResult {
+    wrap_err!({ Config::profiles().draft().patch_config(profiles) })?;
+
+    match CoreManager::global().update_config().await {
+        Ok(_) => {
+            handle::Handle::refresh_clash();
+            Config::profiles().apply();
+            wrap_err!(Config::profiles().data().save_file())?;
+            Ok(())
+        }
+        Err(err) => {
+            Config::profiles().discard();
+            log::error!(target: "app", "{err}");
+            Err(format!("{err}"))
+        }
+    }
+}
+
+/// 修改某个profile item的
 #[tauri::command]
 pub fn patch_profile(index: String, profile: PrfItem) -> CmdResult {
     wrap_err!(Config::profiles().data().patch_item(index, profile))?;
-
     wrap_err!(timer::Timer::global().refresh())
 }
 
@@ -157,34 +125,29 @@ pub fn get_clash_info() -> CmdResult<ClashInfoN> {
 
 #[tauri::command]
 pub fn get_runtime_config() -> CmdResult<Option<Mapping>> {
-    Ok(CoreManager::global().runtime_config.lock().config.clone())
+    Ok(Config::runtime().latest().config.clone())
 }
 
 #[tauri::command]
-pub fn get_runtime_yaml() -> CmdResult<Option<String>> {
-    Ok(CoreManager::global()
-        .runtime_config
-        .lock()
-        .config_yaml
-        .clone())
+pub fn get_runtime_yaml() -> CmdResult<String> {
+    let runtime = Config::runtime();
+    let runtime = runtime.latest();
+    let config = runtime.config.as_ref();
+    wrap_err!(config
+        .ok_or(anyhow::anyhow!("failed to parse config to yaml file"))
+        .and_then(
+            |config| serde_yaml::to_string(config).context("failed to convert config to yaml")
+        ))
 }
 
 #[tauri::command]
 pub fn get_runtime_exists() -> CmdResult<Vec<String>> {
-    Ok(CoreManager::global()
-        .runtime_config
-        .lock()
-        .exists_keys
-        .clone())
+    Ok(Config::runtime().latest().exists_keys.clone())
 }
 
 #[tauri::command]
 pub fn get_runtime_logs() -> CmdResult<HashMap<String, Vec<(String, String)>>> {
-    Ok(CoreManager::global()
-        .runtime_config
-        .lock()
-        .chain_logs
-        .clone())
+    Ok(Config::runtime().latest().chain_logs.clone())
 }
 
 #[tauri::command]