mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-24 21:46:07 +00:00
fix(subClashService): improve merging of clash rules in YAML (#5054)
This commit is contained in:
@@ -573,10 +573,14 @@ func mergeClashRulesYAML(base map[string]any, raw string) error {
|
|||||||
case []any:
|
case []any:
|
||||||
mergeClashRules(base, typed)
|
mergeClashRules(base, typed)
|
||||||
case map[string]any:
|
case map[string]any:
|
||||||
if rules, ok := typed["rules"]; ok {
|
for key, value := range typed {
|
||||||
if ruleList, ok := asAnySlice(rules); ok {
|
if key == "rules" {
|
||||||
mergeClashRules(base, ruleList)
|
if ruleList, ok := asAnySlice(value); ok {
|
||||||
|
mergeClashRules(base, ruleList)
|
||||||
|
}
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
base[key] = value
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
mergeClashRules(base, linesToClashRules(raw))
|
mergeClashRules(base, linesToClashRules(raw))
|
||||||
|
|||||||
Reference in New Issue
Block a user