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

fix: after importing a subscription, it cannot be automatically switched to the current subscription.

Browse Source
This commit is contained in:
huzibaca
2024-09-13 18:17:14 +08:00
parent ba487611ee
commit 6d7711f3ea
5 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/cmds.rs
View File

@@ -32,12 +32,8 @@ pub async fn enhance_profiles() -> CmdResult {
}
#[tauri::command]
pub async fn import_profile(
url: String,
name: Option<String>,
option: Option<PrfOption>,
) -> CmdResult {
let item = wrap_err!(PrfItem::from_url(&url, name, None, option).await)?;
pub async fn import_profile(url: String, option: Option<PrfOption>) -> CmdResult {
let item = wrap_err!(PrfItem::from_url(&url, None, None, option).await)?;
wrap_err!(Config::profiles().data().append_item(item))
}

24
src-tauri/src/utils/resolve.rs
View File

@@ -1,8 +1,7 @@
use crate::cmds::import_profile;
use crate::config::IVerge;
use crate::utils::error;
use crate::{config::Config, core::*, utils::init, utils::server};
use crate::{error as er, log_err, trace_err};
use crate::{config::Config, config::PrfItem, core::*, utils::init, utils::server};
use crate::{log_err, trace_err, wrap_err};
use anyhow::{bail, Result};
use once_cell::sync::OnceCell;
use percent_encoding::percent_decode_str;
@@ -265,13 +264,17 @@ pub async fn resolve_scheme(param: String) -> Result<()> {
match encode_url {
Some(url) => {
let decoded_url = percent_decode_str(url.as_ref()).decode_utf8_lossy();
let url = percent_decode_str(url.as_ref())
.decode_utf8_lossy()
.to_string();
let handle = handle::Handle::global();
let app_handle = handle.app_handle.lock().clone();
if let Some(app_handle) = app_handle.as_ref() {
er!(format!("decode_url: {}", decoded_url));
match import_profile(decoded_url.to_string(), name.clone(), None).await {
Ok(_) => {
match PrfItem::from_url(url.as_ref(), name, None, None).await {
Ok(item) => {
let uid = item.uid.clone().unwrap();
let _ = wrap_err!(Config::profiles().data().append_item(item));
app_handle
.notification()
.builder()
@@ -279,7 +282,8 @@ pub async fn resolve_scheme(param: String) -> Result<()> {
.body("Import profile success")
.show()
.unwrap();
handle::Handle::notice_message("import_sub_url::ok", "ok");
handle::Handle::notice_message("import_sub_url::ok", uid);
}
Err(e) => {
app_handle
@@ -289,8 +293,8 @@ pub async fn resolve_scheme(param: String) -> Result<()> {
.body(format!("Import profile failed: {e}"))
.show()
.unwrap();
handle::Handle::notice_message("import_sub_url::error", e.clone());
bail!("Import profile failed: {e}");
handle::Handle::notice_message("import_sub_url::error", e.to_string());
bail!("Failed to add subscriptions: {e}");
}
}
}