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

Fix include/exclude_remarks not working in external configs

Browse Source
This commit is contained in:
Tindy X committed 2020-03-26 17:01:36 +08:00
1 parent 937c924314
commit 5b492a56a1
1 file changed
+1 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/interfaces.cpp
+1 -5
View File
@@ -936,7 +936,7 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
std::string dev_id = getUrlArg(argument, "dev_id"), filename = getUrlArg(argument, "filename"), interval_str = getUrlArg(argument, "interval"), strict_str = getUrlArg(argument, "strict");
std::string clash_new_field = getUrlArg(argument, "new_name");
std::string base_content, output_content;
string_array extra_group, extra_ruleset, include_remarks, exclude_remarks;
string_array extra_group, extra_ruleset, include_remarks = def_include_remarks, exclude_remarks = def_exclude_remarks;
std::string groups = urlsafe_base64_decode(getUrlArg(argument, "groups")), ruleset = urlsafe_base64_decode(getUrlArg(argument, "ruleset")), config = UrlDecode(getUrlArg(argument, "config"));
std::vector<ruleset_content> rca;
extra_settings ext;
@@ -1107,12 +1107,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
//check custom include/exclude settings
if(include.size() && regValid(include))
include_remarks.emplace_back(include);
else
include_remarks = def_include_remarks;
if(exclude.size() && regValid(exclude))
exclude_remarks.emplace_back(exclude);
else
exclude_remarks = def_exclude_remarks;
//start parsing urls
string_array stream_temp = safe_get_streams(), time_temp = safe_get_times();