Rename sections in configurations

This commit is contained in:
Tindy X
2020-06-20 00:13:06 +08:00
parent 605e273d69
commit 5f87abec16
2 changed files with 6 additions and 5 deletions

View File

@@ -2,10 +2,10 @@ custom:
enable_rule_generator: false
overwrite_original_rules: false
custom_proxy_group:
proxy_groups:
- {import: snippets/groups_forcerule.txt}
# surge_ruleset:
# rulesets:
# - {import: snippets/ruleset_remote.txt}
clash_rule_base: base/forcerule.yml
@@ -18,7 +18,7 @@ custom:
# rename_node:
# - {import: snippet/rename.txt}
# emoji:
# emojis:
# - {import: snippets/emoji.txt}
# include_remarks: []

View File

@@ -1105,8 +1105,9 @@ int loadExternalYAML(YAML::Node &node, ExternalConfig &ext)
section["enable_rule_generator"] >> ext.enable_rule_generator;
section["overwrite_original_rules"] >> ext.overwrite_original_rules;
if(section["custom_proxy_group"].size())
readGroup(section["custom_proxy_group"], ext.custom_proxy_group, api_mode);
const char *group_name = section["proxy_groups"].IsDefined() ? "proxy_groups" : "custom_proxy_group";
if(section[group_name].size())
readGroup(section[group_name], ext.custom_proxy_group, api_mode);
const char *ruleset_name = section["rulesets"].IsDefined() ? "rulesets" : "surge_ruleset";
if(section[ruleset_name].size())