X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=8f2bc18feddfc1c2b44af47ac1adbc5592240448;hb=a3f060d7e5508cd032c4f1c320033a74e5d84009;hp=9a6f8137a536ba574dca9db8b075baebc693cd39;hpb=9f5ea9b1ee67471d2f4031dcd2aef6ea62a8265e;p=lugaru.git
diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index 9a6f813..8f2bc18 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,51 +45,46 @@ 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
/* Generic code for XDG ENVVAR test and fallback */
-std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string fallback) {
+std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string& fallback) {
const char* path = getenv(ENVVAR);
std::string ret;
if ((path != NULL) && (strlen(path) != 0)) {
@@ -113,25 +114,22 @@ const char* Folders::getHomeDirectory()
}
#endif
-bool Folders::makeDirectory(std::string path) {
+bool Folders::makeDirectory(const std::string& path) {
#ifdef _WIN32
int status = CreateDirectory(path.c_str(), NULL);
- if (status != 0) {
- return true;
- } else if(GetLastError() == ERROR_ALREADY_EXISTS) {
- return true;
- } else {
- return false;
- }
+ return ((status != 0) || (GetLastError() == ERROR_ALREADY_EXISTS));
#else
errno = 0;
int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
- if (status == 0) {
- return true;
- } else if(errno == EEXIST) {
- return true;
- } else {
- return false;
- }
+ return ((status == 0) || (errno == EEXIST));
#endif
}
+
+FILE* Folders::openMandatoryFile(const std::string& filename, const char* mode)
+{
+ FILE* tfile = fopen(filename.c_str(), mode);
+ if (tfile == NULL) {
+ throw FileNotFoundException(filename);
+ }
+ return tfile;
+}