taixingyiji/subconverter
1
0
Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2025-10-28 04:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add add_emoji/remove_old_emoji options to external config

Browse Source
This commit is contained in:
Tindy X
2020-07-02 22:14:43 +08:00
parent 5781408901
commit d752bc1783
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/config/example_external_config.ini
View File

@@ -49,6 +49,8 @@ clash_rule_base=base/forcerule.yml
;rename=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x
;Options for adding emojis
;add_emoji=true
;remove_old_emoji=true
;emoji=(流量|时间|应急),🏳️‍🌈
;emoji=阿根廷,🇦🇷

2
base/config/example_external_config.yml
View File

@@ -18,6 +18,8 @@ custom:
# rename_node:
# - {import: snippet/rename.txt}
# add_emoji: true
# remove_old_emoji: true
# emojis:
# - {import: snippets/emoji.txt}

38
src/interfaces.cpp
View File

@@ -1096,6 +1096,8 @@ struct ExternalConfig
template_args *tpl_args = NULL;
bool overwrite_original_rules = false;
bool enable_rule_generator = true;
tribool add_emoji;
tribool remove_old_emoji;
};
int loadExternalYAML(YAML::Node &node, ExternalConfig &ext)
@@ -1135,6 +1137,8 @@ int loadExternalYAML(YAML::Node &node, ExternalConfig &ext)
if(section["rename_node"].size())
readRegexMatch(section["rename_node"], "@", ext.rename, api_mode);
ext.add_emoji = safe_as<std::string>(section["add_emoji"]);
ext.remove_old_emoji = safe_as<std::string>(section["remove_old_emoji"]);
const char *emoji_name = section["emojis"].IsDefined() ? "emojis" : "emoji";
if(section[emoji_name].size())
readEmoji(section[emoji_name], ext.emoji, api_mode);
@@ -1219,6 +1223,8 @@ int loadExternalConfig(std::string &path, ExternalConfig &ext)
ini.GetAll("rename", ext.rename);
importItems(ext.rename, api_mode);
}
ext.add_emoji = ini.Get("add_emoji");
ext.remove_old_emoji = ini.Get("remove_old_emoji");
if(ini.ItemPrefixExist("emoji"))
{
ini.GetAll("emoji", ext.emoji);
@@ -1363,23 +1369,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
//check for proxy settings
std::string proxy = parseProxy(proxy_subscription);
ext.emoji_array = safe_get_emojis();
if(ext_rename.size())
ext.rename_array = split(ext_rename, "`");
else
ext.rename_array = safe_get_renames();
//check other flags
if(!emoji.is_undef())
{
ext.add_emoji = emoji;
ext.remove_emoji = true;
}
else
{
ext.add_emoji = emoji_add.get(add_emoji);
ext.remove_emoji = emoji_remove.get(remove_old_emoji);
}
ext.append_proxy_type = append_type.get(append_proxy_type);
if((target == "clash" || target == "clashr") && clash_script.is_undef())
expand.define(true);
@@ -1450,6 +1440,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
include_remarks = extconf.include;
if(extconf.exclude.size())
exclude_remarks = extconf.exclude;
emoji_add.define(extconf.add_emoji);
emoji_remove.define(extconf.remove_old_emoji);
}
if(extconf.surge_ruleset.size() && !ext.nodelist)
{
@@ -1506,6 +1498,20 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
}
}
if(!emoji.is_undef())
{
emoji_add.set(emoji);
emoji_remove.set(true);
}
ext.add_emoji = emoji_add.get(add_emoji);
ext.remove_emoji = emoji_remove.get(remove_old_emoji);
if(ext.add_emoji && ext.emoji_array.empty())
ext.emoji_array = safe_get_emojis();
if(ext_rename.size())
ext.rename_array = split(ext_rename, "`");
else
ext.rename_array = safe_get_renames();
//check custom include/exclude settings
if(include.size() && regValid(include))
include_remarks = string_array{include};