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

Bug fixes

Browse Source 
Fix Surge SSID groups not being correctly generated.
Fix snippet importing not filtering line break.
Add SSID group example.
This commit is contained in:
Tindy X committed 2020-02-10 11:37:40 +08:00
1 parent 6f64f27361
commit ac75c9513a
4 files changed
+89 -84
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main.cpp
+10 -7
View File
@@ -118,6 +118,11 @@ int importItems(string_array &target)
while(getline(ss, strLine, delimiter))
{
lineSize = strLine.size();
if(strLine[lineSize - 1] == '\r') //remove line break
{
strLine = strLine.substr(0, lineSize - 1);
lineSize--;
}
if(!lineSize || strLine[0] == ';' || strLine[0] == '#' || (lineSize >= 2 && strLine[0] == '/' && strLine[1] == '/')) //empty lines and comments are ignored
continue;
result.emplace_back(strLine);
@@ -205,19 +210,17 @@ void readGroup(YAML::Node node, string_array &dest)
object["type"] >> type;
tempArray.emplace_back(name);
tempArray.emplace_back(type);
if(object["url"].as<std::string>().size())
object["url"] >> url;
if(object["interval"].as<std::string>().size())
object["interval"] >> interval;
object["url"] >> url;
object["interval"] >> interval;
for(j = 0; j < object["rule"].size(); j++)
tempArray.emplace_back(object["rule"][i].as<std::string>());
if(type != "select")
tempArray.emplace_back(object["rule"][j].as<std::string>());
if(type != "select" && type != "ssid")
{
tempArray.emplace_back(url);
tempArray.emplace_back(interval);
}
if((type == "select" && tempArray.size() < 3) || (type != "select" && tempArray.size() < 5))
if((type == "select" && tempArray.size() < 3) || (type == "ssid" && tempArray.size() < 4) || (type != "select" && type != "ssid" && tempArray.size() < 5))
continue;
strLine = std::accumulate(std::next(tempArray.begin()), tempArray.end(), tempArray[0], [](std::string a, std::string b) -> std::string