From da6a301a6e5da243796a0f5f3e034b2bc9e0e91d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 2 May 2016 15:20:20 +0200 Subject: [PATCH] (Frontend) Cleanups --- frontend/drivers/platform_darwin.m | 2 +- frontend/drivers/platform_linux.c | 54 ++++++++++++++++++------------ 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 200ce04832..d38fc6f775 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -363,6 +363,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.system, home_dir_buf, "system", sizeof(g_defaults.dir.system)); fill_pathname_join(g_defaults.dir.menu_config, home_dir_buf, "config", sizeof(g_defaults.dir.menu_config)); fill_pathname_join(g_defaults.path.config, g_defaults.dir.menu_config, "retroarch.cfg", sizeof(g_defaults.path.config)); + fill_pathname_join(g_defaults.dir.remap, g_defaults.dir.menu_config, "remaps", sizeof(g_defaults.dir.remap)); fill_pathname_join(g_defaults.dir.database, home_dir_buf, "database/rdb", sizeof(g_defaults.dir.database)); fill_pathname_join(g_defaults.dir.cursor, home_dir_buf, "database/cursors", sizeof(g_defaults.dir.cursor)); fill_pathname_join(g_defaults.dir.cheats, home_dir_buf, "cht", sizeof(g_defaults.dir.cheats)); @@ -370,7 +371,6 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], fill_pathname_join(g_defaults.dir.sram, home_dir_buf, "saves", sizeof(g_defaults.dir.sram)); fill_pathname_join(g_defaults.dir.savestate, home_dir_buf, "states", sizeof(g_defaults.dir.savestate)); fill_pathname_join(g_defaults.dir.menu_config, home_dir_buf, "config", sizeof(g_defaults.dir.menu_config)); - fill_pathname_join(g_defaults.dir.remap, home_dir_buf, "config/remaps", sizeof(g_defaults.dir.remap)); #if defined(IOS) fill_pathname_join(g_defaults.dir.playlist, home_dir_buf, "playlists", sizeof(g_defaults.dir.playlist)); #endif diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 26cead732f..16a78f7382 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -1867,72 +1867,84 @@ static void frontend_linux_get_env(int *argc, case INT_SD_APPDIR_WRITABLE: fill_pathname_join(g_defaults.dir.sram, int_sd_app_dir, "saves", sizeof(g_defaults.dir.sram)); - path_mkdir(g_defaults.dir.sram); fill_pathname_join(g_defaults.dir.savestate, int_sd_app_dir, "states", sizeof(g_defaults.dir.savestate)); - path_mkdir(g_defaults.dir.savestate); fill_pathname_join(g_defaults.dir.system, int_sd_app_dir, "system", sizeof(g_defaults.dir.system)); - path_mkdir(g_defaults.dir.system); fill_pathname_join(g_defaults.dir.menu_config, int_sd_app_dir, "config", sizeof(g_defaults.dir.menu_config)); - path_mkdir(g_defaults.dir.menu_config); fill_pathname_join(g_defaults.dir.remap, - int_sd_app_dir, "config/remap", sizeof(g_defaults.dir.remap)); - path_mkdir(g_defaults.dir.remap); + g_defaults.dir.menu_config, "remaps", sizeof(g_defaults.dir.remap)); fill_pathname_join(g_defaults.dir.thumbnails, int_sd_app_dir, "thumbnails", sizeof(g_defaults.dir.thumbnails)); - path_mkdir(g_defaults.dir.thumbnails); fill_pathname_join(g_defaults.dir.playlist, int_sd_app_dir, "playlists", sizeof(g_defaults.dir.playlist)); - path_mkdir(g_defaults.dir.playlist); fill_pathname_join(g_defaults.dir.cheats, int_sd_app_dir, "cheats", sizeof(g_defaults.dir.cheats)); + + /* TODO/FIXME - Test if this is needed at all, as far as I know, + * every directory we set in g_defaults already gets created if it + * doesn't exist already */ + path_mkdir(g_defaults.dir.sram); + path_mkdir(g_defaults.dir.savestate); + path_mkdir(g_defaults.dir.system); + path_mkdir(g_defaults.dir.menu_config); + path_mkdir(g_defaults.dir.remap); + path_mkdir(g_defaults.dir.thumbnails); + path_mkdir(g_defaults.dir.playlist); path_mkdir(g_defaults.dir.cheats); break; case INT_SD_NOT_WRITABLE: fill_pathname_join(g_defaults.dir.sram, app_dir, "saves", sizeof(g_defaults.dir.sram)); - path_mkdir(g_defaults.dir.sram); fill_pathname_join(g_defaults.dir.savestate, app_dir, "states", sizeof(g_defaults.dir.savestate)); - path_mkdir(g_defaults.dir.savestate); fill_pathname_join(g_defaults.dir.system, app_dir, "system", sizeof(g_defaults.dir.system)); - path_mkdir(g_defaults.dir.system); fill_pathname_join(g_defaults.dir.menu_config, app_dir, "config", sizeof(g_defaults.dir.menu_config)); - path_mkdir(g_defaults.dir.menu_config); fill_pathname_join(g_defaults.dir.remap, - app_dir, "config/remap", sizeof(g_defaults.dir.remap)); - path_mkdir(g_defaults.dir.remap); + g_defaults.dir.menu_config, "remaps", sizeof(g_defaults.dir.remap)); fill_pathname_join(g_defaults.dir.thumbnails, app_dir, "thumbnails", sizeof(g_defaults.dir.thumbnails)); - path_mkdir(g_defaults.dir.thumbnails); fill_pathname_join(g_defaults.dir.playlist, app_dir, "playlists", sizeof(g_defaults.dir.playlist)); - path_mkdir(g_defaults.dir.playlist); fill_pathname_join(g_defaults.dir.cheats, app_dir, "cheats", sizeof(g_defaults.dir.cheats)); + + /* TODO/FIXME - Test if this is needed at all, as far as I know, + * every directory we set in g_defaults already gets created if it + * doesn't exist already */ + path_mkdir(g_defaults.dir.sram); + path_mkdir(g_defaults.dir.savestate); + path_mkdir(g_defaults.dir.system); + path_mkdir(g_defaults.dir.menu_config); + path_mkdir(g_defaults.dir.remap); + path_mkdir(g_defaults.dir.thumbnails); + path_mkdir(g_defaults.dir.playlist); path_mkdir(g_defaults.dir.cheats); break; case INT_SD_WRITABLE: fill_pathname_join(g_defaults.dir.menu_config, int_sd_dir, "RetroArch/config", sizeof(g_defaults.dir.menu_config)); - path_mkdir(g_defaults.dir.menu_config); fill_pathname_join(g_defaults.dir.remap, - int_sd_dir, "RetroArch/config/remap", sizeof(g_defaults.dir.remap)); - path_mkdir(g_defaults.dir.remap); + g_defaults.dir.menu_config, "remaps", sizeof(g_defaults.dir.remap)); fill_pathname_join(g_defaults.dir.thumbnails, int_sd_dir, "RetroArch/thumbnails", sizeof(g_defaults.dir.thumbnails)); - path_mkdir(g_defaults.dir.thumbnails); fill_pathname_join(g_defaults.dir.playlist, int_sd_dir, "RetroArch/playlists", sizeof(g_defaults.dir.playlist)); - path_mkdir(g_defaults.dir.playlist); fill_pathname_join(g_defaults.dir.cheats, int_sd_dir, "RetroArch/cheats", sizeof(g_defaults.dir.cheats)); + + /* TODO/FIXME - Test if this is needed at all, as far as I know, + * every directory we set in g_defaults already gets created if it + * doesn't exist already */ + path_mkdir(g_defaults.dir.menu_config); + path_mkdir(g_defaults.dir.remap); + path_mkdir(g_defaults.dir.thumbnails); + path_mkdir(g_defaults.dir.playlist); path_mkdir(g_defaults.dir.cheats); default: break;