X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=inline;f=Source%2FUtils%2FFolders.cpp;h=8de69db5098383ec1cb47db41401ba38d2226da9;hb=57bbf8b9dacfa259bb309314b4ec1119279267bd;hp=9a6f8137a536ba574dca9db8b075baebc693cd39;hpb=9f5ea9b1ee67471d2f4031dcd2aef6ea62a8265e;p=lugaru.git
diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index 9a6f813..8de69db 100644
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -18,15 +18,21 @@ You should have received a copy of the GNU General Public License
along with Lugaru. If not, see .
*/
-#include "Folders.h"
+#include "Folders.hpp"
+
#include
+#include
+#include
#include
+
#if PLATFORM_UNIX
+#include
#include
#include
-#include
#endif
+
#if _WIN32
+#include // to get paths related functions
#include
#endif
@@ -39,46 +45,41 @@ std::string Folders::getScreenshotDir()
return screenshotDir;
}
-std::string Folders::getResourcePath(std::string filepath)
-{
- return dataDir + '/' + filepath;
-}
-
std::string Folders::getUserDataPath()
{
-#ifdef _WIN32
- return dataDir;
-#else
std::string userDataPath;
-#if (defined(__APPLE__) && defined(__MACH__))
+#ifdef _WIN32
+ char path[MAX_PATH];
+ // %APPDATA% (%USERPROFILE%\Application Data)
+ if(SUCCEEDED(SHGetFolderPathA(nullptr, CSIDL_APPDATA, nullptr, 0, path))) {
+ userDataPath = std::string(path) + "/Lugaru/";
+ } else {
+ return dataDir;
+ }
+#elif (defined(__APPLE__) && defined(__MACH__))
const char* homePath = getHomeDirectory();
if (homePath == NULL) {
userDataPath = ".";
} else {
userDataPath = std::string(homePath) + "/Library/Application Support/Lugaru";
}
-#else
+#else // Linux
userDataPath = getGenericDirectory("XDG_DATA_HOME", ".local/share");
#endif
makeDirectory(userDataPath);
return userDataPath;
-#endif
}
std::string Folders::getConfigFilePath()
{
-#ifdef _WIN32
- return dataDir + "/config.txt";
-#else
std::string configFolder;
-#if (defined(__APPLE__) && defined(__MACH__))
+#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__))
configFolder = getUserDataPath();
-#else
+#else // Linux
configFolder = getGenericDirectory("XDG_CONFIG_HOME", ".config");
-#endif
makeDirectory(configFolder);
- return configFolder + "/config.txt";
#endif
+ return configFolder + "/config.txt";
}
#if PLATFORM_LINUX
@@ -135,3 +136,12 @@ bool Folders::makeDirectory(std::string path) {
}
#endif
}
+
+FILE* Folders::openMandatoryFile(std::string filename, const char* mode)
+{
+ FILE* tfile = fopen(filename.c_str(), mode);
+ if (tfile == NULL) {
+ throw FileNotFoundException(filename);
+ }
+ return tfile;
+}