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

[netplay] simplify find content task

Browse Source
This commit is contained in:
radius 2019-01-14 20:17:53 -05:00
parent d3ae49b30b
commit 82836c5778
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tasks/task_netplay_find_content.c
View File

@ -188,7 +188,6 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
{ {
size_t i, j, k; size_t i, j, k;
char entry[PATH_MAX_LENGTH]; char entry[PATH_MAX_LENGTH];
char *filename_match = NULL;
bool have_crc = false; bool have_crc = false;
netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state; netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
@ -279,7 +278,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
task_set_data(task, state); task_set_data(task, state);
finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)); finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
string_list_free(state->lpl_list); string_list_free(state->lpl_list);
free(playlist); playlist_free(playlist);
return; return;
} }
@ -287,36 +286,26 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
/* See if the filename is a match. The response depends on whether or not we are doing a CRC /* See if the filename is a match. The response depends on whether or not we are doing a CRC
* search. * search.
*
* If we are doing a CRC search, we stow a copy of the filename match in filename_match, which
* we'll use as our match if the CRC search is exhausted without a match.
*
* Otherwise, on match we complete the task and mark it as successful immediately. * Otherwise, on match we complete the task and mark it as successful immediately.
*/ */
if(string_is_empty(filename_match) && if(!string_is_empty(entry) &&
!string_is_empty(entry) &&
string_is_equal(entry, state->content_path) && string_is_equal(entry, state->content_path) &&
strstr(state->core_extensions, path_get_extension(playlist_path))) strstr(state->core_extensions, path_get_extension(playlist_path)))
{ {
if(have_crc) RARCH_LOG("[lobby] filename match %s\n", playlist_path);
filename_match = strdup(playlist_path);
else
{
RARCH_LOG("[lobby] filename match %s\n", playlist_path);
strlcpy(state->content_path, playlist_path, sizeof(state->content_path)); strlcpy(state->content_path, playlist_path, sizeof(state->content_path));
state->found = true; state->found = true;
task_set_data(task, state); task_set_data(task, state);
finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)); finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
string_list_free(state->lpl_list); string_list_free(state->lpl_list);
free(playlist); playlist_free(playlist);
return; return;
}
} }
task_set_progress(task, (int)(j / playlist_size * 100.0)); task_set_progress(task, (int)(j / playlist_size * 100.0));
} }
free(playlist); playlist_free(playlist);
} }
} }
else else
@ -371,7 +360,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
} }
task_set_progress(task, (int)(j / playlist_size * 100.0)); task_set_progress(task, (int)(j / playlist_size * 100.0));
} }
free(playlist); playlist_free(playlist);
} }
} }
@ -396,19 +385,6 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
return; return;
} }
if(filename_match != NULL)
{
RARCH_LOG("[lobby] CRC match failed; falling back to filename match %s\n", filename_match);
strlcpy(state->content_path, filename_match, sizeof(state->content_path));
state->found = true;
task_set_data(task, state);
finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
string_list_free(state->lpl_list);
free(filename_match);
return;
}
/* end of the line. no matches at all. */ /* end of the line. no matches at all. */
string_list_free(state->lpl_list); string_list_free(state->lpl_list);
finish_task(task, "Failed to locate matching content by either CRC or filename."); finish_task(task, "Failed to locate matching content by either CRC or filename.");