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

Add support for extracting UserInfo from SSD subscriptions

Browse Source
This commit is contained in:
Tindy X committed 2020-02-01 01:16:05 +08:00
1 parent 8eb5e1e5e3
commit cc35c6f8a6
4 files changed
+55 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/nodemanip.cpp
+17 -3
View File
@@ -75,8 +75,15 @@ int addNodes(std::string link, std::vector<nodeInfo> &allNodes, int groupID, std
writeLog(LOG_TYPE_ERROR, "Invalid subscription!");
return -1;
}
if(!getSubInfoFromHeader(extra_headers, subInfo))
getSubInfoFromNodes(nodes, stream_rules, time_rules, subInfo);
if(strSub.find("ssd://") == 0)
{
getSubInfoFromSSD(strSub, subInfo);
}
else
{
if(!getSubInfoFromHeader(extra_headers, subInfo))
getSubInfoFromNodes(nodes, stream_rules, time_rules, subInfo);
}
filterNodes(nodes, exclude_remarks, include_remarks, groupID);
for(nodeInfo &x : nodes)
x.groupID = groupID;
@@ -97,7 +104,14 @@ int addNodes(std::string link, std::vector<nodeInfo> &allNodes, int groupID, std
writeLog(LOG_TYPE_ERROR, "Invalid configuration file!");
return -1;
}
getSubInfoFromNodes(nodes, stream_rules, time_rules, subInfo);
if(strSub.find("ssd://") == 0)
{
getSubInfoFromSSD(strSub, subInfo);
}
else
{
getSubInfoFromNodes(nodes, stream_rules, time_rules, subInfo);
}
filterNodes(nodes, exclude_remarks, include_remarks, groupID);
for(nodeInfo &x : nodes)
x.groupID = groupID;