X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=b667daa933a5d22bc59b1779ea086550d70ad9d6;hb=b84825978803615f45a9f128232e62431042aec0;hp=e845b3f3e0995f700d92ff57a5b0d083828368b9;hpb=11ff9aec2c3206a5b9df5bf8815051458628c45a;p=lugaru.git

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index e845b3f..b667daa 100644
--- a/Source/Utils/Folders.cpp
+++ b/Source/Utils/Folders.cpp
@@ -27,11 +27,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include <pwd.h>
 #endif
 #if _WIN32
-#include <Windows.h>
-#include <WinBase.h>
+#include <windows.h>
+#include <shlobj.h> // to get paths related functions
 #endif
 
-const std::string Folders::dataDir = DATADIR;
+const std::string Folders::dataDir = DATA_DIR;
 
 std::string Folders::getScreenshotDir()
 {
@@ -47,39 +47,39 @@ std::string Folders::getResourcePath(std::string 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
@@ -87,12 +87,12 @@ std::string Folders::getConfigFilePath()
 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)) {
+    if ((path != NULL) && (strlen(path) != 0)) {
         ret = std::string(path) + "/lugaru";
     } else {
-        path = getHomeDirectory();
-        if((path != NULL) && (strlen(path) != 0)) {
-            ret = std::string(path) + '/' + fallback + "/lugaru";
+        const char* homedir = getHomeDirectory();
+        if ((homedir != NULL) && (strlen(homedir) != 0)) {
+            ret = std::string(homedir) + '/' + fallback + "/lugaru";
         } else {
             ret = ".";
         }
@@ -117,7 +117,7 @@ const char* Folders::getHomeDirectory()
 bool Folders::makeDirectory(std::string path) {
 #ifdef _WIN32
     int status = CreateDirectory(path.c_str(), NULL);
-    if(status != 0) {
+    if (status != 0) {
         return true;
     } else if(GetLastError() == ERROR_ALREADY_EXISTS) {
         return true;
@@ -136,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;
+}