Enhancements

Fix rule generation in Surge configs. Refactor log output for curl verbose logs. Optimize codes.
tindy2013 · Dec 6, 2023 · 043c1fd · 043c1fd
1 parent a0e2515
commit 043c1fd
Show file tree

Hide file tree

Showing 37 changed files with 317 additions and 260 deletions.
diff --git a/src/config/binding.h b/src/config/binding.h
@@ -3,7 +3,7 @@
 
 #include <toml.hpp>
 
-#include "../handler/settings.h"
+#include "handler/settings.h"
 #include "crontask.h"
 #include "proxygroup.h"
 #include "regmatch.h"

diff --git a/src/config/def.h b/src/config/def.h
@@ -6,8 +6,8 @@
 #include <tuple>
 #include <cstdint>
 
-#include "../utils/string.h"
-#include "../utils/tribool.h"
+#include "utils/string.h"
+#include "utils/tribool.h"
 
 using String = std::string;
 using Integer = int32_t;

diff --git a/src/generator/config/nodemanip.cpp b/src/generator/config/nodemanip.cpp
@@ -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"
 

diff --git a/src/generator/config/nodemanip.h b/src/generator/config/nodemanip.h
@@ -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
 {

diff --git a/src/generator/config/ruleconvert.cpp b/src/generator/config/ruleconvert.cpp
@@ -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++;
             }
         }

diff --git a/src/generator/config/ruleconvert.h b/src/generator/config/ruleconvert.h
@@ -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
 {

diff --git a/src/generator/config/subexport.cpp b/src/generator/config/subexport.cpp
@@ -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"
 

diff --git a/src/generator/config/subexport.h b/src/generator/config/subexport.h
@@ -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

diff --git a/src/generator/template/template_jinja2.cpp b/src/generator/template/template_jinja2.cpp
@@ -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)

diff --git a/src/generator/template/templates.cpp b/src/generator/template/templates.cpp
@@ -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

diff --git a/src/generator/template/templates.h b/src/generator/template/templates.h
@@ -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
 {

diff --git a/src/handler/interfaces.cpp b/src/handler/interfaces.cpp
@@ -6,27 +6,27 @@
 #include <inja.hpp>
 #include <yaml-cpp/yaml.h>
 
-#include "../config/binding.h"
-#include "../generator/config/nodemanip.h"
-#include "../generator/config/ruleconvert.h"
-#include "../generator/config/subexport.h"
-#include "../generator/template/templates.h"
-#include "../script/cron.h"
-#include "../script/script_quickjs.h"
-#include "../server/webserver.h"
-#include "../utils/base64/base64.h"
-#include "../utils/file_extra.h"
-#include "../utils/ini_reader/ini_reader.h"
-#include "../utils/logger.h"
-#include "../utils/network.h"
-#include "../utils/regexp.h"
-#include "../utils/stl_extra.h"
-#include "../utils/string.h"
-#include "../utils/string_hash.h"
-#include "../utils/system.h"
-#include "../utils/system.h"
-#include "../utils/urlencode.h"
-#include "../utils/yamlcpp_extra.h"
+#include "config/binding.h"
+#include "generator/config/nodemanip.h"
+#include "generator/config/ruleconvert.h"
+#include "generator/config/subexport.h"
+#include "generator/template/templates.h"
+#include "script/cron.h"
+#include "script/script_quickjs.h"
+#include "server/webserver.h"
+#include "utils/base64/base64.h"
+#include "utils/file_extra.h"
+#include "utils/ini_reader/ini_reader.h"
+#include "utils/logger.h"
+#include "utils/network.h"
+#include "utils/regexp.h"
+#include "utils/stl_extra.h"
+#include "utils/string.h"
+#include "utils/string_hash.h"
+#include "utils/system.h"
+#include "utils/system.h"
+#include "utils/urlencode.h"
+#include "utils/yamlcpp_extra.h"
 #include "interfaces.h"
 #include "multithread.h"
 #include "settings.h"

diff --git a/src/handler/interfaces.h b/src/handler/interfaces.h
@@ -5,9 +5,9 @@
 #include <map>
 #include <inja.hpp>
 
-#include "../config/ruleset.h"
-#include "../generator/config/subexport.h"
-#include "../server/webserver.h"
+#include "config/ruleset.h"
+#include "generator/config/subexport.h"
+#include "server/webserver.h"
 
 std::string parseProxy(const std::string &source);
 

diff --git a/src/handler/multithread.cpp b/src/handler/multithread.cpp
@@ -1,8 +1,8 @@
 #include <future>
 #include <thread>
 
-#include "../handler/settings.h"
-#include "../utils/network.h"
+#include "handler/settings.h"
+#include "utils/network.h"
 #include "webget.h"
 #include "multithread.h"
 //#include "vfs.h"

diff --git a/src/handler/multithread.h b/src/handler/multithread.h
@@ -6,9 +6,9 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include "../config/regmatch.h"
-#include "../utils/ini_reader/ini_reader.h"
-#include "../utils/string.h"
+#include "config/regmatch.h"
+#include "utils/ini_reader/ini_reader.h"
+#include "utils/string.h"
 
 using guarded_mutex = std::lock_guard<std::mutex>;
 

diff --git a/src/handler/settings.cpp b/src/handler/settings.cpp
@@ -2,12 +2,12 @@
 #include <mutex>
 #include <toml.hpp>
 
-#include "../config/binding.h"
-#include "../handler/webget.h"
-#include "../script/cron.h"
-#include "../server/webserver.h"
-#include "../utils/logger.h"
-#include "../utils/network.h"
+#include "config/binding.h"
+#include "handler/webget.h"
+#include "script/cron.h"
+#include "server/webserver.h"
+#include "utils/logger.h"
+#include "utils/network.h"
 #include "interfaces.h"
 #include "multithread.h"
 #include "settings.h"

diff --git a/src/handler/settings.h b/src/handler/settings.h
@@ -3,16 +3,16 @@
 
 #include <string>
 
-#include "../config/crontask.h"
-#include "../config/regmatch.h"
-#include "../config/proxygroup.h"
-#include "../config/ruleset.h"
-#include "../generator/config/ruleconvert.h"
-#include "../generator/template/templates.h"
-#include "../utils/logger.h"
-#include "../utils/string.h"
-#include "../utils/stl_extra.h"
-#include "../utils/tribool.h"
+#include "config/crontask.h"
+#include "config/regmatch.h"
+#include "config/proxygroup.h"
+#include "config/ruleset.h"
+#include "generator/config/ruleconvert.h"
+#include "generator/template/templates.h"
+#include "utils/logger.h"
+#include "utils/string.h"
+#include "utils/stl_extra.h"
+#include "utils/tribool.h"
 
 struct Settings
 {

diff --git a/src/handler/upload.cpp b/src/handler/upload.cpp
@@ -1,9 +1,9 @@
 #include <string>
 
-#include "../utils/ini_reader/ini_reader.h"
-#include "../utils/logger.h"
-#include "../utils/rapidjson_extra.h"
-#include "../utils/system.h"
+#include "utils/ini_reader/ini_reader.h"
+#include "utils/logger.h"
+#include "utils/rapidjson_extra.h"
+#include "utils/system.h"
 #include "webget.h"
 
 std::string buildGistData(std::string name, std::string content)