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

Format short-id in node list

Browse Source
This commit is contained in:
AkariiinMKII committed 2026-03-30 14:22:53 +08:00
1 parent cd74f4dc22
commit a9183c27ad
3 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/generator/config/subexport.cpp
+3 -3
View File
@@ -805,7 +805,7 @@ proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGroupCo
} }
void formatterShortId(std::string &input) { std::string formatterShortId(std::string input) {
std::string target = "short-id:"; std::string target = "short-id:";
size_t startPos = input.find(target); size_t startPos = input.find(target);
@@ -830,6 +830,7 @@ void formatterShortId(std::string &input) {
// 继续查找下一个实例 // 继续查找下一个实例
startPos = input.find(target, startPos + 1); startPos = input.find(target, startPos + 1);
} }
return input;
} }
std::string proxyToClash(std::vector<Proxy> &nodes, const std::string &base_conf, std::string proxyToClash(std::vector<Proxy> &nodes, const std::string &base_conf,
@@ -879,8 +880,7 @@ std::string proxyToClash(std::vector<Proxy> &nodes, const std::string &base_conf
//rulesetToClash(yamlnode, ruleset_content_array, ext.overwrite_original_rules, ext.clash_new_field_name); //rulesetToClash(yamlnode, ruleset_content_array, ext.overwrite_original_rules, ext.clash_new_field_name);
//std::string output_content = YAML::Dump(yamlnode); //std::string output_content = YAML::Dump(yamlnode);
replaceAll(output_content, "!<str> ", ""); replaceAll(output_content, "!<str> ", "");
formatterShortId(output_content); return formatterShortId(std::move(output_content));
return output_content;
} }
void replaceAll(std::string &input, const std::string &search, const std::string &replace) { void replaceAll(std::string &input, const std::string &search, const std::string &replace) {
src/generator/config/subexport.h
+1
View File
@@ -74,4 +74,5 @@ void proxyToQuan(std::vector<Proxy> &nodes, INIReader &ini, std::vector<RulesetC
std::string proxyToSSD(std::vector<Proxy> &nodes, std::string &group, std::string &userinfo, extra_settings &ext); std::string proxyToSSD(std::vector<Proxy> &nodes, std::string &group, std::string &userinfo, extra_settings &ext);
std::string proxyToSingBox(std::vector<Proxy> &nodes, const std::string &base_conf, std::vector<RulesetContent> &ruleset_content_array, const ProxyGroupConfigs &extra_proxy_group, extra_settings &ext); std::string proxyToSingBox(std::vector<Proxy> &nodes, const std::string &base_conf, std::vector<RulesetContent> &ruleset_content_array, const ProxyGroupConfigs &extra_proxy_group, extra_settings &ext);
void replaceAll(std::string& input, const std::string& search, const std::string& replace); void replaceAll(std::string& input, const std::string& search, const std::string& replace);
std::string formatterShortId(std::string input);
#endif // SUBEXPORT_H_INCLUDED #endif // SUBEXPORT_H_INCLUDED
src/handler/interfaces.cpp
+1 -1
View File
@@ -703,7 +703,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS) {
if (ext.nodelist) { if (ext.nodelist) {
YAML::Node yamlnode; YAML::Node yamlnode;
proxyToClash(nodes, yamlnode, dummy_group, argTarget == "clashr", ext); proxyToClash(nodes, yamlnode, dummy_group, argTarget == "clashr", ext);
output_content = YAML::Dump(yamlnode); output_content = formatterShortId(YAML::Dump(yamlnode));
} else { } else {
if (render_template(fetchFile(lClashBase, proxy, global.cacheConfig), tpl_args, base_content, if (render_template(fetchFile(lClashBase, proxy, global.cacheConfig), tpl_args, base_content,
global.templatePath) != 0) { global.templatePath) != 0) {