From b86ceb26f63f07d7b5ea2951df26cf4168192fc5 Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Tue, 4 Nov 2025 08:01:33 +0800 Subject: [PATCH] fix: streamline verge configuration fetching and patching functions --- src-tauri/src/cmd/verge.rs | 10 ++-------- src-tauri/src/feat/config.rs | 8 +++++++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src-tauri/src/cmd/verge.rs b/src-tauri/src/cmd/verge.rs index 9944305f..c7b05fe5 100644 --- a/src-tauri/src/cmd/verge.rs +++ b/src-tauri/src/cmd/verge.rs @@ -1,16 +1,10 @@ use super::CmdResult; -use crate::{ - cmd::StringifyErr, - config::{Config, IVerge}, - feat, - utils::draft::SharedBox, -}; +use crate::{cmd::StringifyErr, config::IVerge, feat, utils::draft::SharedBox}; /// 获取Verge配置 #[tauri::command] pub async fn get_verge_config() -> CmdResult> { - let verge = Config::verge().await; - Ok(verge.latest_arc()) + feat::fetch_verge_config().await.stringify_err() } /// 修改Verge配置 diff --git a/src-tauri/src/feat/config.rs b/src-tauri/src/feat/config.rs index f4ab591a..2bd2cfa8 100644 --- a/src-tauri/src/feat/config.rs +++ b/src-tauri/src/feat/config.rs @@ -3,7 +3,7 @@ use crate::{ core::{CoreManager, handle, hotkey, sysopt, tray}, logging_error, module::lightweight, - utils::logging::Type, + utils::{draft::SharedBox, logging::Type}, }; use anyhow::Result; use serde_yaml_ng::Mapping; @@ -250,3 +250,9 @@ pub async fn patch_verge(patch: &IVerge, not_save_file: bool) -> Result<()> { } Ok(()) } + +pub async fn fetch_verge_config() -> Result> { + let draft = Config::verge().await; + let data = draft.data_arc(); + Ok(data) +}