From 6024eda7f95045dce395f9642cc660508ecf8c93 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 20 Jun 2016 21:03:54 +0200 Subject: [PATCH] Add more constant strings --- file_path_special.h | 14 +++++++++++++- file_path_str.c | 24 ++++++++++++++++++++++++ menu/cbs/menu_cbs_ok.c | 32 +++++++++++++++++--------------- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/file_path_special.h b/file_path_special.h index 56d6d93852..0cb1f6fbe3 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -27,7 +27,19 @@ enum file_path_enum FILE_PATH_UNKNOWN = 0, FILE_PATH_CONTENT_HISTORY, FILE_PATH_MAIN_CONFIG, - FILE_PATH_CORE_OPTIONS_CONFIG + FILE_PATH_CORE_OPTIONS_CONFIG, + FILE_PATH_ASSETS_ZIP, + FILE_PATH_AUTOCONFIG_ZIP, + FILE_PATH_CORE_INFO_ZIP, + FILE_PATH_OVERLAYS_ZIP, + FILE_PATH_DATABASE_RDB_ZIP, + FILE_PATH_SHADERS_GLSL_ZIP, + FILE_PATH_SHADERS_CG_ZIP, + FILE_PATH_CHEATS_ZIP, + FILE_PATH_LAKKA_URL, + FILE_PATH_CORE_THUMBNAILS_URL, + FILE_PATH_INDEX_URL, + FILE_PATH_INDEX_EXTENDED_URL, }; enum application_special_type diff --git a/file_path_str.c b/file_path_str.c index eae46711f3..72eeb7cd73 100644 --- a/file_path_str.c +++ b/file_path_str.c @@ -19,6 +19,30 @@ const char *file_path_str(enum file_path_enum enum_idx) { switch (enum_idx) { + case FILE_PATH_INDEX_URL: + return ".index"; + case FILE_PATH_INDEX_EXTENDED_URL: + return ".index-extended"; + case FILE_PATH_CORE_THUMBNAILS_URL: + return "http://thumbnailpacks.libretro.com"; + case FILE_PATH_LAKKA_URL: + return "http://mirror.lakka.tv/nightly"; + case FILE_PATH_SHADERS_GLSL_ZIP: + return "shaders_glsl.zip"; + case FILE_PATH_SHADERS_CG_ZIP: + return "shaders_cg.zip"; + case FILE_PATH_DATABASE_RDB_ZIP: + return "database-rdb.zip"; + case FILE_PATH_OVERLAYS_ZIP: + return "overlays.zip"; + case FILE_PATH_CORE_INFO_ZIP: + return "info.zip"; + case FILE_PATH_CHEATS_ZIP: + return "cheats.zip"; + case FILE_PATH_ASSETS_ZIP: + return "assets.zip"; + case FILE_PATH_AUTOCONFIG_ZIP: + return "autoconfig.zip"; case FILE_PATH_CONTENT_HISTORY: return "content_history.lpl"; case FILE_PATH_CORE_OPTIONS_CONFIG: diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 73beffe40d..5b6fd2356e 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1713,36 +1713,36 @@ static int action_ok_download_generic(const char *path, case MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD: #ifdef HAVE_LAKKA /* TODO unhardcode this path*/ - fill_pathname_join(s, "http://mirror.lakka.tv/nightly", + fill_pathname_join(s, file_path_str(FILE_PATH_LAKKA_URL), LAKKA_PROJECT, sizeof(s)); #endif break; case MENU_ENUM_LABEL_CB_UPDATE_ASSETS: - path = "assets.zip"; + path = file_path_str(FILE_PATH_ASSETS_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_AUTOCONFIG_PROFILES: - path = "autoconfig.zip"; + path = file_path_str(FILE_PATH_AUTOCONFIG_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_CORE_INFO_FILES: - path = "info.zip"; + path = file_path_str(FILE_PATH_CORE_INFO_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_CHEATS: - path = "cheats.zip"; + path = file_path_str(FILE_PATH_CHEATS_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_OVERLAYS: - path = "overlays.zip"; + path = file_path_str(FILE_PATH_OVERLAYS_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_DATABASES: - path = "database-rdb.zip"; + path = file_path_str(FILE_PATH_DATABASE_RDB_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_GLSL: - path = "shaders_glsl.zip"; + path = file_path_str(FILE_PATH_SHADERS_GLSL_ZIP); break; case MENU_ENUM_LABEL_CB_UPDATE_SHADERS_CG: - path = "shaders_cg.zip"; + path = file_path_str(FILE_PATH_SHADERS_CG_ZIP); break; case MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD: - strlcpy(s, "http://thumbnailpacks.libretro.com", sizeof(s)); + strlcpy(s, file_path_str(FILE_PATH_CORE_THUMBNAILS_URL), sizeof(s)); break; default: strlcpy(s, settings->network.buildbot_url, sizeof(s)); @@ -1975,15 +1975,15 @@ static int generic_action_ok_network(const char *path, break; case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST: fill_pathname_join(url_path, settings->network.buildbot_url, - ".index-extended", sizeof(url_path)); + file_path_str(FILE_PATH_INDEX_EXTENDED_URL), sizeof(url_path)); url_label = msg_hash_to_str(enum_idx); type_id2 = ACTION_OK_DL_CORE_UPDATER_LIST; callback = cb_net_generic; break; case MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST: fill_pathname_join(url_path, - "http://thumbnailpacks.libretro.com", - ".index", sizeof(url_path)); + file_path_str(FILE_PATH_CORE_THUMBNAILS_URL), + file_path_str(FILE_PATH_INDEX_URL), sizeof(url_path)); url_label = msg_hash_to_str(enum_idx); type_id2 = ACTION_OK_DL_THUMBNAILS_UPDATER_LIST; callback = cb_net_generic; @@ -1991,10 +1991,12 @@ static int generic_action_ok_network(const char *path, #ifdef HAVE_LAKKA case MENU_ENUM_LABEL_CB_LAKKA_LIST: /* TODO unhardcode this path */ - fill_pathname_join(url_path, "http://mirror.lakka.tv/nightly", + fill_pathname_join(url_path, + file_path_str(FILE_PATH_LAKKA_URL), LAKKA_PROJECT, sizeof(url_path)); fill_pathname_join(url_path, url_path, - ".index", sizeof(url_path)); + file_path_str(FILE_PATH_INDEX_URL), + sizeof(url_path)); url_label = msg_hash_to_str(enum_idx); type_id2 = ACTION_OK_DL_LAKKA_LIST; callback = cb_net_generic;