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

Merge pull request #4794 from fr500/master

Browse Source 
Lobby improvements
This commit is contained in:
Twinaphex 2017-04-01 17:53:54 +02:00 committed by GitHub
commit fdae8f4c6d
1 changed files with 98 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
tasks/task_netplay_find_content.c
View File

@ -114,48 +114,116 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
!string_is_equal(state->content_path, "N/A")) !string_is_equal(state->content_path, "N/A"))
goto no_playlists; goto no_playlists;
/* Lobby reports content CRC, try to use CRC matching /* Core requires content */
content with no CRC uses 00000000 */ if (!string_is_equal(state->content_path, "N/A"))
if (!string_is_equal(state->content_crc, "00000000|crc"))
{ {
/* CRC matching */
RARCH_LOG("Using CRC matching\n"); if (!string_is_equal(state->content_crc, "00000000|crc"))
for (i = 0; i < state->lpl_list->size; i++)
{ {
playlist_t *playlist = NULL; RARCH_LOG("[lobby] testing CRC matching for: %s\n", state->content_crc);
const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION))) for (i = 0; i < state->lpl_list->size; i++)
continue;
playlist = playlist_init(lpl_path, 99999);
for (j = 0; j < playlist->size; j++)
{ {
if (string_is_equal(playlist->entries[j].crc32, state->content_crc) && playlist_t *playlist = NULL;
strstr(state->core_extensions, path_get_extension(playlist->entries[j].path))) const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
for (j = 0; j < playlist->size; j++)
{ {
RARCH_LOG("CRC Match %s\n", playlist->entries[j].crc32); #if 1
strlcpy(state->content_path, playlist->entries[j].path, sizeof(state->content_path)); RARCH_LOG("[lobby] playlist CRC: %s\n",
state->found = true; playlist->entries[j].crc32);
task_set_data(task, state); #endif
task_set_progress(task, 100); if (string_is_equal(playlist->entries[j].crc32, state->content_crc))
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND))); {
task_set_finished(task, true); RARCH_LOG("[lobby] CRC match %s\n", playlist->entries[j].crc32);
string_list_free(state->lpl_list); strlcpy(state->content_path, playlist->entries[j].path, sizeof(state->content_path));
free(playlist); state->found = true;
return; task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
string_list_free(state->lpl_list);
free(playlist);
return;
}
task_set_progress(task, (int)(j/playlist->size*100.0));
} }
task_set_progress(task, (int)(j/playlist->size*100.0)); free(playlist);
}
/* CRC matching failed, goto filename matching */
if (!state->found)
{
RARCH_LOG("[lobby] CRC matching for: %s failed\n", state->content_crc);
goto filename_matching;
}
}
/* filename matching*/
else
{
filename_matching:
RARCH_LOG("[lobby] testing filename matching for: %s\n", state->content_path);
for (i = 0; i < state->lpl_list->size; i++)
{
playlist_t *playlist = NULL;
const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
for (j = 0; j < playlist->size; j++)
{
char entry[PATH_MAX_LENGTH];
const char* buf = path_basename(playlist->entries[j].path);
entry[0] = '\0';
strlcpy(entry, buf, sizeof(entry));
path_remove_extension(entry);
#if 1
RARCH_LOG("[lobby] playlist filename: %s\n",
playlist->entries[j].path);
#endif
if ( !string_is_empty(entry) &&
string_is_equal(entry, state->content_path) &&
strstr(state->core_extensions, path_get_extension(playlist->entries[j].path)))
{
RARCH_LOG("[lobby] filename match %s\n", playlist->entries[j].path);
strlcpy(state->content_path, playlist->entries[j].path, sizeof(state->content_path));
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
string_list_free(state->lpl_list);
free(playlist);
return;
}
task_set_progress(task, (int)(j/playlist->size*100.0));
}
free(playlist);
} }
free(playlist); /* filename matching failed */
if (!state->found)
RARCH_LOG("[lobby] filename matching for: %s failed\n", state->content_path);
} }
} }
/* Lobby reports core doesn't need content */ /* Lobby reports core doesn't need content */
else if(string_is_equal(state->content_path, "N/A")) else
{ {
state->found = true; state->found = true;
task_set_data(task, state); task_set_data(task, state);
@ -164,55 +232,6 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
task_set_finished(task, true); task_set_finished(task, true);
return; return;
} }
/* Lobby reports that the core needs content but
the CRC wasn't reported */
else
{
RARCH_LOG("Using filename matching\n");
for (i = 0; i < state->lpl_list->size; i++)
{
playlist_t *playlist = NULL;
const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
for (j = 0; j < playlist->size; j++)
{
char entry[PATH_MAX_LENGTH];
const char* buf = path_basename(playlist->entries[j].path);
entry[0] = '\0';
strlcpy(entry, buf, sizeof(entry));
path_remove_extension(entry);
if ( !string_is_empty(entry) &&
string_is_equal(entry, state->content_path) &&
strstr(state->core_extensions, path_get_extension(playlist->entries[j].path)))
{
RARCH_LOG("Filename match %s\n", playlist->entries[j].path);
strlcpy(state->content_path, playlist->entries[j].path, sizeof(state->content_path));
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
task_set_finished(task, true);
string_list_free(state->lpl_list);
free(playlist);
return;
}
task_set_progress(task, (int)(j/playlist->size*100.0));
}
free(playlist);
}
}
no_playlists: no_playlists:
string_list_free(state->lpl_list); string_list_free(state->lpl_list);