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

Revert "Merge pull request #8350 from huwpascoe/core_updater" 

This reverts commit 57c373e1d7, reversing
changes made to 0317b59da3.
This commit is contained in:
twinaphex 2019-06-14 02:08:14 +02:00
parent fa55047e2e
commit 92108aa35f
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
menu/menu_networking.c
View File

@ -41,45 +41,6 @@
#include "../tasks/task_file_transfer.h" #include "../tasks/task_file_transfer.h"
#include "../tasks/tasks_internal.h" #include "../tasks/tasks_internal.h"
void print_buf_lines_download_core(file_list_t *list, size_t offset, const char *path)
{
settings_t *settings;
core_info_ctx_find_t ci;
char display_name[255];
char core_path[PATH_MAX_LENGTH];
if (!(settings = config_get_ptr()))
return;
display_name[0] = '\0';
core_path[0] = '\0';
fill_pathname_join_noext(core_path,
settings->paths.directory_libretro, path, sizeof(core_path));
if (core_info_find(&ci, core_path))
{
strlcpy(display_name, "* ", sizeof(display_name));
strlcat(display_name, ci.inf->display_name, sizeof(display_name));
}
else
{
core_path[0] = '\0';
fill_pathname_join_noext(core_path,
settings->paths.path_libretro_info, path, sizeof(core_path));
path_remove_extension(core_path);
strlcat(core_path,
file_path_str(FILE_PATH_CORE_INFO_EXTENSION), sizeof(core_path));
if (path_is_valid(core_path))
core_info_get_display_name(core_path, display_name, sizeof(display_name));
}
if (strlen(display_name))
file_list_set_alt_at_offset(list, offset, display_name);
}
unsigned print_buf_lines(file_list_t *list, char *buf, unsigned print_buf_lines(file_list_t *list, char *buf,
const char *label, int buf_size, const char *label, int buf_size,
enum msg_file_type type, bool append, bool extended) enum msg_file_type type, bool append, bool extended)
@ -165,9 +126,44 @@ unsigned print_buf_lines(file_list_t *list, char *buf,
switch (type) switch (type)
{ {
case FILE_TYPE_DOWNLOAD_CORE: case FILE_TYPE_DOWNLOAD_CORE:
print_buf_lines_download_core(list, j, {
(extended && !string_is_empty(core_pathname)) ? settings_t *settings = config_get_ptr();
core_pathname : line_start);
if (settings)
{
char display_name[255];
char core_path[PATH_MAX_LENGTH];
char *last = NULL;
display_name[0] = core_path[0] = '\0';
fill_pathname_join_noext(
core_path,
settings->paths.path_libretro_info,
(extended && !string_is_empty(core_pathname))
? core_pathname : line_start,
sizeof(core_path));
path_remove_extension(core_path);
last = (char*)strrchr(core_path, '_');
if (!string_is_empty(last))
{
if (string_is_not_equal_fast(last, "_libretro", 9))
*last = '\0';
}
strlcat(core_path,
file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
sizeof(core_path));
if (
path_is_valid(core_path)
&& core_info_get_display_name(
core_path, display_name, sizeof(display_name)))
file_list_set_alt_at_offset(list, j, display_name);
}
}
break; break;
default: default:
case FILE_TYPE_NONE: case FILE_TYPE_NONE: