mirror of
https://github.com/asdlokj1qpi233/subconverter.git
synced 2026-11-03 02:02:24 +00:00
Enhancements
Fix when processing duplicated node name for Surge, the program will crash. Add an interface to directly convert Surge config to Clash config. Add Netease Music IP ruleset. Clean up codes. Update build scripts.
This commit is contained in:
8 files changed
+1386
-1153
No files matched your search
+1331
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,17 @@
|
||||
#ifndef INTERFACES_H_INCLUDED
|
||||
#define INTERFACES_H_INCLUDED
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
#include "subexport.h"
|
||||
#include "webserver.h"
|
||||
|
||||
void refreshRulesets(string_array &ruleset_list, std::vector<ruleset_content> &rca);
|
||||
void readConf();
|
||||
void generateBase();
|
||||
std::string subconverter(RESPONSE_CALLBACK_ARGS);
|
||||
std::string simpleToClashR(RESPONSE_CALLBACK_ARGS);
|
||||
std::string surgeConfToClash(RESPONSE_CALLBACK_ARGS);
|
||||
|
||||
#endif // INTERFACES_H_INCLUDED
|
||||
+11
-1152
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -819,7 +819,7 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
|
||||
x.remarks = "[" + type + "]" + x.remarks;
|
||||
remark = x.remarks;
|
||||
|
||||
while(std::count(remarks_list.begin(), remarks_list.end(), remark) > 0)
|
||||
while(std::count(remarks_list.begin(), remarks_list.end(), x.remarks) > 0)
|
||||
x.remarks += "$";
|
||||
|
||||
remark = x.remarks;
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
#define SUBEXPORT_H_INCLUDED
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "misc.h"
|
||||
#include "ini_reader.h"
|
||||
#include "nodeinfo.h"
|
||||
|
||||
struct ruleset_content
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user