Skip to content

Commit 9f014b6

Browse files
committed
menu_displaylist: display releasemonth as a string rather than int
1 parent 264670e commit 9f014b6

1 file changed

Lines changed: 33 additions & 14 deletions

File tree

menu/menu_displaylist.c

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static int filebrowser_parse(
380380
for (j = 0; j < search_terms->size; j++)
381381
{
382382
const char *search_term = search_terms->terms[j];
383-
if (search_term && *search_term
383+
if (search_term && *search_term
384384
&& !strcasestr(file_path, search_term))
385385
{
386386
skip_entry = true;
@@ -416,7 +416,7 @@ static int filebrowser_parse(
416416
? FILE_TYPE_VIDEO_FONT
417417
: (enum msg_file_type)type_default;
418418

419-
if ( type == DISPLAYLIST_CORES_DETECTED
419+
if ( type == DISPLAYLIST_CORES_DETECTED
420420
&& path_is_compressed_file(file_path))
421421
file_type = FILE_TYPE_CARCHIVE;
422422
break;
@@ -2803,6 +2803,17 @@ static int create_string_list_rdb_entry_int(
28032803
return 0;
28042804
}
28052805

2806+
static char* month_str_to_uint(unsigned month)
2807+
{
2808+
char *months[12] = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
2809+
if (month < 1 || month > 12)
2810+
{
2811+
RARCH_WARN("Found invalid month number in database entry, got %d\n", month);
2812+
return NULL;
2813+
}
2814+
return months[month];
2815+
}
2816+
28062817
static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
28072818
menu_displaylist_info_t *info,
28082819
bool show_advanced_settings,
@@ -3060,8 +3071,16 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
30603071
RDB_ENTRY_INT(edge_magazine_issue, MENU_ENUM_LABEL_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
30613072
MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_ISSUE)
30623073

3063-
RDB_ENTRY_INT(releasemonth, MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_MONTH,
3064-
MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH)
3074+
if (db_info_entry->releasemonth)
3075+
{
3076+
if (create_string_list_rdb_entry_string(
3077+
MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_MONTH,
3078+
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH),
3079+
msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_MONTH),
3080+
month_str_to_uint(db_info_entry->releasemonth), info->path, info->list) == -1)
3081+
goto error;
3082+
}
3083+
30653084
RDB_ENTRY_INT(releaseyear, MENU_ENUM_LABEL_RDB_ENTRY_RELEASE_YEAR,
30663085
MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR)
30673086

@@ -3961,17 +3980,17 @@ static int menu_displaylist_parse_horizontal_content_actions(
39613980
|| string_ends_with_size(menu_st->thumbnail_path_data->system, "_history",
39623981
menu_st->thumbnail_path_data->system_len, STRLEN_CONST("_history"));
39633982

3964-
/* An annoyance: if the user navigates to the
3965-
* information menu, then to the database entry,
3983+
/* An annoyance: if the user navigates to the
3984+
* information menu, then to the database entry,
39663985
* the thumbnail system will be changed.
3967-
* This breaks the above 'remove_entry_enabled'
3968-
* check for the history and favorites playlists.
3969-
* We therefore have to check the playlist file
3986+
* This breaks the above 'remove_entry_enabled'
3987+
* check for the history and favorites playlists.
3988+
* We therefore have to check the playlist file
39703989
* name as well... */
39713990
if ( !remove_entry_enabled
39723991
&& settings->bools.quick_menu_show_information
39733992
&& (playlist_file && *playlist_file))
3974-
remove_entry_enabled =
3993+
remove_entry_enabled =
39753994
string_is_equal(playlist_file, FILE_PATH_CONTENT_HISTORY)
39763995
|| string_is_equal(playlist_file, FILE_PATH_CONTENT_FAVORITES);
39773996
}
@@ -5112,7 +5131,7 @@ static unsigned menu_displaylist_parse_content_information(
51125131

51135132
if (core_info_find(core_path, &core_info))
51145133
{
5115-
core_supports_no_game = (core_info->flags
5134+
core_supports_no_game = (core_info->flags
51165135
& CORE_INFO_FLAG_SUPPORTS_NO_GAME);
51175136
if (core_info->display_name && *core_info->display_name)
51185137
strlcpy(core_name, core_info->display_name, sizeof(core_name));
@@ -9768,8 +9787,8 @@ unsigned menu_displaylist_build_list(
97689787
build_list[i].checked = (gfx_widgets && !cheevos_autopad);
97699788
break;
97709789
case MENU_ENUM_LABEL_CHEEVOS_APPEARANCE_PADDING_H:
9771-
build_list[i].checked = ((gfx_widgets && !cheevos_autopad) &&
9772-
!(cheevos_anchor == CHEEVOS_APPEARANCE_ANCHOR_TOPCENTER ||
9790+
build_list[i].checked = ((gfx_widgets && !cheevos_autopad) &&
9791+
!(cheevos_anchor == CHEEVOS_APPEARANCE_ANCHOR_TOPCENTER ||
97739792
cheevos_anchor == CHEEVOS_APPEARANCE_ANCHOR_BOTTOMCENTER));
97749793
break;
97759794
default:
@@ -15492,7 +15511,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1549215511
if (settings->bools.menu_show_load_core)
1549315512
{
1549415513
#ifdef HAVE_DYNAMIC
15495-
if ( sys_info->info.library_name
15514+
if ( sys_info->info.library_name
1549615515
&& *sys_info->info.library_name)
1549715516
{
1549815517
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list,

0 commit comments

Comments
 (0)