From c166831955517d6999e6b4f48bf3085b05b06a76 Mon Sep 17 00:00:00 2001
From: TheMorc <r.gracik@gmail.com>
Date: Thu, 24 Aug 2023 08:37:48 +0200
Subject: platform.cpp switch logging to spdlog

---
 src/platform.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/platform.cpp')

diff --git a/src/platform.cpp b/src/platform.cpp
index 0117e17..70e1c20 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -103,7 +103,7 @@ std::string Platform::FindResourceFolder() {
         }
     }
 
-    puts("cant find a resources folder, will try to load from cwd");
+    spdlog::get("discord")->warn("cant find a resources folder, will try to load from cwd");
     found_path = ".";
     found = true;
     return found_path;
@@ -133,7 +133,7 @@ std::string Platform::FindConfigFile() {
     }
 
     // fallback to cwd if cant find + cant make in ~/.config
-    puts("can't find configuration file!");
+    spdlog::get("discord")->warn("can't find configuration file!");
     return "./abaddon.ini";
 }
 
@@ -147,13 +147,13 @@ std::string Platform::FindStateCacheFolder() {
         if (util::IsFolder(home_path))
             return home_path;
     }
-    puts("can't find cache folder!");
+    spdlog::get("discord")->warn("can't find cache folder!");
     return ".";
 }
 
 #else
 std::string Platform::FindResourceFolder() {
-    puts("unknown OS, trying to load resources from cwd");
+    spdlog::get("discord")->warn("unknown OS, trying to load resources from cwd");
     return ".";
 }
 
@@ -161,12 +161,12 @@ std::string Platform::FindConfigFile() {
     const auto x = std::getenv("ABADDON_CONFIG");
     if (x != nullptr)
         return x;
-    puts("unknown OS, trying to load config from cwd");
+    spdlog::get("discord")->warn("unknown OS, trying to load config from cwd");
     return "./abaddon.ini";
 }
 
 std::string Platform::FindStateCacheFolder() {
-    puts("unknown OS, setting state cache folder to cwd");
+    spdlog::get("discord")->warn("unknown OS, setting state cache folder to cwd");
     return ".";
 }
 #endif
-- 
cgit v1.2.3


From 52e6167b9a8585edc0d938b32239623300398f01 Mon Sep 17 00:00:00 2001
From: TheMorc <r.gracik@gmail.com>
Date: Wed, 23 Aug 2023 03:32:22 +0200
Subject: add hackish macOS detection for home folder, resources and cache

---
 src/platform.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'src/platform.cpp')

diff --git a/src/platform.cpp b/src/platform.cpp
index 70e1c20..0a69721 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -151,6 +151,71 @@ std::string Platform::FindStateCacheFolder() {
     return ".";
 }
 
+#elif defined(__APPLE__)
+#include <CoreFoundation/CoreFoundation.h>
+#include <pwd.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+std::string Platform::FindResourceFolder() {
+    static std::string found_path;
+    static bool found = false;
+    if (found) return found_path;
+
+    CFURLRef resourceURL = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
+    char resourcePath[PATH_MAX];
+    if (CFURLGetFileSystemRepresentation(resourceURL, true, (UInt8 *)resourcePath, PATH_MAX)) {
+        if (resourceURL != NULL) {
+            CFRelease(resourceURL);
+        }
+        found_path = resourcePath;
+        found = true;
+        return found_path;
+    }
+
+    spdlog::get("discord")->warn("cant find a resources folder, will try to load from cwd");
+    found_path = ".";
+    found = true;
+    return found_path;
+}
+
+std::string Platform::FindConfigFile() {
+    const auto cfg = std::getenv("ABADDON_CONFIG");
+    if (cfg != nullptr) return cfg;
+
+    passwd *home = getpwuid(getuid());
+    const char *homeDir = home->pw_dir;
+
+    char appSupportPath[PATH_MAX];
+    snprintf(appSupportPath, sizeof(appSupportPath), "%s/Library/Application Support", homeDir);
+
+    char homefolder_path[PATH_MAX];
+    snprintf(homefolder_path, sizeof(homefolder_path), "%s/%s", appSupportPath, "com.github.uowuo.abaddon");
+
+    if (mkdir(homefolder_path, 0755) == 0) {
+        spdlog::get("discord")->warn("created Application Support dir");
+    }
+    
+    char home_path[PATH_MAX];
+    snprintf(home_path, sizeof(home_path), "%s/%s", homefolder_path, "/abaddon.ini");
+    
+    return home_path;
+}
+
+std::string Platform::FindStateCacheFolder() {
+    
+    passwd *home = getpwuid(getuid());
+    const char *homeDir = home->pw_dir;
+
+    char appSupportPath[PATH_MAX];
+    snprintf(appSupportPath, sizeof(appSupportPath), "%s/Library/Application Support", homeDir);
+
+    char home_path[PATH_MAX];
+    snprintf(home_path, sizeof(home_path), "%s/%s", appSupportPath, "com.github.uowuo.abaddon");
+
+    return home_path;
+}
+
+
 #else
 std::string Platform::FindResourceFolder() {
     spdlog::get("discord")->warn("unknown OS, trying to load resources from cwd");
-- 
cgit v1.2.3