Merge pull request #3802 from frangarcj/master

Varius download / update content things
This commit is contained in:
Twinaphex 2016-10-15 15:38:44 +02:00 committed by GitHub
commit 455e6984db
3 changed files with 25 additions and 9 deletions

View File

@ -138,6 +138,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
"temp", sizeof(g_defaults.dir.cache)); "temp", sizeof(g_defaults.dir.cache));
fill_pathname_join(g_defaults.dir.overlay, user_path, fill_pathname_join(g_defaults.dir.overlay, user_path,
"overlays", sizeof(g_defaults.dir.overlay)); "overlays", sizeof(g_defaults.dir.overlay));
fill_pathname_join(g_defaults.dir.thumbnails, user_path,
"thumbnails", sizeof(g_defaults.dir.thumbnails));
strlcpy(g_defaults.dir.content_history, strlcpy(g_defaults.dir.content_history,
user_path, sizeof(g_defaults.dir.content_history)); user_path, sizeof(g_defaults.dir.content_history));
fill_pathname_join(g_defaults.path.config, user_path, fill_pathname_join(g_defaults.path.config, user_path,
@ -210,8 +212,9 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
path_mkdir(g_defaults.dir.screenshot); path_mkdir(g_defaults.dir.screenshot);
path_mkdir(g_defaults.dir.sram); path_mkdir(g_defaults.dir.sram);
path_mkdir(g_defaults.dir.system); path_mkdir(g_defaults.dir.system);
/* path_mkdir(g_defaults.dir.thumbnails); */ #ifdef VITA
path_mkdir(g_defaults.dir.thumbnails);
#endif
/* create cache dir */ /* create cache dir */
path_mkdir(g_defaults.dir.cache); path_mkdir(g_defaults.dir.cache);
@ -466,6 +469,8 @@ static int frontend_psp_parse_drive_list(void *data)
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;
#ifdef VITA #ifdef VITA
menu_entries_append_enum(list,
"app0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list, menu_entries_append_enum(list,
"ur0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0); "ur0:/", "", MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list, menu_entries_append_enum(list,

View File

@ -2066,16 +2066,13 @@ static int generic_action_ok_network(const char *path,
url_path[0] = '\0'; url_path[0] = '\0';
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
if (string_is_empty(settings->network.buildbot_url))
return menu_cbs_exit();
command_event(CMD_EVENT_NETWORK_INIT, NULL);
switch (enum_idx) switch (enum_idx)
{ {
case MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST: case MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST:
if (string_is_empty(settings->network.buildbot_assets_url))
return menu_cbs_exit();
fill_pathname_join(url_path, settings->network.buildbot_assets_url, fill_pathname_join(url_path, settings->network.buildbot_assets_url,
"cores/.index-dirs", sizeof(url_path)); "cores/.index-dirs", sizeof(url_path));
url_label = msg_hash_to_str(enum_idx); url_label = msg_hash_to_str(enum_idx);
@ -2092,6 +2089,10 @@ static int generic_action_ok_network(const char *path,
suppress_msg = true; suppress_msg = true;
break; break;
case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST: case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST:
if (string_is_empty(settings->network.buildbot_url))
return menu_cbs_exit();
fill_pathname_join(url_path, settings->network.buildbot_url, fill_pathname_join(url_path, settings->network.buildbot_url,
file_path_str(FILE_PATH_INDEX_EXTENDED_URL), sizeof(url_path)); file_path_str(FILE_PATH_INDEX_EXTENDED_URL), sizeof(url_path));
url_label = msg_hash_to_str(enum_idx); url_label = msg_hash_to_str(enum_idx);
@ -2123,6 +2124,10 @@ static int generic_action_ok_network(const char *path,
default: default:
break; break;
} }
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
command_event(CMD_EVENT_NETWORK_INIT, NULL);
transf = (menu_file_transfer_t*)calloc(1, sizeof(*transf)); transf = (menu_file_transfer_t*)calloc(1, sizeof(*transf));
strlcpy(transf->path, url_path, sizeof(transf->path)); strlcpy(transf->path, url_path, sizeof(transf->path));

View File

@ -2914,11 +2914,13 @@ static int menu_displaylist_parse_options(
MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#else #else
#if !defined(VITA)
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST),
msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST),
MENU_ENUM_LABEL_CORE_UPDATER_LIST, MENU_ENUM_LABEL_CORE_UPDATER_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST),
@ -2926,11 +2928,13 @@ static int menu_displaylist_parse_options(
MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#if !defined(VITA)
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES),
msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES), msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES),
MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES, MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif
#ifdef HAVE_UPDATE_ASSETS #ifdef HAVE_UPDATE_ASSETS
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
@ -2953,11 +2957,13 @@ static int menu_displaylist_parse_options(
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_LIBRETRODB #ifdef HAVE_LIBRETRODB
#if !defined(VITA)
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES),
msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_DATABASES), msg_hash_to_str(MENU_ENUM_LABEL_UPDATE_DATABASES),
MENU_ENUM_LABEL_UPDATE_DATABASES, MENU_ENUM_LABEL_UPDATE_DATABASES,
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif
#endif #endif
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,