From 439bae0fbfe06c10f9b2b8c00708062900570d14 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Tue, 12 Nov 2019 13:08:44 +0800
Subject: [PATCH] Enhancements

Improve subscription recognition.
INIReader: Add back line break detect.
---
 ini_reader.h      | 6 +++---
 speedtestutil.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ini_reader.h b/ini_reader.h
index c0f02c4..580efa3 100644
--- a/ini_reader.h
+++ b/ini_reader.h
@@ -129,7 +129,7 @@ public:
         string_multimap itemGroup, existItemGroup;
         std::stringstream strStrm;
         unsigned int lineSize = 0;
-        //char delimiter = count(content.begin(), content.end(), '\n') <= 1 ? '\r' : '\n';
+        char delimiter = count(content.begin(), content.end(), '\n') <= 1 ? '\r' : '\n';
 
         EraseAll(); //first erase all data
         if(do_utf8_to_gbk && is_str_utf8(content))
@@ -138,8 +138,8 @@ public:
         if(store_isolated_line)
             curSection = isolated_items_section; //items before any section define will be store in this section
         strStrm<<content;
-        //while(getline(strStrm, strLine, delimiter))
-        while(getline(strStrm, strLine)) //get one line of content
+        while(getline(strStrm, strLine, delimiter))
+        //while(getline(strStrm, strLine)) //get one line of content
         {
             lineSize = strLine.size();
             if(!lineSize || strLine[0] == ';' || strLine[0] == '#') //empty lines and comments are ignored
diff --git a/speedtestutil.cpp b/speedtestutil.cpp
index adfa838..30f288e 100644
--- a/speedtestutil.cpp
+++ b/speedtestutil.cpp
@@ -1251,7 +1251,7 @@ bool explodeSurge(std::string surge, std::string custom_port, int local_port, st
         nodes.push_back(node);
         index++;
     }
-    return true;
+    return index;
 }
 
 void explodeSSTap(std::string sstap, std::string custom_port, int local_port, std::vector<nodeInfo> &nodes, bool ss_libev, bool ssr_libev)