diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/QuickMedia.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Fourchan.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/NyaaSi.cpp | 16 |
3 files changed, 20 insertions, 8 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 01a82c6..417d4ea 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -2313,7 +2313,7 @@ namespace QuickMedia { search_bar->onTextUpdateCallback = [this, &update_search_text](const std::string &text) { if(current_plugin->content_list_search_is_filter()) { body->filter_search_fuzzy(text); - body->clamp_selection(); + body->select_first_item(); } else { update_search_text = text; } @@ -2367,7 +2367,7 @@ namespace QuickMedia { if(search_running && search_future.valid() && search_future.wait_for(std::chrono::seconds(0)) == std::future_status::ready) { if(update_search_text.empty()) { body->items = search_future.get(); - body->clamp_selection(); + body->select_first_item(); } else { search_future.get(); } diff --git a/src/plugins/Fourchan.cpp b/src/plugins/Fourchan.cpp index 5932144..4f87049 100644 --- a/src/plugins/Fourchan.cpp +++ b/src/plugins/Fourchan.cpp @@ -205,12 +205,8 @@ namespace QuickMedia { static void extract_comment_pieces(const char *html_source, size_t size, CommentPieceCallback callback) { TidyDoc doc = tidyCreate(); - TidyIterator it_opt = tidyGetOptionList(doc); - while (it_opt) { - TidyOption opt = tidyGetNextOption(doc, &it_opt); - if (tidyOptGetType(opt) == TidyBoolean) - tidyOptSetBool(doc, tidyOptGetId(opt), no); - } + tidyOptSetBool(doc, TidyShowWarnings, no); + tidyOptSetBool(doc, TidyUseCustomTags, yes); tidyOptSetInt(doc, TidyWrapLen, 0); if(tidyParseString(doc, html_source) < 0) { CommentPiece comment_piece; diff --git a/src/plugins/NyaaSi.cpp b/src/plugins/NyaaSi.cpp index 18dd53a..0d43810 100644 --- a/src/plugins/NyaaSi.cpp +++ b/src/plugins/NyaaSi.cpp @@ -162,6 +162,7 @@ namespace QuickMedia { // torrent_item->url = "https://nyaa.si/download/" + id + ".torrent"; auto torrent_item = std::make_unique<BodyItem>("Download magnet"); std::string magnet_url; + std::string description; std::string website_data; if(download_to_string(url, website_data, {}, use_tor, true) != DownloadResult::OK) @@ -194,6 +195,21 @@ namespace QuickMedia { goto cleanup; } + result = quickmedia_html_find_nodes_xpath(&html_search, "//div[id='torrent-description']", + [](QuickMediaHtmlNode *node, void *userdata) { + std::string *description = (std::string*)userdata; + const char *text = quickmedia_html_node_get_text(node); + if(description->empty() && text) { + *description = strip(text); + } + }, &description); + + if(result != 0) + goto cleanup; + + if(!description.empty()) + result_items.front()->set_description("Description:\n" + description); + result = quickmedia_html_find_nodes_xpath(&html_search, "//div[class='container']//a", [](QuickMediaHtmlNode *node, void *userdata) { std::string *magnet_url = (std::string*)userdata; |