Fix a bug when more than one import in a group, only the first one will be added.
Add more HTTP status code.
This commit is contained in:
Tindy X committed 2020-02-07 19:03:19 +08:00
1 parent 8998e646e7
commit 2a082fee37
1 file changed
+15 -4
+15 -4
View File
@@ -123,6 +123,7 @@ int importItems(string_array &target)
result.emplace_back(strLine); result.emplace_back(strLine);
itemCount++; itemCount++;
} }
ss.clear();
} }
target.swap(result); target.swap(result);
writeLog(0, "Imported " + std::to_string(itemCount) + " item(s)."); writeLog(0, "Imported " + std::to_string(itemCount) + " item(s).");
@@ -1230,7 +1231,10 @@ int main(int argc, char *argv[])
{ {
std::string token = getUrlArg(argument, "token"); std::string token = getUrlArg(argument, "token");
if(token != access_token) if(token != access_token)
return "Unauthorized\n"; {
*status_code = 403;
return "Forbidden\n";
}
} }
refreshRulesets(rulesets, ruleset_content_array); refreshRulesets(rulesets, ruleset_content_array);
generateBase(); generateBase();
@@ -1243,7 +1247,10 @@ int main(int argc, char *argv[])
{ {
std::string token = getUrlArg(argument, "token"); std::string token = getUrlArg(argument, "token");
if(token != access_token) if(token != access_token)
return "Unauthorized\n"; {
*status_code = 403;
return "Forbidden\n";
}
} }
readConf(); readConf();
generateBase(); generateBase();
@@ -1258,7 +1265,7 @@ int main(int argc, char *argv[])
if(token != access_token) if(token != access_token)
{ {
*status_code = 403; *status_code = 403;
return "Unauthorized\n"; return "Forbidden\n";
} }
} }
std::string type = getUrlArg(argument, "type"); std::string type = getUrlArg(argument, "type");
@@ -1267,7 +1274,11 @@ int main(int argc, char *argv[])
else if(type == "direct") else if(type == "direct")
fileWrite(pref_path, postdata, true); fileWrite(pref_path, postdata, true);
else else
return "Not implemented\n"; {
*status_code = 501;
return "Not Implemented\n";
}
readConf(); readConf();
if(!update_ruleset_on_request) if(!update_ruleset_on_request)
refreshRulesets(rulesets, ruleset_content_array); refreshRulesets(rulesets, ruleset_content_array);