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

Enhancements

Browse Source 
Fix rule generation in Surge configs.
Refactor log output for curl verbose logs.
Optimize codes.
This commit is contained in:
Tindy X committed 2023-12-06 15:25:53 +08:00
1 parent a0e25158f5
commit 043c1fdcb9
37 files changed
+317 -260
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/generator/config/nodemanip.cpp
+12 -12
View File
@@ -3,18 +3,18 @@
#include <iostream>
#include <algorithm>
#include "../../handler/settings.h"
#include "../../handler/webget.h"
#include "../../parser/config/proxy.h"
#include "../../parser/infoparser.h"
#include "../../parser/subparser.h"
#include "../../script/script_quickjs.h"
#include "../../utils/file_extra.h"
#include "../../utils/logger.h"
#include "../../utils/map_extra.h"
#include "../../utils/network.h"
#include "../../utils/regexp.h"
#include "../../utils/urlencode.h"
#include "handler/settings.h"
#include "handler/webget.h"
#include "parser/config/proxy.h"
#include "parser/infoparser.h"
#include "parser/subparser.h"
#include "script/script_quickjs.h"
#include "utils/file_extra.h"
#include "utils/logger.h"
#include "utils/map_extra.h"
#include "utils/network.h"
#include "utils/regexp.h"
#include "utils/urlencode.h"
#include "nodemanip.h"
#include "subexport.h"
src/generator/config/nodemanip.h
+4 -4
View File
@@ -9,10 +9,10 @@
#include <quickjspp.hpp>
#endif // NO_JS_RUNTIME
#include "../../config/regmatch.h"
#include "../../parser/config/proxy.h"
#include "../../utils/map_extra.h"
#include "../../utils/string.h"
#include "config/regmatch.h"
#include "parser/config/proxy.h"
#include "utils/map_extra.h"
#include "utils/string.h"
struct parse_settings
{
src/generator/config/ruleconvert.cpp
+9 -10
View File
@@ -1,11 +1,11 @@
#include <string>
#include "../../handler/settings.h"
#include "../../utils/logger.h"
#include "../../utils/network.h"
#include "../../utils/regexp.h"
#include "../../utils/string.h"
#include "../../utils/rapidjson_extra.h"
#include "handler/settings.h"
#include "utils/logger.h"
#include "utils/network.h"
#include "utils/regexp.h"
#include "utils/string.h"
#include "utils/rapidjson_extra.h"
#include "subexport.h"
/// rule type lists
@@ -338,7 +338,7 @@ void rulesetToSurge(INIReader &base_rule, std::vector<RulesetContent> &ruleset_c
strLine = "RULE-SET," + remote_path_prefix + "/getruleset?type=1&url=" + urlSafeBase64Encode(rule_path_typed) + "," + rule_group;
if(x.update_interval)
strLine += ",update-interval=" + std::to_string(x.update_interval);
allRules.emplace_back(std::move(strLine));
allRules.emplace_back(strLine);
continue;
}
else if(surge_ver == -1 && !remote_path_prefix.empty())
@@ -372,7 +372,7 @@ void rulesetToSurge(INIReader &base_rule, std::vector<RulesetContent> &ruleset_c
if(x.update_interval)
strLine += ",update-interval=" + std::to_string(x.update_interval);
allRules.emplace_back(std::move(strLine));
allRules.emplace_back(strLine);
continue;
}
else if(surge_ver == -1 && !remote_path_prefix.empty())
@@ -447,7 +447,6 @@ void rulesetToSurge(INIReader &base_rule, std::vector<RulesetContent> &ruleset_c
strLine = trimWhitespace(strLine);
}
strLine += "," + rule_group;
if(surge_ver == -1 || surge_ver == -2)
{
if(startsWith(strLine, "IP-CIDR6"))
@@ -459,7 +458,7 @@ void rulesetToSurge(INIReader &base_rule, std::vector<RulesetContent> &ruleset_c
if(!startsWith(strLine, "AND") && !startsWith(strLine, "OR") && !startsWith(strLine, "NOT"))
strLine = transformRuleToCommon(temp, strLine, rule_group);
}
allRules.emplace_back(std::move(strLine));
allRules.emplace_back(strLine);
total_rules++;
}
}
src/generator/config/ruleconvert.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include <yaml-cpp/yaml.h>
#include <rapidjson/document.h>
#include "../../utils/ini_reader/ini_reader.h"
#include "utils/ini_reader/ini_reader.h"
enum ruleset_type
{
src/generator/config/subexport.cpp
+16 -16
View File
@@ -4,22 +4,22 @@
#include <cmath>
#include <climits>
#include "../../config/regmatch.h"
#include "../../generator/config/subexport.h"
#include "../../generator/template/templates.h"
#include "../../handler/settings.h"
#include "../../parser/config/proxy.h"
#include "../../script/script_quickjs.h"
#include "../../utils/bitwise.h"
#include "../../utils/file_extra.h"
#include "../../utils/ini_reader/ini_reader.h"
#include "../../utils/logger.h"
#include "../../utils/network.h"
#include "../../utils/rapidjson_extra.h"
#include "../../utils/regexp.h"
#include "../../utils/stl_extra.h"
#include "../../utils/urlencode.h"
#include "../../utils/yamlcpp_extra.h"
#include "config/regmatch.h"
#include "generator/config/subexport.h"
#include "generator/template/templates.h"
#include "handler/settings.h"
#include "parser/config/proxy.h"
#include "script/script_quickjs.h"
#include "utils/bitwise.h"
#include "utils/file_extra.h"
#include "utils/ini_reader/ini_reader.h"
#include "utils/logger.h"
#include "utils/network.h"
#include "utils/rapidjson_extra.h"
#include "utils/regexp.h"
#include "utils/stl_extra.h"
#include "utils/urlencode.h"
#include "utils/yamlcpp_extra.h"
#include "nodemanip.h"
#include "ruleconvert.h"
src/generator/config/subexport.h
+6 -6
View File
@@ -7,12 +7,12 @@
#include <quickjspp.hpp>
#endif // NO_JS_RUNTIME
#include "../../config/proxygroup.h"
#include "../../config/regmatch.h"
#include "../../parser/config/proxy.h"
#include "../../utils/ini_reader/ini_reader.h"
#include "../../utils/string.h"
#include "../../utils/yamlcpp_extra.h"
#include "config/proxygroup.h"
#include "config/regmatch.h"
#include "parser/config/proxy.h"
#include "utils/ini_reader/ini_reader.h"
#include "utils/string.h"
#include "utils/yamlcpp_extra.h"
#include "ruleconvert.h"
struct extra_settings
src/generator/template/template_jinja2.cpp
+2 -2
View File
@@ -5,8 +5,8 @@
#include <jinja2cpp/template.h>
#include <nlohmann/json.hpp>
#include "../../handler/interfaces.h"
#include "../../utils/regexp.h"
#include "handler/interfaces.h"
#include "utils/regexp.h"
#include "templates.h"
static inline void parse_json_pointer(nlohmann::json &json, const std::string &path, const std::string &value)
src/generator/template/templates.cpp
+8 -8
View File
@@ -5,14 +5,14 @@
#include <inja.hpp>
#include <nlohmann/json.hpp>
#include "../../handler/interfaces.h"
#include "../../handler/settings.h"
#include "../../handler/webget.h"
#include "../../utils/logger.h"
#include "../../utils/network.h"
#include "../../utils/regexp.h"
#include "../../utils/urlencode.h"
#include "../../utils/yamlcpp_extra.h"
#include "handler/interfaces.h"
#include "handler/settings.h"
#include "handler/webget.h"
#include "utils/logger.h"
#include "utils/network.h"
#include "utils/regexp.h"
#include "utils/urlencode.h"
#include "utils/yamlcpp_extra.h"
#include "templates.h"
namespace inja
src/generator/template/templates.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include <string>
#include <map>
#include "../../generator/config/subexport.h"
#include "../../utils/string.h"
#include "generator/config/subexport.h"
#include "utils/string.h"
struct template_args
{