From 27eac1c56904a853e79d66e1cf4daac7d8f8ba6b Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 7 May 2021 03:34:05 +0200 Subject: Add ctrl+i reverse image search to 4chan, add saucenao to launcher --- src/plugins/FileManager.cpp | 2 ++ src/plugins/Mangadex.cpp | 6 ------ src/plugins/Matrix.cpp | 8 ++++++++ src/plugins/Saucenao.cpp | 12 +++++++++++- 4 files changed, 21 insertions(+), 7 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/FileManager.cpp b/src/plugins/FileManager.cpp index 47a8b57..52f9f4e 100644 --- a/src/plugins/FileManager.cpp +++ b/src/plugins/FileManager.cpp @@ -52,6 +52,8 @@ namespace QuickMedia { if(std::filesystem::is_regular_file(new_path)) { program->select_file(new_path); + if(selection_handler) + result_tabs = selection_handler(); return PluginResult::OK; } diff --git a/src/plugins/Mangadex.cpp b/src/plugins/Mangadex.cpp index 7332e21..f69484b 100644 --- a/src/plugins/Mangadex.cpp +++ b/src/plugins/Mangadex.cpp @@ -97,8 +97,6 @@ namespace QuickMedia { if(!attributes_json.isObject()) continue; - const Json::Value &description_json = attributes_json["description"]; - const Json::Value &title_json = attributes_json["title"]; if(!title_json.isObject()) continue; @@ -112,10 +110,6 @@ namespace QuickMedia { auto body_item = BodyItem::create(std::move(title)); body_item->url = id_json.asString(); - if(description_json.isString()) { - body_item->set_description(description_json.asString()); - body_item->set_description_color(sf::Color(179, 179, 179)); - } result_items.push_back(std::move(body_item)); } diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index 6f8b30b..2740a8a 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -1801,10 +1801,18 @@ namespace QuickMedia { case ',': case '@': case ':': + case ';': case '?': case '!': case '<': case '>': + case '{': + case '}': + case '[': + case ']': + case '\'': + case '"': + case '#': case '\0': return true; default: diff --git a/src/plugins/Saucenao.cpp b/src/plugins/Saucenao.cpp index 302f25e..1278bed 100644 --- a/src/plugins/Saucenao.cpp +++ b/src/plugins/Saucenao.cpp @@ -4,8 +4,18 @@ namespace QuickMedia { PluginResult SaucenaoPage::lazy_fetch(BodyItems &result_items) { + std::vector additional_args; + if(is_local) { + additional_args.push_back({ "-F", "file=@" + path }); + } else { + std::string url = path; + if(url[0] == '@') + url = "\\" + url; + additional_args.push_back({ "-F", "url=" + url }); + } + std::string website_data; - DownloadResult download_result = download_to_string("https://saucenao.com/search.php", website_data, {{ "-F", "file=@" + upload_filepath }}, true); + DownloadResult download_result = download_to_string("https://saucenao.com/search.php", website_data, std::move(additional_args), true); if(download_result != DownloadResult::OK) return download_result_to_plugin_result(download_result); QuickMediaHtmlSearch html_search; -- cgit v1.2.3