mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10636 from jdgleaver/ozone-playlist-sorting

Browse Source 
(Ozone) Fix sidebar playlist sort order when 'Truncate Playlist Names' is enabled
This commit is contained in:
Autechre 2020-05-15 22:30:11 +02:00 committed by GitHub
commit b910e6230f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
menu/drivers/ozone/ozone_sidebar.c
View File

@ -716,9 +716,13 @@ void ozone_change_tab(ozone_handle_t *ozone,
void ozone_init_horizontal_list(ozone_handle_t *ozone)
{
menu_displaylist_info_t info;
settings_t *settings = config_get_ptr();
const char *dir_playlist = settings->paths.directory_playlist;
bool menu_content_show_playlists = settings->bools.menu_content_show_playlists;
size_t list_size;
size_t i;
settings_t *settings = config_get_ptr();
const char *dir_playlist = settings->paths.directory_playlist;
bool menu_content_show_playlists = settings->bools.menu_content_show_playlists;
bool ozone_truncate_playlist_name = settings->bools.ozone_truncate_playlist_name;
menu_displaylist_info_init(&info);
info.list = ozone->horizontal_list;
@ -736,6 +740,70 @@ void ozone_init_horizontal_list(ozone_handle_t *ozone)
}
menu_displaylist_info_free(&info);
/* Loop through list and set console names */
list_size = ozone_list_get_size(ozone, MENU_LIST_HORIZONTAL);
for (i = 0; i < list_size; i++)
{
const char *playlist_file = NULL;
char *console_name = NULL;
char playlist_file_noext[255];
playlist_file_noext[0] = '\0';
/* Get playlist file name */
file_list_get_at_offset(ozone->horizontal_list, i,
&playlist_file, NULL, NULL, NULL);
if (!playlist_file)
{
file_list_set_alt_at_offset(ozone->horizontal_list, i, NULL);
continue;
}
/* Remove extension */
fill_pathname_base_noext(playlist_file_noext,
playlist_file, sizeof(playlist_file_noext));
console_name = playlist_file_noext;
/* Truncate playlist names, if required
* > Format: "Vendor - Console"
Remove everything before the hyphen
and the subsequent space */
if (ozone_truncate_playlist_name)
{
bool hyphen_found = false;
for (;;)
{
/* Check for "- " */
if (*console_name == '\0')
break;
else if (*console_name == '-' && *(console_name + 1) == ' ')
{
hyphen_found = true;
break;
}
console_name++;
}
if (hyphen_found)
console_name += 2;
else
console_name = playlist_file_noext;
}
/* Assign console name to list */
file_list_set_alt_at_offset(ozone->horizontal_list, i, console_name);
}
/* If playlist names were truncated, re-sort list
* by console name */
if (ozone_truncate_playlist_name && (list_size > 0))
file_list_sort_on_alt(ozone->horizontal_list);
}
void ozone_refresh_horizontal_list(ozone_handle_t *ozone)
@ -762,17 +830,13 @@ void ozone_refresh_horizontal_list(ozone_handle_t *ozone)
void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
{
unsigned i;
const char *title;
char title_noext[255];
char *console_name = NULL;
settings_t *settings = config_get_ptr();
bool ozone_truncate_playlist_name = settings->bools.ozone_truncate_playlist_name;
size_t list_size = ozone_list_get_size(ozone, MENU_LIST_HORIZONTAL);
size_t list_size = ozone_list_get_size(ozone, MENU_LIST_HORIZONTAL);
for (i = 0; i < list_size; i++)
{
const char *path = NULL;
ozone_node_t *node = (ozone_node_t*)file_list_get_userdata_at_offset(ozone->horizontal_list, i);
const char *path = NULL;
const char *console_name = NULL;
ozone_node_t *node = (ozone_node_t*)file_list_get_userdata_at_offset(ozone->horizontal_list, i);
if (!node)
{
@ -868,45 +932,17 @@ void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
/* Console name */
menu_entries_get_at_offset(
ozone->horizontal_list,
i,
&title, NULL, NULL, NULL, NULL);
fill_pathname_base_noext(title_noext, title, sizeof(title_noext));
console_name = title_noext;
/* Format : "Vendor - Console"
Remove everything before the hyphen
and the subsequent space */
if (ozone_truncate_playlist_name)
{
bool hyphen_found = false;
for (;;)
{
/* Check for "- " */
if (*console_name == '-' && *(console_name + 1) == ' ')
{
hyphen_found = true;
break;
}
else if (*console_name == '\0')
break;
console_name++;
}
if (hyphen_found)
console_name += 2;
else
console_name = title_noext;
}
ozone->horizontal_list, i,
NULL, NULL, NULL, NULL, &console_name);
if (node->console_name)
free(node->console_name);
node->console_name = strdup(console_name);
/* Note: console_name will *always* be valid here,
* but provide a fallback to prevent NULL pointer
* dereferencing in case of unknown errors... */
node->console_name = strdup(
console_name ? console_name : path);
free(sysname);
free(texturepath);