X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FUtils%2FFolders.cpp;h=751da930b65a46a75bb4cdafc87476a08ae2dcb9;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hp=33d3b15cfdc6c8e8f85e02c1ab81137bb7c86bb7;hpb=38f5e6366de921c4d127c9f8e3e0113cc33ac595;p=lugaru.git

diff --git a/Source/Utils/Folders.cpp b/Source/Utils/Folders.cpp
index 33d3b15..751da93 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 <http://www.gnu.org/licenses/>.
 */
 
-#include "Folders.h"
+#include "Folders.hpp"
+
+#include <cerrno>
+#include <cstdlib>
 #include <cstring>
 #include <unistd.h>
+
 #if PLATFORM_UNIX
+#include <pwd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <pwd.h>
 #endif
+
 #if _WIN32
+#include <shlobj.h> // to get paths related functions
 #include <windows.h>
 #endif
 
@@ -39,59 +45,55 @@ 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)) {
+    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 = ".";
         }
@@ -103,35 +105,47 @@ std::string Folders::getGenericDirectory(const char* ENVVAR, const std::string f
 #if PLATFORM_UNIX
 const char* Folders::getHomeDirectory()
 {
-    const char *homedir = getenv("HOME");
-    if (homedir != NULL)
+    const char* homedir = getenv("HOME");
+    if (homedir != NULL) {
         return homedir;
-    struct passwd *pw = getpwuid(getuid());
-    if (pw != NULL)
+    }
+    struct passwd* pw = getpwuid(getuid());
+    if (pw != NULL) {
         return pw->pw_dir;
+    }
     return NULL;
 }
 #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 ((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;
+}
+
+bool Folders::file_exists(const std::string& filepath)
+{
+    FILE* file;
+    file = fopen(filepath.c_str(), "rb");
+    if (file == NULL) {
         return false;
+    } else {
+        fclose(file);
+        return true;
     }
-#endif
 }