purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: adjust code

Browse Source
This commit is contained in:
GyDi 2022-10-17 23:26:25 +08:00
parent 910846f2ce
commit a32c77c5f1
No known key found for this signature in database
GPG Key ID: 58B15242BA8277A6
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src-tauri/src/data/prfitem.rs
View File

@ -78,30 +78,15 @@ pub struct PrfOption {
impl PrfOption { impl PrfOption {
pub fn merge(one: Option<Self>, other: Option<Self>) -> Option<Self> { pub fn merge(one: Option<Self>, other: Option<Self>) -> Option<Self> {
if one.is_none() { match (one, other) {
return other; (Some(mut a), Some(b)) => {
a.user_agent = a.user_agent.or(b.user_agent);
a.with_proxy = a.with_proxy.or(b.with_proxy);
a.update_interval = a.update_interval.or(b.update_interval);
Some(a)
}
t @ _ => t.0.or(t.1),
} }
if one.is_some() && other.is_some() {
let mut one = one.unwrap();
let other = other.unwrap();
if let Some(val) = other.user_agent {
one.user_agent = Some(val);
}
if let Some(val) = other.with_proxy {
one.with_proxy = Some(val);
}
if let Some(val) = other.update_interval {
one.update_interval = Some(val);
}
return Some(one);
}
return one;
} }
} }