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

File extension list generation rewrite 

Only limit extensions under the condition that the valid_extensions list
is not empty and the user wishes to limit the extensions. Otherwise
present files of all recognized extensions.

Part of this logic was implemented in 8f32801292 where the
point was to show supported files when core info file is missing. The
other part is the filter_by_current_core option.
This commit is contained in:
pstef 2025-03-22 16:48:36 +00:00
parent 5adaaf7851
commit d14801d65b
1 changed files with 51 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
menu/cbs/menu_cbs_deferred_push.c
View File

@ -418,11 +418,26 @@ GENERIC_DEFERRED_CURSOR_MANAGER(deferred_push_cursor_manager_list_deferred_query
GENERIC_DEFERRED_CURSOR_MANAGER(deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear, DATABASE_QUERY_ENTRY_RELEASEDATE_YEAR)
#endif
#define CHECK_SIZE(desired_size) \
do { \
char *reallocated; \
size_t dsize = (desired_size); \
if (_len + dsize < size) \
break; \
reallocated = realloc(newstr2, size += dsize * 2); \
if (!reallocated) { \
free(newstr2); \
return -1; \
} \
newstr2 = reallocated; \
} while (0);
static int general_push(menu_displaylist_info_t *info,
unsigned id, enum menu_displaylist_ctl_state state)
{
char *newstr2;
size_t _len = 0, size;
size_t _len = 0;
size_t size = PATH_MAX_LENGTH;
char *newstr2 = malloc(size);
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_state_get_ptr()->driver_data;
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV) || defined (HAVE_AUDIOMIXER)
@ -433,7 +448,7 @@ static int general_push(menu_displaylist_info_t *info,
bool multimedia_builtin_imageviewer_enable = settings->bools.multimedia_builtin_imageviewer_enable;
#endif
if (!menu)
if (!menu || !newstr2)
return -1;
if ( (id == PUSH_ARCHIVE_OPEN_DETECT_CORE)
@ -468,9 +483,8 @@ static int general_push(menu_displaylist_info_t *info,
info->type_default = FILE_TYPE_PLAIN;
if (id != PUSH_DETECT_CORE_LIST)
info->setting = menu_setting_find_enum(info->enum_idx);
if (!(newstr2 = malloc(size = PATH_MAX_LENGTH)))
return -1;
newstr2[0] = '\0';
newstr2[0] = '\0';
switch (id)
{
@ -479,8 +493,10 @@ static int general_push(menu_displaylist_info_t *info,
struct retro_system_info *sysinfo =
&runloop_state_get_ptr()->system.info;
if (sysinfo && !string_is_empty(sysinfo->valid_extensions))
_len += strlcpy(newstr2 + _len, sysinfo->valid_extensions,
size - _len);
{
CHECK_SIZE(strlen(sysinfo->valid_extensions));
_len += strlcpy(newstr2 + _len, sysinfo->valid_extensions, size - _len);
}
}
break;
case PUSH_DEFAULT:
@ -499,17 +515,10 @@ static int general_push(menu_displaylist_info_t *info,
if (!string_is_empty(valid_extensions))
{
CHECK_SIZE(strlen(valid_extensions) + 12);
_len += strlcpy(newstr2 + _len, valid_extensions, size - _len);
#ifdef HAVE_IBXM
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "s3m", size - _len);
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "mod", size - _len);
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "xm", size - _len);
_len += strlcpy(newstr2 + _len, "|s3m|mod|xm", size - _len);
#endif
}
}
@ -521,100 +530,40 @@ static int general_push(menu_displaylist_info_t *info,
&runloop_state_get_ptr()->system.info;
bool filter_by_current_core = settings->bools.filter_by_current_core;
if (sysinfo && !string_is_empty(sysinfo->valid_extensions))
_len += strlcpy(newstr2 + _len,
sysinfo->valid_extensions,
size - _len);
if (!filter_by_current_core)
if (sysinfo && !string_is_empty(sysinfo->valid_extensions)
&& filter_by_current_core)
{
CHECK_SIZE(strlen(sysinfo->valid_extensions));
_len += strlcpy(newstr2 + _len, sysinfo->valid_extensions, size - _len);
}
else
{
core_info_list_t *list = NULL;
core_info_get_list(&list);
if (list && !string_is_empty(list->all_ext))
{
char *tok, *save = NULL;
char *all_ext_cpy = strdup(list->all_ext);
/* If the current core already supports
* this extension, skip adding it */
for ( tok = strtok_r(all_ext_cpy, "|", &save); tok;
tok = strtok_r(NULL, "|", &save))
{
bool exists = false;
if (!string_is_empty(newstr2))
{
char *tok2, *save2 = NULL;
char *newstr2_cpy = strdup(newstr2);
for ( tok2 = strtok_r(newstr2_cpy, "|", &save2); tok2;
tok2 = strtok_r(NULL, "|", &save2))
{
if (string_is_equal(tok, tok2))
{
exists = true;
break;
}
}
free(newstr2_cpy);
}
/* If extension wasn't found in string,
* add it */
if (!exists)
{
if (_len + strlen(tok) > size - 1 - 1) {
char *reallocated = realloc(newstr2, size += PATH_MAX_LENGTH);
if (!reallocated) {
free(newstr2);
return -1;
}
newstr2 = reallocated;
}
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|",
size - _len);
_len += strlcpy(newstr2 + _len, tok,
size - _len);
}
}
free(all_ext_cpy);
CHECK_SIZE(strlen(list->all_ext));
_len += strlcpy(newstr2 + _len, list->all_ext, size - _len);
}
}
#if defined(HAVE_AUDIOMIXER)
if (multimedia_builtin_mediaplayer_enable)
{
CHECK_SIZE(28);
#if defined(HAVE_DR_MP3)
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "mp3", size - _len);
_len += strlcpy(newstr2 + _len, "|mp3", size - _len);
#endif
#if defined(HAVE_STB_VORBIS)
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "ogg", size - _len);
_len += strlcpy(newstr2 + _len, "|ogg", size - _len);
#endif
#if defined(HAVE_DR_FLAC)
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "flac", size - _len);
_len += strlcpy(newstr2 + _len, "|flac", size - _len);
#endif
#if defined(HAVE_RWAV)
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "wav", size - _len);
_len += strlcpy(newstr2 + _len, "|wav", size - _len);
#endif
#ifdef HAVE_IBXM
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "s3m", size - _len);
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "mod", size - _len);
_len += strlcpy(newstr2 + _len, "|", size - _len);
_len += strlcpy(newstr2 + _len, "xm", size - _len);
_len += strlcpy(newstr2 + _len, "|s3m|mod|xm", size - _len);
#endif
}
#endif
@ -631,11 +580,10 @@ static int general_push(menu_displaylist_info_t *info,
#elif defined(HAVE_MPV)
libretro_mpv_retro_get_system_info(&sysinfo);
#endif
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|",
size - _len);
_len += strlcpy(newstr2 + _len, sysinfo.valid_extensions,
size - _len);
CHECK_SIZE(strlen(sysinfo.valid_extensions) + 1);
if (_len > 0)
newstr2[_len++] = '|';
_len += strlcpy(newstr2 + _len, sysinfo.valid_extensions, size - _len);
}
#endif
@ -644,11 +592,10 @@ static int general_push(menu_displaylist_info_t *info,
{
struct retro_system_info sysinfo = {0};
libretro_imageviewer_retro_get_system_info(&sysinfo);
if (_len > 0 && newstr2[_len-1] != '\0')
_len += strlcpy(newstr2 + _len, "|",
size - _len);
_len += strlcpy(newstr2 + _len, sysinfo.valid_extensions,
size - _len);
CHECK_SIZE(strlen(sysinfo.valid_extensions) + 1);
if (_len > 0)
newstr2[_len++] = '|';
_len += strlcpy(newstr2 + _len, sysinfo.valid_extensions, size - _len);
}
#endif
@ -664,6 +611,8 @@ static int general_push(menu_displaylist_info_t *info,
return deferred_push_dlist(info, state, settings);
}
#undef CHECK_SIZE
GENERIC_DEFERRED_PUSH_GENERAL(deferred_push_detect_core_list, PUSH_DETECT_CORE_LIST, DISPLAYLIST_CORES_DETECTED)
GENERIC_DEFERRED_PUSH_GENERAL(deferred_archive_open_detect_core, PUSH_ARCHIVE_OPEN_DETECT_CORE, DISPLAYLIST_DEFAULT)
GENERIC_DEFERRED_PUSH_GENERAL(deferred_archive_open, PUSH_ARCHIVE_OPEN, DISPLAYLIST_DEFAULT)