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

refactor: simplify uid assignment in PrfItem from_merge and from_script methods

Browse Source
This commit is contained in:
Tunglies
2025-11-06 01:10:43 +08:00
parent ccffc0a4fa
commit 70236f781c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/Cargo.toml
View File

@@ -226,3 +226,4 @@ needless_raw_string_hashes = "deny" # Too many in existing code
or_fun_call = "deny" or_fun_call = "deny"
cognitive_complexity = "deny" cognitive_complexity = "deny"
useless_let_if_seq = "deny"

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

@@ -446,12 +446,11 @@ impl PrfItem {
/// ## Merge type (enhance) /// ## Merge type (enhance)
/// create the enhanced item by using `merge` rule /// create the enhanced item by using `merge` rule
pub fn from_merge(uid: Option<String>) -> Result<PrfItem> { pub fn from_merge(uid: Option<String>) -> Result<PrfItem> {
let mut id = help::get_uid("m").into(); let (id, template) = if let Some(uid) = uid {
let mut template = tmpl::ITEM_MERGE_EMPTY.into(); (uid, tmpl::ITEM_MERGE.into())
if let Some(uid) = uid { } else {
id = uid; (help::get_uid("m").into(), tmpl::ITEM_MERGE_EMPTY.into())
template = tmpl::ITEM_MERGE.into(); };
}
let file = format!("{id}.yaml").into(); let file = format!("{id}.yaml").into();
Ok(PrfItem { Ok(PrfItem {
@@ -473,12 +472,12 @@ impl PrfItem {
/// ## Script type (enhance) /// ## Script type (enhance)
/// create the enhanced item by using javascript quick.js /// create the enhanced item by using javascript quick.js
pub fn from_script(uid: Option<String>) -> Result<PrfItem> { pub fn from_script(uid: Option<String>) -> Result<PrfItem> {
let mut id = help::get_uid("s").into(); let id = if let Some(uid) = uid {
if let Some(uid) = uid { uid
id = uid; } else {
} help::get_uid("s").into()
};
let file = format!("{id}.js").into(); // js ext let file = format!("{id}.js").into(); // js ext
Ok(PrfItem { Ok(PrfItem {
uid: Some(id), uid: Some(id),
itype: Some("script".into()), itype: Some("script".into()),