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

fix: import profile panic (#5346)

Browse Source 
* fix: import profile panic

docs: update UPDATELOG.md

chore: update

* perf: spawn import profile
This commit is contained in:
oomeow
2025-11-07 22:46:30 +08:00
committed by GitHub
parent 758c21e656
commit 76bf91ff8a
3 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src-tauri/src/config/prfitem.rs
View File

@@ -456,16 +456,10 @@ impl PrfItem {
Ok(Self {
uid: Some(id),
itype: Some("merge".into()),
name: None,
desc: None,
file: Some(file),
url: None,
selected: None,
extra: None,
option: None,
home: None,
updated: Some(chrono::Local::now().timestamp() as usize),
file_data: Some(template),
..Default::default()
})
}
@@ -481,16 +475,10 @@ impl PrfItem {
Ok(Self {
uid: Some(id),
itype: Some("script".into()),
name: None,
desc: None,
file: Some(file),
url: None,
home: None,
selected: None,
extra: None,
option: None,
updated: Some(chrono::Local::now().timestamp() as usize),
file_data: Some(tmpl::ITEM_SCRIPT.into()),
..Default::default()
})
}
@@ -502,16 +490,10 @@ impl PrfItem {
Ok(Self {
uid: Some(uid),
itype: Some("rules".into()),
name: None,
desc: None,
file: Some(file),
url: None,
home: None,
selected: None,
extra: None,
option: None,
updated: Some(chrono::Local::now().timestamp() as usize),
file_data: Some(tmpl::ITEM_RULES.into()),
..Default::default()
})
}
@@ -523,16 +505,10 @@ impl PrfItem {
Ok(Self {
uid: Some(uid),
itype: Some("proxies".into()),
name: None,
desc: None,
file: Some(file),
url: None,
home: None,
selected: None,
extra: None,
option: None,
updated: Some(chrono::Local::now().timestamp() as usize),
file_data: Some(tmpl::ITEM_PROXIES.into()),
..Default::default()
})
}
@@ -544,16 +520,10 @@ impl PrfItem {
Ok(Self {
uid: Some(uid),
itype: Some("groups".into()),
name: None,
desc: None,
file: Some(file),
url: None,
home: None,
selected: None,
extra: None,
option: None,
updated: Some(chrono::Local::now().timestamp() as usize),
file_data: Some(tmpl::ITEM_GROUPS.into()),
..Default::default()
})
}

8
src-tauri/src/utils/server.rs
View File

@@ -112,14 +112,14 @@ pub fn embed_server() {
// Use map instead of and_then to avoid Send issues
let scheme = warp::path!("commands" / "scheme")
.and(warp::query::<QueryParam>())
.map(|query: QueryParam| {
tokio::task::spawn_local(async move {
.and_then(|query: QueryParam| async move {
AsyncHandler::spawn(|| async move {
logging_error!(Type::Setup, resolve::resolve_scheme(&query.param).await);
});
warp::reply::with_status::<std::string::String>(
Ok::<_, warp::Rejection>(warp::reply::with_status::<std::string::String>(
"ok".to_string(),
warp::http::StatusCode::OK,
)
))
});
let commands = visible.or(scheme).or(pac);