mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename extraction_directory to cache_directory

Browse Source
This commit is contained in:
twinaphex 2015-10-27 00:48:35 +01:00
parent 53fe928b7b
commit 0dc9c8df95
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configuration.c
View File

@ -703,7 +703,7 @@ static void config_set_defaults(void)
*settings->resampler_directory = '\0'; *settings->resampler_directory = '\0';
*settings->screenshot_directory = '\0'; *settings->screenshot_directory = '\0';
*settings->system_directory = '\0'; *settings->system_directory = '\0';
*settings->extraction_directory = '\0'; *settings->cache_directory = '\0';
*settings->input_remapping_directory = '\0'; *settings->input_remapping_directory = '\0';
*settings->input.autoconfig_dir = '\0'; *settings->input.autoconfig_dir = '\0';
*settings->input.overlay = '\0'; *settings->input.overlay = '\0';
@ -752,9 +752,9 @@ static void config_set_defaults(void)
if (*g_defaults.dir.remap) if (*g_defaults.dir.remap)
strlcpy(settings->input_remapping_directory, strlcpy(settings->input_remapping_directory,
g_defaults.dir.remap, sizeof(settings->input_remapping_directory)); g_defaults.dir.remap, sizeof(settings->input_remapping_directory));
if (*g_defaults.dir.extraction) if (*g_defaults.dir.cache)
strlcpy(settings->extraction_directory, strlcpy(settings->cache_directory,
g_defaults.dir.extraction, sizeof(settings->extraction_directory)); g_defaults.dir.cache, sizeof(settings->cache_directory));
if (*g_defaults.dir.audio_filter) if (*g_defaults.dir.audio_filter)
strlcpy(settings->audio.filter_dir, strlcpy(settings->audio.filter_dir,
g_defaults.dir.audio_filter, sizeof(settings->audio.filter_dir)); g_defaults.dir.audio_filter, sizeof(settings->audio.filter_dir));
@ -1524,8 +1524,8 @@ static bool config_load_file(const char *path, bool set_defaults)
sizeof(settings->input.remapping_path)); sizeof(settings->input.remapping_path));
config_get_path(conf, "resampler_directory", settings->resampler_directory, config_get_path(conf, "resampler_directory", settings->resampler_directory,
sizeof(settings->resampler_directory)); sizeof(settings->resampler_directory));
config_get_path(conf, "extraction_directory", settings->extraction_directory, config_get_path(conf, "cache_directory", settings->cache_directory,
sizeof(settings->extraction_directory)); sizeof(settings->cache_directory));
config_get_path(conf, "input_remapping_directory", settings->input_remapping_directory, config_get_path(conf, "input_remapping_directory", settings->input_remapping_directory,
sizeof(settings->input_remapping_directory)); sizeof(settings->input_remapping_directory));
config_get_path(conf, "core_assets_directory", settings->core_assets_directory, config_get_path(conf, "core_assets_directory", settings->core_assets_directory,
@ -2585,8 +2585,8 @@ bool config_save_file(const char *path)
config_set_path(conf, "system_directory", config_set_path(conf, "system_directory",
*settings->system_directory ? *settings->system_directory ?
settings->system_directory : "default"); settings->system_directory : "default");
config_set_path(conf, "extraction_directory", config_set_path(conf, "cache_directory",
settings->extraction_directory); settings->cache_directory);
config_set_path(conf, "input_remapping_directory", config_set_path(conf, "input_remapping_directory",
settings->input_remapping_directory); settings->input_remapping_directory);
config_set_path(conf, "input_remapping_path", config_set_path(conf, "input_remapping_path",

2
configuration.h
View File

@ -315,7 +315,7 @@ typedef struct settings
char screenshot_directory[PATH_MAX_LENGTH]; char screenshot_directory[PATH_MAX_LENGTH];
char system_directory[PATH_MAX_LENGTH]; char system_directory[PATH_MAX_LENGTH];
char extraction_directory[PATH_MAX_LENGTH]; char cache_directory[PATH_MAX_LENGTH];
char playlist_directory[PATH_MAX_LENGTH]; char playlist_directory[PATH_MAX_LENGTH];
bool history_list_enable; bool history_list_enable;

12
content.c
View File

@ -404,15 +404,15 @@ static bool load_content_need_fullpath(
RARCH_LOG("Compressed file in case of need_fullpath." RARCH_LOG("Compressed file in case of need_fullpath."
"Now extracting to temporary directory.\n"); "Now extracting to temporary directory.\n");
strlcpy(new_basedir, settings->extraction_directory, strlcpy(new_basedir, settings->cache_directory,
sizeof(new_basedir)); sizeof(new_basedir));
if ((!strcmp(new_basedir, "")) || if ((!strcmp(new_basedir, "")) ||
!path_is_directory(new_basedir)) !path_is_directory(new_basedir))
{ {
RARCH_WARN("Tried extracting to extraction directory, but " RARCH_WARN("Tried extracting to cache directory, but "
"extraction directory was not set or found. " "cache directory was not set or found. "
"Setting extraction directory to directory " "Setting cache directory to directory "
"derived by basename...\n"); "derived by basename...\n");
fill_pathname_basedir(new_basedir, path, fill_pathname_basedir(new_basedir, path,
sizeof(new_basedir)); sizeof(new_basedir));
@ -658,8 +658,8 @@ bool init_content_file(void)
if (!zlib_extract_first_content_file(temporary_content, if (!zlib_extract_first_content_file(temporary_content,
sizeof(temporary_content), valid_ext, sizeof(temporary_content), valid_ext,
*settings->extraction_directory ? *settings->cache_directory ?
settings->extraction_directory : NULL)) settings->cache_directory : NULL))
{ {
RARCH_ERR("Failed to extract content from zipped file: %s.\n", RARCH_ERR("Failed to extract content from zipped file: %s.\n",
temporary_content); temporary_content);

2
frontend/drivers/platform_darwin.m
View File

@ -377,7 +377,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
#endif #endif
CFTemporaryDirectory(temp_dir, sizeof(temp_dir)); CFTemporaryDirectory(temp_dir, sizeof(temp_dir));
strlcpy(g_defaults.dir.extraction, temp_dir, sizeof(g_defaults.dir.extraction)); strlcpy(g_defaults.dir.cache, temp_dir, sizeof(g_defaults.dir.cache));
path_mkdir(bundle_path_buf); path_mkdir(bundle_path_buf);

4
frontend/drivers/platform_linux.c
View File

@ -1782,8 +1782,8 @@ static void frontend_linux_get_env(int *argc,
fill_pathname_join(g_defaults.dir.assets, app_dir, fill_pathname_join(g_defaults.dir.assets, app_dir,
"assets", sizeof(g_defaults.dir.assets)); "assets", sizeof(g_defaults.dir.assets));
fill_pathname_join(g_defaults.dir.extraction, app_dir, fill_pathname_join(g_defaults.dir.cache, app_dir,
"tmp", sizeof(g_defaults.dir.extraction)); "tmp", sizeof(g_defaults.dir.cache));
fill_pathname_join(g_defaults.dir.shader, app_dir, fill_pathname_join(g_defaults.dir.shader, app_dir,
"shaders", sizeof(g_defaults.dir.shader)); "shaders", sizeof(g_defaults.dir.shader));
fill_pathname_join(g_defaults.dir.overlay, app_dir, fill_pathname_join(g_defaults.dir.overlay, app_dir,

4
frontend/frontend.c
View File

@ -158,8 +158,8 @@ static void check_defaults_dirs(void)
path_mkdir(g_defaults.dir.menu_config); path_mkdir(g_defaults.dir.menu_config);
if (*g_defaults.dir.content_history) if (*g_defaults.dir.content_history)
path_mkdir(g_defaults.dir.content_history); path_mkdir(g_defaults.dir.content_history);
if (*g_defaults.dir.extraction) if (*g_defaults.dir.cache)
path_mkdir(g_defaults.dir.extraction); path_mkdir(g_defaults.dir.cache);
if (*g_defaults.dir.database) if (*g_defaults.dir.database)
path_mkdir(g_defaults.dir.database); path_mkdir(g_defaults.dir.database);
if (*g_defaults.dir.cursor) if (*g_defaults.dir.cursor)

2
general.h
View File

@ -96,7 +96,7 @@ struct defaults
char playlist[PATH_MAX_LENGTH]; char playlist[PATH_MAX_LENGTH];
char content_history[PATH_MAX_LENGTH]; char content_history[PATH_MAX_LENGTH];
char remap[PATH_MAX_LENGTH]; char remap[PATH_MAX_LENGTH];
char extraction[PATH_MAX_LENGTH]; char cache[PATH_MAX_LENGTH];
char wallpapers[PATH_MAX_LENGTH]; char wallpapers[PATH_MAX_LENGTH];
char database[PATH_MAX_LENGTH]; char database[PATH_MAX_LENGTH];
char cursor[PATH_MAX_LENGTH]; char cursor[PATH_MAX_LENGTH];

2
menu/menu_setting.c
View File

@ -6599,7 +6599,7 @@ static bool setting_append_list_directory_options(
CONFIG_DIR( CONFIG_DIR(
settings->extraction_directory, settings->cache_directory,
menu_hash_to_str(MENU_LABEL_CACHE_DIRECTORY), menu_hash_to_str(MENU_LABEL_CACHE_DIRECTORY),
menu_hash_to_str(MENU_LABEL_VALUE_CACHE_DIRECTORY), menu_hash_to_str(MENU_LABEL_VALUE_CACHE_DIRECTORY),
"", "",