Bug fixes

Fix issue [#44](https://github.com/tindy2013/subconverter/issues/44).
Fix host setting missing for VMess TCP+TLS nodes.
Fix logical error in loading external configuration file.
Fix a potential multi-thread resource conflict.
Add rename and emoji option in external configuration file.
This commit is contained in:
Tindy X committed 2020-01-27 14:56:49 +08:00
1 parent 1a54f7c500
commit 1514727573
5 files changed
+70 -68

No files matched your search

+5 -2
View File
@@ -13,6 +13,9 @@ struct ruleset_content
struct extra_settings
{
bool enable_rule_generator = true;
bool overwrite_original_rules = true;
string_array rename_array;
string_array emoji_array;
bool add_emoji = false;
bool remove_emoji = false;
bool append_proxy_type = false;
@@ -25,8 +28,8 @@ struct extra_settings
std::string surge_ssr_path;
};
void rulesetToClash(YAML::Node &base_rule, std::vector<ruleset_content> &ruleset_content_array);
void rulesetToSurge(INIReader &base_rule, std::vector<ruleset_content> &ruleset_content_array, int surge_ver);
void rulesetToClash(YAML::Node &base_rule, std::vector<ruleset_content> &ruleset_content_array, bool overwrite_original_rules);
void rulesetToSurge(INIReader &base_rule, std::vector<ruleset_content> &ruleset_content_array, int surge_ver, bool overwrite_original_rules);
std::string netchToClash(std::vector<nodeInfo> &nodes, std::string &base_conf, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, bool clashR, extra_settings &ext);
void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &base, string_array &extra_proxy_group, bool clashR, extra_settings &ext);
std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, std::vector<ruleset_content> &ruleset_content_array, string_array &extra_proxy_group, int surge_ver, extra_settings &ext);