taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-03 02:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Optimize codes

Browse Source
This commit is contained in:
Tindy X committed 2020-04-21 23:17:55 +08:00
1 parent 52c8eff182
commit 11c3e2a7c8
1 file changed
+18 -48
Download Patch File Download Diff File Expand all files Collapse all files
src/subexport.cpp
+18 -48
View File
@@ -429,6 +429,18 @@ std::string addEmoji(std::string remark, int groupID, const string_array &emoji_
return remark;
}
void processRemark(std::string &oldremark, std::string &newremark, string_array &remarks_list)
{
newremark = oldremark;
int cnt = 2;
while(std::find(remarks_list.begin(), remarks_list.end(), newremark) != remarks_list.end())
{
newremark = oldremark + " " + std::to_string(cnt);
cnt++;
}
oldremark = newremark;
}
void rulesetToClash(YAML::Node &base_rule, std::vector<ruleset_content> &ruleset_content_array, bool overwrite_original_rules, bool new_field_name)
{
string_array allRules, vArray;
@@ -890,14 +902,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = GetMember(json, "Port");
@@ -1212,15 +1217,8 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = std::to_string((unsigned short)stoi(GetMember(json, "Port")));
@@ -1771,14 +1769,7 @@ void netchToQuan(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rules
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = std::to_string((unsigned short)stoi(GetMember(json, "Port")));
@@ -2040,14 +2031,7 @@ void netchToQuanX(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rule
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = std::to_string((unsigned short)stoi(GetMember(json, "Port")));
@@ -2432,14 +2416,7 @@ void netchToMellow(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rul
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = std::to_string((unsigned short)stoi(GetMember(json, "Port")));
@@ -2591,14 +2568,7 @@ std::string netchToLoon(std::vector<nodeInfo> &nodes, std::string &base_conf, st
if(ext.append_proxy_type)
x.remarks = "[" + type + "] " + x.remarks;
remark = x.remarks;
int cnt = 2;
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
{
remark = x.remarks + " " + std::to_string(cnt);
cnt++;
}
x.remarks = remark;
processRemark(x.remarks, remark, remarks_list);
hostname = GetMember(json, "Hostname");
port = std::to_string((unsigned short)stoi(GetMember(json, "Port")));