ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Common/FileUtil: Ensure consistency for custom user paths.

This commit is contained in:
Admiral H. Curtiss 2021-11-22 03:00:15 +01:00
parent a29d7625dd
commit 3e1511ce98
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Common/FileUtil.cpp
View File

@ -26,6 +26,7 @@
#endif #endif
#include "Common/IOFile.h" #include "Common/IOFile.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
@ -1052,12 +1053,31 @@ const std::string& GetUserPath(unsigned int dir_index)
// Sets a user directory path // Sets a user directory path
// Rebuilds internal directory structure to compensate for the new directory // Rebuilds internal directory structure to compensate for the new directory
void SetUserPath(unsigned int dir_index, const std::string& path) void SetUserPath(unsigned int dir_index, std::string path)
{ {
if (path.empty()) if (path.empty())
return; return;
s_user_paths[dir_index] = path; #ifdef _WIN32
// On Windows, replace all '\' with '/' since we assume the latter in various places in the
// codebase.
for (char& c : path)
{
if (c == '\\')
c = '/';
}
#endif
// Directories should end with a separator, files should not.
while (StringEndsWith(path, "/"))
path.pop_back();
if (path.empty())
return;
const bool is_directory = dir_index < FIRST_FILE_USER_PATH_IDX;
if (is_directory)
path.push_back('/');
s_user_paths[dir_index] = std::move(path);
RebuildUserDirectories(dir_index); RebuildUserDirectories(dir_index);
} }

5
Source/Core/Common/FileUtil.h
View File

@ -62,7 +62,8 @@ enum
D_DYNAMICINPUT_IDX, D_DYNAMICINPUT_IDX,
D_GBAUSER_IDX, D_GBAUSER_IDX,
D_GBASAVES_IDX, D_GBASAVES_IDX,
F_DOLPHINCONFIG_IDX, FIRST_FILE_USER_PATH_IDX,
F_DOLPHINCONFIG_IDX = FIRST_FILE_USER_PATH_IDX,
F_GCPADCONFIG_IDX, F_GCPADCONFIG_IDX,
F_WIIPADCONFIG_IDX, F_WIIPADCONFIG_IDX,
F_GCKEYBOARDCONFIG_IDX, F_GCKEYBOARDCONFIG_IDX,
@ -208,7 +209,7 @@ const std::string& GetUserPath(unsigned int dir_index);
// Sets a user directory path // Sets a user directory path
// Rebuilds internal directory structure to compensate for the new directory // Rebuilds internal directory structure to compensate for the new directory
void SetUserPath(unsigned int dir_index, const std::string& path); void SetUserPath(unsigned int dir_index, std::string path);
// probably doesn't belong here // probably doesn't belong here
std::string GetThemeDir(const std::string& theme_name); std::string GetThemeDir(const std::string& theme_name);