ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11195 from jdgleaver/core-updater-search 

Enhanced core downloader search functionality
This commit is contained in:
Autechre 2020-08-14 19:48:16 +02:00 committed by GitHub
parent 37be80b847 6d8f3cb182
commit 7cf6d1a1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 118 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
menu/cbs/menu_cbs_cancel.c
View File

@ -35,7 +35,6 @@ int action_cancel_pop_default(const char *path,
size_t new_selection_ptr; size_t new_selection_ptr;
const char *menu_label = NULL; const char *menu_label = NULL;
unsigned menu_type = MENU_SETTINGS_NONE; unsigned menu_type = MENU_SETTINGS_NONE;
bool menu_has_label = false;
struct string_list *menu_search_terms = menu_driver_search_get_terms(); struct string_list *menu_search_terms = menu_driver_search_get_terms();
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -47,47 +46,29 @@ int action_cancel_pop_default(const char *path,
#endif #endif
menu_entries_get_last_stack(NULL, &menu_label, &menu_type, NULL, NULL); menu_entries_get_last_stack(NULL, &menu_label, &menu_type, NULL, NULL);
menu_has_label = !string_is_empty(menu_label);
/* Check whether search terms have been set */ /* Check whether search terms have been set
if (menu_search_terms) * > If so, check whether this is a menu list
* with 'search filter' support
* > If so, remove the last search term */
if (menu_search_terms &&
menu_driver_search_filter_enabled(menu_label, menu_type) &&
menu_driver_search_pop())
{ {
bool is_playlist = false; bool refresh = false;
/* Check whether this is a playlist */ /* Reset navigation pointer */
is_playlist = (menu_type == MENU_SETTING_HORIZONTAL_MENU) || menu_navigation_set_selection(0);
(menu_type == MENU_HISTORY_TAB) || menu_driver_navigation_set(false);
(menu_type == MENU_FAVORITES_TAB) ||
(menu_type == MENU_IMAGES_TAB) ||
(menu_type == MENU_MUSIC_TAB) ||
(menu_type == MENU_VIDEO_TAB) ||
(menu_type == FILE_TYPE_PLAYLIST_COLLECTION);
if (!is_playlist && menu_has_label) /* Refresh menu */
is_playlist = string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY)) || menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST)) || menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST)) ||
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST)) ||
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST));
/* Remove last search term */ return 0;
if (is_playlist && menu_driver_search_pop())
{
bool refresh = false;
/* Reset navigation pointer */
menu_navigation_set_selection(0);
menu_driver_navigation_set(false);
/* Refresh menu */
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
return 0;
}
} }
if (menu_has_label) if (!string_is_empty(menu_label))
{ {
if ( if (
string_is_equal(menu_label, string_is_equal(menu_label,
@ -127,7 +108,29 @@ static int action_cancel_core_content(const char *path,
menu_entries_get_last_stack(NULL, &menu_label, NULL, NULL, NULL); menu_entries_get_last_stack(NULL, &menu_label, NULL, NULL, NULL);
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST))) if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST)))
{
struct string_list *menu_search_terms = menu_driver_search_get_terms();
/* Check whether search terms have been set
* > If so, remove the last search term */
if (menu_search_terms &&
menu_driver_search_pop())
{
bool refresh = false;
/* Reset navigation pointer */
menu_navigation_set_selection(0);
menu_driver_navigation_set(false);
/* Refresh menu */
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
return 0;
}
menu_entries_flush_stack(msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER), 0); menu_entries_flush_stack(msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER), 0);
}
else if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST))) else if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST)))
menu_entries_flush_stack(msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER), 0); menu_entries_flush_stack(msg_hash_to_str(MENU_ENUM_LABEL_ONLINE_UPDATER), 0);
else if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS))) else if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS)))

22
menu/cbs/menu_cbs_title.c
View File

@ -74,20 +74,20 @@
return 1; \ return 1; \
} }
static void action_get_title_fill_playlist_default( static void action_get_title_fill_search_filter_default(
char *s, enum msg_hash_enums lbl, size_t len) char *s, enum msg_hash_enums lbl, size_t len)
{ {
/* Copy playlist name */ /* Copy label value */
strlcpy(s, msg_hash_to_str(lbl), len); strlcpy(s, msg_hash_to_str(lbl), len);
/* Add current search terms */ /* Add current search terms */
menu_driver_search_append_terms_string(s, len); menu_driver_search_append_terms_string(s, len);
} }
#define DEFAULT_TITLE_PLAYLIST_MACRO(func_name, lbl) \ #define DEFAULT_TITLE_SEARCH_FILTER_MACRO(func_name, lbl) \
static int (func_name)(const char *path, const char *label, unsigned menu_type, char *s, size_t len) \ static int (func_name)(const char *path, const char *label, unsigned menu_type, char *s, size_t len) \
{ \ { \
action_get_title_fill_playlist_default(s, lbl, len); \ action_get_title_fill_search_filter_default(s, lbl, len); \
return 0; \ return 0; \
} }
@ -506,7 +506,6 @@ DEFAULT_TITLE_MACRO(action_get_online_updater_list, MENU_ENUM_LABEL_
DEFAULT_TITLE_MACRO(action_get_netplay_list, MENU_ENUM_LABEL_VALUE_NETPLAY) DEFAULT_TITLE_MACRO(action_get_netplay_list, MENU_ENUM_LABEL_VALUE_NETPLAY)
DEFAULT_TITLE_MACRO(action_get_online_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST) DEFAULT_TITLE_MACRO(action_get_online_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST)
DEFAULT_TITLE_MACRO(action_get_online_pl_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_PL_THUMBNAILS_UPDATER_LIST) DEFAULT_TITLE_MACRO(action_get_online_pl_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_PL_THUMBNAILS_UPDATER_LIST)
DEFAULT_TITLE_MACRO(action_get_core_updater_list, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST)
DEFAULT_TITLE_MACRO(action_get_core_manager_list, MENU_ENUM_LABEL_VALUE_CORE_MANAGER_LIST) DEFAULT_TITLE_MACRO(action_get_core_manager_list, MENU_ENUM_LABEL_VALUE_CORE_MANAGER_LIST)
DEFAULT_TITLE_MACRO(action_get_add_content_list, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST) DEFAULT_TITLE_MACRO(action_get_add_content_list, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST)
DEFAULT_TITLE_MACRO(action_get_configurations_list, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST) DEFAULT_TITLE_MACRO(action_get_configurations_list, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST)
@ -671,11 +670,12 @@ DEFAULT_TITLE_MACRO(action_get_title_switch_gpu_profile, MENU_ENUM_LABE
DEFAULT_TITLE_MACRO(action_get_title_switch_backlight_control, MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL) DEFAULT_TITLE_MACRO(action_get_title_switch_backlight_control, MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL)
#endif #endif
DEFAULT_TITLE_PLAYLIST_MACRO(action_get_title_deferred_history_list, MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY) DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_history_list, MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY)
DEFAULT_TITLE_PLAYLIST_MACRO(action_get_title_deferred_favorites_list, MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES) DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_favorites_list, MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES)
DEFAULT_TITLE_PLAYLIST_MACRO(action_get_title_deferred_images_list, MENU_ENUM_LABEL_VALUE_GOTO_IMAGES) DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_images_list, MENU_ENUM_LABEL_VALUE_GOTO_IMAGES)
DEFAULT_TITLE_PLAYLIST_MACRO(action_get_title_deferred_music_list, MENU_ENUM_LABEL_VALUE_GOTO_MUSIC) DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_music_list, MENU_ENUM_LABEL_VALUE_GOTO_MUSIC)
DEFAULT_TITLE_PLAYLIST_MACRO(action_get_title_deferred_video_list, MENU_ENUM_LABEL_VALUE_GOTO_VIDEO) DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_title_deferred_video_list, MENU_ENUM_LABEL_VALUE_GOTO_VIDEO)
DEFAULT_TITLE_SEARCH_FILTER_MACRO(action_get_core_updater_list, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST)
static int action_get_title_generic(char *s, size_t len, const char *path, static int action_get_title_generic(char *s, size_t len, const char *path,
const char *text) const char *text)
@ -780,7 +780,7 @@ static int action_get_title_group_settings(const char *path, const char *label,
if (string_is_equal(label, msg_hash_to_str(info_list[i].type))) if (string_is_equal(label, msg_hash_to_str(info_list[i].type)))
{ {
if (info_list[i].is_playlist_tab) if (info_list[i].is_playlist_tab)
action_get_title_fill_playlist_default( action_get_title_fill_search_filter_default(
s, info_list[i].val, len); s, info_list[i].val, len);
else else
strlcpy(s, msg_hash_to_str(info_list[i].val), len); strlcpy(s, msg_hash_to_str(info_list[i].val), len);

8
menu/drivers/materialui.c
View File

@ -5124,7 +5124,7 @@ static void materialui_render_header(
int sys_bar_text_y = (int)(((float)mui->sys_bar_height / 2.0f) + (float)mui->font_data.hint.line_centre_offset); int sys_bar_text_y = (int)(((float)mui->sys_bar_height / 2.0f) + (float)mui->font_data.hint.line_centre_offset);
int title_x = 0; int title_x = 0;
bool show_back_icon = menu_entries_ctl(MENU_ENTRIES_CTL_SHOW_BACK, NULL); bool show_back_icon = menu_entries_ctl(MENU_ENTRIES_CTL_SHOW_BACK, NULL);
bool show_search_icon = mui->is_playlist || mui->is_file_list; bool show_search_icon = mui->is_playlist || mui->is_file_list || mui->is_core_updater_list;
bool show_switch_view_icon = mui->is_playlist && mui->primary_thumbnail_available; bool show_switch_view_icon = mui->is_playlist && mui->primary_thumbnail_available;
bool use_landscape_layout = !mui->is_portrait && bool use_landscape_layout = !mui->is_portrait &&
(mui->last_landscape_layout_optimization != MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION_DISABLED); (mui->last_landscape_layout_optimization != MATERIALUI_LANDSCAPE_LAYOUT_OPTIMIZATION_DISABLED);
@ -9197,9 +9197,9 @@ static int materialui_pointer_up(void *userdata,
/* Tap/press header: Menu back/cancel, or search/switch view */ /* Tap/press header: Menu back/cancel, or search/switch view */
else if (y < header_height) else if (y < header_height)
{ {
/* If this is a playlist or file list, enable /* If this is a playlist, file list or core
* search functionality */ * updater list, enable search functionality */
if (mui->is_playlist || mui->is_file_list) if (mui->is_playlist || mui->is_file_list || mui->is_core_updater_list)
{ {
bool switch_view_enabled = bool switch_view_enabled =
mui->is_playlist && mui->primary_thumbnail_available; mui->is_playlist && mui->primary_thumbnail_available;

35
menu/menu_displaylist.c
View File

@ -9966,9 +9966,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
{ {
core_updater_list_t *core_list = core_updater_list_get_cached(); core_updater_list_t *core_list = core_updater_list_get_cached();
settings_t *settings = config_get_ptr(); struct string_list *search_terms = menu_driver_search_get_terms();
bool show_experimental_cores = settings->bools.network_buildbot_show_experimental_cores; settings_t *settings = config_get_ptr();
bool show_experimental_cores = settings->bools.network_buildbot_show_experimental_cores;
size_t selection = menu_navigation_get_selection();
if (core_list) if (core_list)
{ {
@ -9990,6 +9992,30 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
!path_is_valid(entry->local_core_path))) !path_is_valid(entry->local_core_path)))
continue; continue;
/* If a search is active, skip non-matching
* entries */
if (search_terms)
{
bool entry_valid = true;
size_t j;
for (j = 0; j < search_terms->size; j++)
{
const char *search_term = search_terms->elems[j].data;
if (!string_is_empty(search_term) &&
!string_is_empty(entry->display_name) &&
!strcasestr(entry->display_name, search_term))
{
entry_valid = false;
break;
}
}
if (!entry_valid)
continue;
}
if (menu_entries_append_enum(info->list, if (menu_entries_append_enum(info->list,
entry->remote_filename, entry->remote_filename,
"", "",
@ -10005,6 +10031,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
} }
} }
} }
if (selection >= count)
info->need_clear = true;
} }
#endif #endif
if (count == 0) if (count == 0)

3
menu/menu_driver.h
View File

@ -487,6 +487,9 @@ void menu_explore_context_deinit(void);
void menu_explore_free(void); void menu_explore_free(void);
#endif #endif
/* Returns true if search filter is enabled
* for the specified menu list */
bool menu_driver_search_filter_enabled(const char *label, unsigned type);
bool menu_driver_search_push(const char *search_term); bool menu_driver_search_push(const char *search_term);
bool menu_driver_search_pop(void); bool menu_driver_search_pop(void);
void menu_driver_search_clear(void); void menu_driver_search_clear(void);

48
retroarch.c
View File

@ -7271,6 +7271,33 @@ static void menu_driver_list_free(
} }
} }
/* Returns true if search filter is enabled
* for the specified menu list */
bool menu_driver_search_filter_enabled(const char *label, unsigned type)
{
bool filter_enabled = false;
/* > Check for playlists */
filter_enabled = (type == MENU_SETTING_HORIZONTAL_MENU) ||
(type == MENU_HISTORY_TAB) ||
(type == MENU_FAVORITES_TAB) ||
(type == MENU_IMAGES_TAB) ||
(type == MENU_MUSIC_TAB) ||
(type == MENU_VIDEO_TAB) ||
(type == FILE_TYPE_PLAYLIST_COLLECTION);
if (!filter_enabled && !string_is_empty(label))
filter_enabled = string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST)) ||
/* > Check for core updater */
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST));
return filter_enabled;
}
bool menu_driver_search_push(const char *search_term) bool menu_driver_search_push(const char *search_term)
{ {
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
@ -12021,33 +12048,18 @@ static void menu_input_search_cb(void *userdata, const char *str)
{ {
const char *label = NULL; const char *label = NULL;
unsigned type = MENU_SETTINGS_NONE; unsigned type = MENU_SETTINGS_NONE;
bool is_playlist = false;
if (string_is_empty(str)) if (string_is_empty(str))
goto end; goto end;
/* Determine whether we are currently /* Determine whether we are currently
* viewing a playlist */ * viewing a menu list with 'search
* filter' support */
menu_entries_get_last_stack(NULL, menu_entries_get_last_stack(NULL,
&label, &type, &label, &type,
NULL, NULL); NULL, NULL);
is_playlist = (type == MENU_SETTING_HORIZONTAL_MENU) || if (menu_driver_search_filter_enabled(label, type))
(type == MENU_HISTORY_TAB) ||
(type == MENU_FAVORITES_TAB) ||
(type == MENU_IMAGES_TAB) ||
(type == MENU_MUSIC_TAB) ||
(type == MENU_VIDEO_TAB) ||
(type == FILE_TYPE_PLAYLIST_COLLECTION);
if (!is_playlist && !string_is_empty(label))
is_playlist = string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST)) ||
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST));
if (is_playlist)
{ {
/* Add search term */ /* Add search term */
if (menu_driver_search_push(str)) if (menu_driver_search_push(str))