diff options
Diffstat (limited to 'src/plugins/Mangadex.cpp')
-rw-r--r-- | src/plugins/Mangadex.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/Mangadex.cpp b/src/plugins/Mangadex.cpp index 3518d4a..b3c5e36 100644 --- a/src/plugins/Mangadex.cpp +++ b/src/plugins/Mangadex.cpp @@ -5,7 +5,6 @@ #include <json/reader.h> static const std::string mangadex_url = "https://mangadex.org"; -static const std::string useragent_str = "user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36"; namespace QuickMedia { static std::string title_url_extract_manga_id(const std::string &url) { @@ -35,12 +34,10 @@ namespace QuickMedia { }; SearchResult Mangadex::search(const std::string &url, BodyItems &result_items) { - CommandArg user_agent_arg = { "-H", useragent_str }; - std::string manga_id = title_url_extract_manga_id(url); std::string request_url = "https://mangadex.org/api/?id=" + manga_id + "&type=manga"; std::string server_response; - if(download_to_string(request_url, server_response, {std::move(user_agent_arg)}, use_tor) != DownloadResult::OK) + if(download_to_string(request_url, server_response, {}, use_tor, true) != DownloadResult::OK) return SearchResult::NET_ERR; if(server_response.empty()) @@ -170,10 +167,9 @@ namespace QuickMedia { std::string url = "https://mangadex.org/search?title="; url += url_param_encode(text); CommandArg cookie_arg = { "-H", "cookie: mangadex_rememberme_token=" + rememberme_token }; - CommandArg user_agent_arg = { "-H", useragent_str }; std::string website_data; - if(download_to_string(url, website_data, {std::move(cookie_arg), std::move(user_agent_arg)}, use_tor) != DownloadResult::OK) + if(download_to_string(url, website_data, {std::move(cookie_arg)}, use_tor, true) != DownloadResult::OK) return SuggestionResult::NET_ERR; QuickMediaHtmlSearch html_search; @@ -226,10 +222,9 @@ namespace QuickMedia { } bool Mangadex::save_mangadex_cookies(const std::string &url, const std::string &cookie_filepath) { - CommandArg user_agent_arg = { "-H", useragent_str }; CommandArg cookie_arg = { "-c", std::move(cookie_filepath) }; std::string server_response; - if(download_to_string(url, server_response, {std::move(user_agent_arg), std::move(cookie_arg)}, use_tor) != DownloadResult::OK) + if(download_to_string(url, server_response, {std::move(cookie_arg)}, use_tor, true) != DownloadResult::OK) return false; return true; @@ -248,12 +243,11 @@ namespace QuickMedia { if(!save_mangadex_cookies(url, cookie_filepath)) return ImageResult::ERR; - CommandArg user_agent_arg = { "-H", useragent_str }; CommandArg cookie_arg = { "-b", std::move(cookie_filepath) }; std::string manga_id = chapter_url_extract_manga_id(url); std::string request_url = mangadex_url + "/api/?id=" + manga_id + "&server=null&type=chapter"; std::string server_response; - if(download_to_string(request_url, server_response, {std::move(user_agent_arg), std::move(cookie_arg)}, use_tor) != DownloadResult::OK) + if(download_to_string(request_url, server_response, {std::move(cookie_arg)}, use_tor, true) != DownloadResult::OK) return ImageResult::NET_ERR; if(server_response.empty()) |