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

Merge pull request #11172 from francescotintori/francesco/playlist_autofix

Browse Source 
Portable playlists: fixed first load initialization
This commit is contained in:
Autechre 2020-08-10 10:33:56 +02:00 committed by GitHub
commit 28447cfe0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
playlist.c
View File

@ -2724,62 +2724,65 @@ playlist_t *playlist_init(const playlist_config_t *config)
/* Try auto-fixing paths if enabled, and playlist /* Try auto-fixing paths if enabled, and playlist
* base content directory is different */ * base content directory is different */
if (playlist->config.autofix_paths && if (config->autofix_paths && !string_is_equal(playlist->base_content_directory, config->base_content_directory))
!string_is_empty(playlist->base_content_directory) &&
!string_is_equal(playlist->base_content_directory,
playlist->config.base_content_directory))
{ {
size_t i, j, len; if (!string_is_empty(playlist->base_content_directory))
char tmp_entry_path[PATH_MAX_LENGTH];
for (i = 0, len = RBUF_LEN(playlist->entries); i < len; i++)
{ {
struct playlist_entry *entry = &playlist->entries[i]; size_t playlist_base_content_directory_length = strlen(playlist->base_content_directory);
size_t new_base_content_directory_length = strlen(playlist->config.base_content_directory);
size_t i, j, len;
char tmp_entry_path[PATH_MAX_LENGTH];
if (!entry || string_is_empty(entry->path)) for (i = 0, len = RBUF_LEN(playlist->entries); i < len; i++)
continue; {
struct playlist_entry* entry = &playlist->entries[i];
/* Fix entry path */ if (!entry || string_is_empty(entry->path))
tmp_entry_path[0] = '\0'; continue;
path_replace_base_path_and_convert_to_local_file_system(
/* Fix entry path */
tmp_entry_path[0] = '\0';
path_replace_base_path_and_convert_to_local_file_system(
tmp_entry_path, entry->path, tmp_entry_path, entry->path,
playlist->base_content_directory, playlist->config.base_content_directory, playlist->base_content_directory, playlist->config.base_content_directory,
sizeof(tmp_entry_path)); sizeof(tmp_entry_path));
free(entry->path); free(entry->path);
entry->path = strdup(tmp_entry_path); entry->path = strdup(tmp_entry_path);
/* Fix subsystem roms paths*/ /* Fix subsystem roms paths*/
if (entry->subsystem_roms && (entry->subsystem_roms->size > 0)) if (entry->subsystem_roms && (entry->subsystem_roms->size > 0))
{
struct string_list* subsystem_roms_new_paths = string_list_new();
union string_list_elem_attr attributes = {0};
if (!subsystem_roms_new_paths)
goto error;
for (j = 0; j < entry->subsystem_roms->size; j++)
{ {
const char *subsystem_rom_path = entry->subsystem_roms->elems[j].data; struct string_list* subsystem_roms_new_paths = string_list_new();
union string_list_elem_attr attributes = { 0 };
if (string_is_empty(subsystem_rom_path)) if (!subsystem_roms_new_paths)
continue; goto error;
tmp_entry_path[0] = '\0'; for (j = 0; j < entry->subsystem_roms->size; j++)
path_replace_base_path_and_convert_to_local_file_system( {
const char* subsystem_rom_path = entry->subsystem_roms->elems[j].data;
if (string_is_empty(subsystem_rom_path))
continue;
tmp_entry_path[0] = '\0';
path_replace_base_path_and_convert_to_local_file_system(
tmp_entry_path, subsystem_rom_path, tmp_entry_path, subsystem_rom_path,
playlist->base_content_directory, playlist->config.base_content_directory, playlist->base_content_directory, playlist->config.base_content_directory,
sizeof(tmp_entry_path)); sizeof(tmp_entry_path));
string_list_append(subsystem_roms_new_paths, tmp_entry_path, attributes); string_list_append(subsystem_roms_new_paths, tmp_entry_path, attributes);
} }
string_list_free(entry->subsystem_roms); string_list_free(entry->subsystem_roms);
entry->subsystem_roms = subsystem_roms_new_paths; entry->subsystem_roms = subsystem_roms_new_paths;
}
} }
} }
/* Update playlist base content directory*/ /* Update playlist base content directory*/
free(playlist->base_content_directory); if (playlist->base_content_directory)
free(playlist->base_content_directory);
playlist->base_content_directory = strdup(playlist->config.base_content_directory); playlist->base_content_directory = strdup(playlist->config.base_content_directory);
/* Save playlist */ /* Save playlist */