mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-01-29 08:45:41 +08:00
fix(subscription): resolve issues causing import failures in some cases #4534, #4436, #4552, #4519, #4517, #4503, #4336, #4301 (#4553)
* fix(subscription): resolve issues causing import failures in some cases #4534, #4436, #4552, #4519, #4517, #4503, #4336, #4301 * fix(profile): update profile creation to include file data handling * fix(app): improve singleton instance exit handling * fix: remove unsued handle method
This commit is contained in:
@@ -2,10 +2,10 @@ use super::CmdResult;
|
||||
use crate::{
|
||||
config::{
|
||||
profiles::{
|
||||
profiles_append_item_safe, profiles_delete_item_safe, profiles_patch_item_safe,
|
||||
profiles_reorder_safe, profiles_save_file_safe,
|
||||
profiles_append_item_with_filedata_safe, profiles_delete_item_safe,
|
||||
profiles_patch_item_safe, profiles_reorder_safe, profiles_save_file_safe,
|
||||
},
|
||||
Config, IProfiles, PrfItem, PrfOption,
|
||||
profiles_append_item_safe, Config, IProfiles, PrfItem, PrfOption,
|
||||
},
|
||||
core::{handle, timer::Timer, tray::Tray, CoreManager},
|
||||
feat, logging,
|
||||
@@ -225,8 +225,8 @@ pub async fn reorder_profile(active_id: String, over_id: String) -> CmdResult {
|
||||
/// 创建新的profile
|
||||
/// 创建一个新的配置文件
|
||||
#[tauri::command]
|
||||
pub async fn create_profile(item: PrfItem, _file_data: Option<String>) -> CmdResult {
|
||||
match profiles_append_item_safe(item).await {
|
||||
pub async fn create_profile(item: PrfItem, file_data: Option<String>) -> CmdResult {
|
||||
match profiles_append_item_with_filedata_safe(item, file_data).await {
|
||||
Ok(_) => Ok(()),
|
||||
Err(err) => match err.to_string().as_str() {
|
||||
"the file already exists" => Err("the file already exists".into()),
|
||||
|
||||
Reference in New Issue
Block a user