taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-02 01:33:04 +00:00
Code Issues Projects Releases Wiki Activity

Bugs fix

Browse Source 
Fix example preference file.
Fix error when template include path is not set.
Fix crash when adding SSID group to Loon configurations.
Clean up codes.
This commit is contained in:
Tindy X committed 2021-10-04 23:48:51 +08:00
1 parent 94696a5da5
commit a653e3a874
8 files changed
+44 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/handler/interfaces.cpp
+2 -11
View File
@@ -924,15 +924,6 @@ void find_if_exist(const toml::value &v, const toml::key &k, T& target, U&&... a
if constexpr (sizeof...(args) > 0) find_if_exist(v, std::forward<U>(args)...);
}
std::string join(const string_array &arr, const std::string &delimiter = "|")
{
if(arr.size() == 0)
return "";
if(arr.size() == 1)
return arr[0];
return std::accumulate(arr.begin() + 1, arr.end(), arr[0], [&](const std::string &a, const std::string &b) { return a + delimiter + b; });
}
void operate_toml_kv_table(const std::vector<toml::table> &arr, const toml::key &key_name, const toml::key &value_name, std::function<void (const toml::value&, const toml::value&)> binary_op)
{
for(const toml::table &table : arr)
@@ -948,8 +939,8 @@ void readTOMLConf(toml::value &root)
string_array default_url, insert_url;
find_if_exist(section_common, "default_url", default_url, "insert_url", insert_url);
gDefaultUrls = join(default_url);
gInsertUrls = join(insert_url);
gDefaultUrls = join(default_url, "|");
gInsertUrls = join(insert_url, "|");
bool filter = false;
find_if_exist(section_common,