shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 05:13:44 +08:00
Code Packages Projects Releases Activity

feat: deep merge

Browse Source 
#983
This commit is contained in:
MystiPanda 2024-05-08 00:13:32 +08:00
parent 5147a070a1
commit 0e5c6f56a0
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src-tauri/src/enhance/merge.rs
View File

@ -14,15 +14,26 @@ const MERGE_FIELDS: [&str; 10] = [
"append-proxy-groups", "append-proxy-groups",
]; ];
pub fn use_merge(merge: Mapping, mut config: Mapping) -> Mapping { fn deep_merge(a: &mut Value, b: &Value) {
// 直接覆盖原字段 match (a, b) {
use_lowercase(merge.clone()) (&mut Value::Mapping(ref mut a), &Value::Mapping(ref b)) => {
.into_iter() for (k, v) in b {
.filter(|(key, _)| !MERGE_FIELDS.contains(&key.as_str().unwrap_or_default())) deep_merge(a.entry(k.clone()).or_insert(Value::Null), v);
.for_each(|(key, value)| { }
config.insert(key, value); }
}); (a, b) => *a = b.clone(),
}
}
pub fn use_merge(merge: Mapping, config: Mapping) -> Mapping {
let mut config = Value::from(config);
let mut merge_without_append = use_lowercase(merge.clone());
for key in MERGE_FIELDS {
merge_without_append.remove(key).unwrap_or_default();
}
deep_merge(&mut config, &Value::from(merge_without_append));
let mut config = config.as_mapping().unwrap().clone();
let merge_list = MERGE_FIELDS.iter().map(|s| s.to_string()); let merge_list = MERGE_FIELDS.iter().map(|s| s.to_string());
let merge = use_filter(merge, &merge_list.collect()); let merge = use_filter(merge, &merge_list.collect());