aboutsummaryrefslogtreecommitdiff
path: root/src/QuickMedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/QuickMedia.cpp')
-rw-r--r--src/QuickMedia.cpp56
1 files changed, 21 insertions, 35 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp
index e8fee28..494e03d 100644
--- a/src/QuickMedia.cpp
+++ b/src/QuickMedia.cpp
@@ -52,6 +52,7 @@
#include <limits.h>
#include <sys/stat.h>
#include <cmath>
+#include <random>
#include <mglpp/graphics/Rectangle.hpp>
#include <mglpp/graphics/Sprite.hpp>
@@ -227,9 +228,6 @@ static void set_window_icon(Display *display, Window window, const std::string &
}
namespace QuickMedia {
- static Json::Value load_recommended_json(const char *plugin_name);
- static void fill_recommended_items_from_json(const char *plugin_name, const Json::Value &recommended_json, BodyItems &body_items);
-
enum class HistoryType {
YOUTUBE,
MANGA
@@ -266,28 +264,6 @@ namespace QuickMedia {
bool local_thumbnail;
};
- class RecommendedPage : public LazyFetchPage {
- public:
- RecommendedPage(Program *program, Page *search_page, const char *plugin_name) :
- LazyFetchPage(program), search_page(search_page), plugin_name(plugin_name) {}
-
- const char* get_title() const override { return "Recommended"; }
-
- PluginResult submit(const SubmitArgs &args, std::vector<Tab> &result_tabs) override {
- return search_page->submit(args, result_tabs);
- }
-
- PluginResult lazy_fetch(BodyItems &result_items) override {
- fill_recommended_items_from_json(plugin_name, load_recommended_json(plugin_name), result_items);
- return PluginResult::OK;
- }
-
- bool reload_on_page_change() override { return true; }
- private:
- Page *search_page;
- const char *plugin_name;
- };
-
using OptionsPageHandler = std::function<void()>;
class OptionsPage : public Page {
@@ -1275,10 +1251,7 @@ namespace QuickMedia {
if(youtube_url.empty()) {
start_tab_index = 1;
tabs.push_back(Tab{create_body(false, true), std::make_unique<YoutubeSubscriptionsPage>(this), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
- tabs.push_back(Tab{create_body(false, false), std::make_unique<YoutubeSearchPage>(this), create_search_bar("Search...", 100)});
-
- auto recommended_page = std::make_unique<RecommendedPage>(this, tabs.back().page.get(), plugin_name);
- tabs.push_back(Tab{create_body(false, true), std::move(recommended_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
+ tabs.push_back(Tab{create_body(false, true), std::make_unique<YoutubeSearchPage>(this), create_search_bar("Search...", 100)});
auto history_body = create_body(false, true);
auto history_page = std::make_unique<HistoryPage>(this, tabs.front().page.get(), HistoryType::YOUTUBE);
@@ -1475,7 +1448,7 @@ namespace QuickMedia {
return video_history_filepath.join(plugin_name).append(".json");
}
- Json::Value load_recommended_json(const char *plugin_name) {
+ Json::Value Program::load_recommended_json(const char *plugin_name) {
Path recommended_filepath = get_recommended_filepath(plugin_name);
Json::Value json_result;
if(!read_file_as_json(recommended_filepath, json_result) || !json_result.isObject())
@@ -1483,7 +1456,7 @@ namespace QuickMedia {
return json_result;
}
- void fill_recommended_items_from_json(const char *plugin_name, const Json::Value &recommended_json, BodyItems &body_items) {
+ void Program::fill_recommended_items_from_json(const char *plugin_name, const Json::Value &recommended_json, BodyItems &body_items) {
assert(recommended_json.isObject());
const int64_t recommendations_autodelete_period = 60*60*24*20; // 20 days
@@ -1574,10 +1547,11 @@ namespace QuickMedia {
break;
}
- std::random_shuffle(body_items.begin(), body_items.end());
+ const auto seed = std::chrono::system_clock::now().time_since_epoch().count();
+ std::shuffle(body_items.begin(), body_items.end(), std::default_random_engine(seed));
}
- static void save_recommendations_from_related_videos(const char *plugin_name, const std::string &video_url, const std::string &video_title, const BodyItems &related_media_body_items) {
+ void Program::save_recommendations_from_related_videos(const char *plugin_name, const std::string &video_url, const std::string &video_title, const BodyItems &related_media_body_items) {
std::string video_id;
if(!youtube_url_extract_id(video_url, video_id)) {
std::string err_msg = "Failed to extract id of youtube url ";
@@ -2044,6 +2018,7 @@ namespace QuickMedia {
if(tab.body->attach_side == AttachSide::BOTTOM)
tab.body->select_last_item();
tab.page->on_navigate_to_page(tab.body.get());
+
}
Tabs ui_tabs(&rounded_rectangle_shader);
@@ -2063,6 +2038,7 @@ namespace QuickMedia {
for(size_t i = 0; i < tabs.size(); ++i) {
TabAssociatedData data;
data.search_result_text = mgl::Text("", *FontLoader::get_font(FontLoader::FontType::LATIN, 30 * get_config().scale * get_config().font_scale));
+ data.card_view = tabs[i].body ? tabs[i].body->card_view : false;
tab_associated_data.push_back(std::move(data));
}
@@ -2103,7 +2079,7 @@ namespace QuickMedia {
tab_associated_data[selected_tab].search_text_updated = false;
}
- auto plugin_submit_handler = [&tabs, selected_tab, &selected_item, &search_text, &new_tabs, &new_body_items, search_suggestion_submitted]() {
+ auto plugin_submit_handler = [&]() {
SubmitArgs submit_args;
submit_args.title = selected_item ? selected_item->get_title() : search_text;
submit_args.url = selected_item ? selected_item->url : search_text;
@@ -2112,6 +2088,7 @@ namespace QuickMedia {
submit_args.extra = selected_item ? selected_item->extra : nullptr;
if(tabs[selected_tab].page->search_is_suggestion() && !search_suggestion_submitted) {
+ tabs[selected_tab].body->card_view = tab_associated_data[selected_tab].card_view;
PluginResult plugin_result = tabs[selected_tab].page->submit_suggestion(submit_args, new_body_items);
return plugin_result == PluginResult::OK;
} else {
@@ -2176,7 +2153,8 @@ namespace QuickMedia {
for(size_t i = 0; i < tabs.size(); ++i) {
tabs[i].body->clear_cache();
- if(tabs[i].page->is_lazy_fetch_page() && static_cast<LazyFetchPage*>(tabs[i].page.get())->reload_on_page_change()) {
+ const bool lazy_update = tabs[i].page->search_is_filter() || (tabs[i].search_bar && tabs[i].search_bar->get_text().empty());
+ if(tabs[i].page->is_lazy_fetch_page() && static_cast<LazyFetchPage*>(tabs[i].page.get())->reload_on_page_change() && lazy_update) {
tab_associated_data[i].lazy_fetch_finished = false;
tab_associated_data[i].fetched_page = 0;
const BodyItem *selected_item = tabs[i].body->get_selected();
@@ -2636,6 +2614,14 @@ namespace QuickMedia {
std::string update_search_text = associated_data.update_search_text;
if(!tabs[i].page->search_is_suggestion() || associated_data.search_suggestion_submitted)
tabs[i].body->clear_items();
+
+ if(tabs[i].page->search_is_suggestion() && tabs[i].body) {
+ if(update_search_text.empty())
+ tabs[i].body->card_view = tab_associated_data[selected_tab].card_view;
+ else
+ tabs[i].body->card_view = false;
+ }
+
associated_data.search_text_updated = false;
associated_data.fetch_status = FetchStatus::LOADING;
associated_data.fetch_type = FetchType::SEARCH;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 00:43:20 +0000