From da89ec98fb34757f0c46dc8cb2dd87ae78d317ce Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 10 Oct 2020 10:43:50 +0200 Subject: Refactor: move download->json parsing to a one function --- src/plugins/Manganelo.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/plugins/Manganelo.cpp') diff --git a/src/plugins/Manganelo.cpp b/src/plugins/Manganelo.cpp index 5be64ca..52b9ebd 100644 --- a/src/plugins/Manganelo.cpp +++ b/src/plugins/Manganelo.cpp @@ -1,7 +1,6 @@ #include "../../plugins/Manganelo.hpp" #include "../../include/Notification.hpp" #include -#include namespace QuickMedia { struct BodyItemImageContext { @@ -77,21 +76,9 @@ namespace QuickMedia { search_term += url_param_encode(text); CommandArg data_arg = { "--data", std::move(search_term) }; - std::string server_response; - if(download_to_string(url, server_response, {data_arg}, use_tor) != DownloadResult::OK) - return SuggestionResult::NET_ERR; - - if(server_response.empty()) - return SuggestionResult::OK; - Json::Value json_root; - Json::CharReaderBuilder json_builder; - std::unique_ptr json_reader(json_builder.newCharReader()); - std::string json_errors; - if(!json_reader->parse(&server_response[0], &server_response[server_response.size()], &json_root, &json_errors)) { - fprintf(stderr, "Manganelo suggestions json error: %s\n", json_errors.c_str()); - return SuggestionResult::ERR; - } + DownloadResult result = download_json(json_root, url, {data_arg}, true); + if(result != DownloadResult::OK) return download_result_to_suggestion_result(result); if(json_root.isArray()) { for(const Json::Value &child : json_root) { -- cgit v1.2.3