diff --git a/Core/Config.h b/Core/Config.h index ce35ffcc24..be0fe9589c 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -478,11 +478,11 @@ public: // Various directories. Autoconfigured, not read from ini. std::string currentDirectory; - std::string externalDirectory; + Path externalDirectory; Path memStickDirectory; Path flash0Directory; - std::string internalDataDirectory; - std::string appCacheDirectory; + Path internalDataDirectory; + Path appCacheDirectory; // Data for upgrade prompt std::string upgradeMessage; // The actual message from the server is currently not used, need a translation mechanism. So this just acts as a flag. diff --git a/Core/System.cpp b/Core/System.cpp index c2a5d01169..1237d43b95 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -605,7 +605,7 @@ Path GetSysDirectory(PSPDirectories directoryType) { return g_Config.memStickDirectory / "PSP/PLUGINS"; case DIRECTORY_APP_CACHE: if (!g_Config.appCacheDirectory.empty()) { - return Path(g_Config.appCacheDirectory); + return g_Config.appCacheDirectory; } return g_Config.memStickDirectory / "PSP/SYSTEM/CACHE"; case DIRECTORY_VIDEO: @@ -638,7 +638,7 @@ void InitSysDirectories() { #else // Caller sets this to the Documents folder. - const Path rootMyDocsPath = Path(g_Config.internalDataDirectory); + const Path rootMyDocsPath = g_Config.internalDataDirectory; const Path myDocsPath = rootMyDocsPath / "PPSSPP"; const Path installedFile = path / "installed.txt"; const bool installed = File::Exists(installedFile); diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 8698b16005..337a356008 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -590,9 +590,9 @@ void SystemInfoScreen::CreateViews() { storage->Add(new ItemHeader(si->T("Directories"))); // Intentionally non-translated storage->Add(new InfoItem("MemStickDirectory", g_Config.memStickDirectory.ToVisualString())); - storage->Add(new InfoItem("InternalDataDirectory", g_Config.internalDataDirectory)); - storage->Add(new InfoItem("AppCacheDir", g_Config.appCacheDirectory)); - storage->Add(new InfoItem("ExtStorageDir", g_Config.externalDirectory)); + storage->Add(new InfoItem("InternalDataDirectory", g_Config.internalDataDirectory.ToVisualString())); + storage->Add(new InfoItem("AppCacheDir", g_Config.appCacheDirectory.ToVisualString())); + storage->Add(new InfoItem("ExtStorageDir", g_Config.externalDirectory.ToVisualString())); #if PPSSPP_PLATFORM(ANDROID) storage->Add(new InfoItem("ExtFilesDir", g_extFilesDir)); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index bc1be681f6..1880c5816e 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1295,7 +1295,7 @@ void GameSettingsScreen::CallbackMemstickFolder(bool yes) { auto sy = GetI18NCategory("System"); if (yes) { - std::string memstickDirFile = g_Config.internalDataDirectory + "/memstick_dir.txt"; + Path memstickDirFile = g_Config.internalDataDirectory / "memstick_dir.txt"; std::string testWriteFile = pendingMemstickFolder_ + "/.write_verify_file"; // Already, create away. @@ -1308,7 +1308,7 @@ void GameSettingsScreen::CallbackMemstickFolder(bool yes) { } File::Delete(Path(testWriteFile)); - File::WriteDataToFile(true, pendingMemstickFolder_.c_str(), (unsigned int)pendingMemstickFolder_.size(), Path(memstickDirFile)); + File::WriteDataToFile(true, pendingMemstickFolder_.c_str(), (unsigned int)pendingMemstickFolder_.size(), memstickDirFile); // Save so the settings, at least, are transferred. g_Config.memStickDirectory = Path(pendingMemstickFolder_); g_Config.Save("MemstickPathChanged"); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index feed38bd5e..a3e6fc31f4 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -321,9 +321,9 @@ static void PostLoadConfig() { #ifndef _WIN32 if (g_Config.currentDirectory.empty()) { #if defined(__ANDROID__) - g_Config.currentDirectory = g_Config.externalDirectory; + g_Config.currentDirectory = g_Config.externalDirectory.ToString(); #elif PPSSPP_PLATFORM(IOS) - g_Config.currentDirectory = g_Config.internalDataDirectory; + g_Config.currentDirectory = g_Config.internalDataDirectory.ToString(); #elif PPSSPP_PLATFORM(SWITCH) g_Config.currentDirectory = "/"; #else @@ -487,8 +487,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch } #endif - g_Config.internalDataDirectory = savegame_dir; - g_Config.externalDirectory = external_dir; + g_Config.internalDataDirectory = Path(savegame_dir); + g_Config.externalDirectory = Path(external_dir); #if defined(__ANDROID__) // TODO: This needs to change in Android 12. @@ -499,7 +499,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch g_Config.memStickDirectory = Path(external_dir); g_Config.flash0Directory = Path(external_dir) / "flash0"; - Path memstickDirFile = Path(g_Config.internalDataDirectory) / "memstick_dir.txt"; + Path memstickDirFile = g_Config.internalDataDirectory / "memstick_dir.txt"; if (File::Exists(memstickDirFile)) { std::string memstickDir; File::ReadFileToString(true, memstickDirFile, memstickDir); @@ -514,8 +514,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch g_Config.memStickDirectory = Path(user_data_path); g_Config.flash0Directory = Path(std::string(external_dir)) / "flash0"; #elif PPSSPP_PLATFORM(SWITCH) - g_Config.memStickDirectory = Path(g_Config.internalDataDirectory) / "config/ppsspp"; - g_Config.flash0Directory = Path(g_Config.internalDataDirectory) / "assets/flash0"; + g_Config.memStickDirectory = g_Config.internalDataDirectory / "config/ppsspp"; + g_Config.flash0Directory = g_Config.internalDataDirectory / "assets/flash0"; #elif !PPSSPP_PLATFORM(WINDOWS) std::string config; if (getenv("XDG_CONFIG_HOME") != NULL) @@ -530,8 +530,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch #endif if (cache_dir && strlen(cache_dir)) { - DiskCachingFileLoaderCache::SetCacheDir(Path(cache_dir)); - g_Config.appCacheDirectory = cache_dir; + g_Config.appCacheDirectory = Path(cache_dir); + DiskCachingFileLoaderCache::SetCacheDir(g_Config.appCacheDirectory); } if (!LogManager::GetInstance()) diff --git a/Windows/main.cpp b/Windows/main.cpp index 81b021eef4..25c27c0221 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -562,7 +562,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin // On Win32 it makes more sense to initialize the system directories here // because the next place it was called was in the EmuThread, and it's too late by then. - g_Config.internalDataDirectory = W32Util::UserDocumentsPath(); + g_Config.internalDataDirectory = Path(W32Util::UserDocumentsPath()); InitSysDirectories(); // Check for the Vulkan workaround before any serious init. diff --git a/headless/Headless.cpp b/headless/Headless.cpp index dd19ac5536..bcebf9a061 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -403,7 +403,7 @@ int main(int argc, const char* argv[]) g_Config.iPSPModel = PSP_MODEL_SLIM; #ifdef _WIN32 - g_Config.internalDataDirectory = ""; + g_Config.internalDataDirectory.clear(); InitSysDirectories(); #endif diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 3a8058a67c..e9ea704809 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -618,10 +618,10 @@ bool retro_load_game(const struct retro_game_info *game) retro_save_dir = Path(game->path).NavigateUp(); g_Config.currentDirectory = retro_base_dir.ToString(); - g_Config.externalDirectory = retro_base_dir.ToString(); + g_Config.externalDirectory = retro_base_dir; g_Config.memStickDirectory = retro_save_dir; g_Config.flash0Directory = retro_base_dir / "flash0"; - g_Config.internalDataDirectory = retro_base_dir.ToString(); + g_Config.internalDataDirectory = retro_base_dir; VFSRegister("", new DirectoryAssetReader(retro_base_dir.c_str()));