h

Author: Kingminer7

CMakeLists.txt

@@ -8,7 +8,7 @@ else()
 	set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
 
-project(GDPSSwitcher VERSION 1.4.1)
+project(GDPSSwitcher VERSION 1.4.2)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS
     src/*.cpp

changelog.md

@@ -1,6 +1,10 @@
+# 1.4.2
+### Some minor fixes
+- <cy>Fix saving from GDPS Hub and a deletion issue (found by tt_kybersport)</c>
+- <cy>Make deleting a server delete the save file</c>
 # 1.4.1
 ### API Fix
-- <cy>Fix API for mods like GDPS Hub</c>
+- <cy>Fix API for mods like GDPS Hub (found by tt_kybersport)</c>
 # 1.4.0
 ### Major changes
 - <cg>Added regex to urls</c>

mod.json

@@ -6,7 +6,7 @@
 		"mac": "2.2074",
 		"ios": "2.2074"
 	},
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"id": "km7dev.gdps-switcher",
 	"name": "GDPS Switcher",
 	"developer": "km7dev",

src/apis/GDPSUtils.cpp

@@ -1,7 +1,9 @@
 // MUST be defined before including the header.
 #define GEODE_DEFINE_EVENT_EXPORTS
 #include <GDPSUtils.hpp>
+#include "../ui/ServerListLayer.hpp"
 #include "../utils/GDPSMain.hpp"
+#include <km7dev.server_api/include/ServerAPIEvents.hpp>
 
 using namespace geode::prelude;
 
@@ -21,6 +23,7 @@ Result<int> GDPSUtils::createServer(std::string name, std::string url, std::stri
     server.id = id;
     server.saveDir = saveDir.empty() ? fmt::format("{}", id) : saveDir;
     GDPSMain::get()->m_servers[id] = server;
+    GDPSMain::get()->save();
     return Ok(id);
 }
 
@@ -59,10 +62,14 @@ Result<bool> GDPSUtils::deleteServer(int id) {
     if (it == GDPSMain::get()->m_servers.end()) {
         return Err("Server not found");
     }
-    GDPSMain::get()->m_servers.erase(it);
     if (GDPSMain::get()->m_currentServer == id) {
-        GDPSMain::get()->m_currentServer = -1;
+        ServerListLayer::m_selectedServer = -2;
+        Mod::get()->setSavedValue("current", -2);
+        GDPSMain::get()->m_shouldSaveGameData = false;
+        std::filesystem::remove_all(geode::dirs::getSaveDir() / "gdpses" / it->second.saveDir);
     }
+    GDPSMain::get()->m_servers.erase(it);
+    GDPSMain::get()->save();
     return Ok(true);
 }
 
@@ -98,5 +105,8 @@ Result<bool> GDPSUtils::setServerInfo(int id, std::string name, std::string url,
     if (!saveDir.empty()) {
         server.saveDir = saveDir;
     }
+    if (GDPSMain::get()->m_currentServer == id) {
+        ServerAPIEvents::updateServer(GDPSMain::get()->m_serverApiId, server.url);
+    }
     return Ok(true);
 }

src/hooks/GManager.cpp

@@ -6,7 +6,41 @@
 using namespace geode::prelude;
 
 class $modify(GSGManager, GManager) {
-        void setup() override {
+
+    struct Fields {
+        static std::vector<GSGManager*> m_managers;
+        std::string m_originalFileName;
+    };
+
+    void setup() override {
+        if (getUserObject("GDPS_DONT_CHANGE"_spr)) return GManager::setup();
+        const auto main = GDPSMain::get();
+        if (!main->isActive()) return GManager::setup();
+        if (m_fields->m_originalFileName != "") return GManager::setup();
+        
+        m_fields->m_originalFileName = m_fileName;
+        GSGManager::Fields::m_managers.push_back(this);
+
+        auto server = main->m_servers[main->m_currentServer];
+        const auto dir = geode::dirs::getSaveDir() / "gdpses" / server.saveDir;
+
+        std::error_code error;
+        if (!std::filesystem::exists(dir) && !std::filesystem::create_directory(dir, error)) {
+            main->registerIssue(fmt::format("Failed to setup save file: {}", error.message()));
+            return log::error("Failed to create directory '{}', data will not save: {}", dir.string(), error.message());
+        }
+
+        m_fileName = fmt::format("gdpses/{}/{}", server.saveDir, m_fileName);
+        GManager::setup();
+    }
+    void save() {
+        if (GDPSMain::get()->m_shouldSaveGameData) GManager::save();
+    }
+    static void updateFileName() {
+        
+        
+
+        for (auto manager : Fields::m_managers) {
             const auto main = GDPSMain::get();
             auto server = main->m_servers[main->m_currentServer];
             const auto dir = geode::dirs::getSaveDir() / "gdpses" / server.saveDir;
@@ -16,8 +50,10 @@ class $modify(GSGManager, GManager) {
                 return log::error("Failed to create directory '{}', data will not save: {}", dir.string(), error.message());
             }
             if (main->isActive()) {
-                m_fileName = fmt::format("gdpses/{}/{}", server.saveDir, m_fileName);
+                manager->m_fileName = fmt::format("gdpses/{}/{}", server.saveDir, manager->m_fields->m_originalFileName);
             }
-            GManager::setup();
         }
-};
+    }
+};
+
+std::vector<GSGManager*> GSGManager::Fields::m_managers = {};

src/hooks/MusicDownloadManager.cpp

@@ -0,0 +1,21 @@
+#include "../utils/GDPSMain.hpp"
+
+#include <Geode/Geode.hpp>
+#include <Geode/modify/MusicDownloadManager.hpp>
+
+using namespace geode::prelude;
+
+class $modify(GSMDM, MusicDownloadManager) {
+
+    gd::string pathForSFXFolder(int p0) {
+        gd::string ret = MusicDownloadManager::pathForSFXFolder(p0);
+        log::info("{}", ret);
+        return ret;
+    }
+
+    gd::string pathForSongFolder(int p0) {
+        gd::string ret = MusicDownloadManager::pathForSongFolder(p0);
+        log::info("{}", ret);
+        return ret;
+    }
+};

src/ui/ModifyServerPopup.cpp

@@ -161,7 +161,7 @@ void ModifyServerPopup::onSave(cocos2d::CCObject *sender) {
         server.url = m_urlInput->getString();
         server.saveDir = m_saveInput->getString().empty() ? fmt::format("{}", m_server.id) : m_saveInput->getString();
         if (gdpsMain->m_currentServer == server.id) {
-            ServerAPIEvents::updateServer(server.id, server.url);
+            ServerAPIEvents::updateServer(GDPSMain::get()->m_serverApiId, server.url);
         }
         ServerInfoManager::get()->fetch(server);
     }

src/ui/ServerNode.cpp

@@ -246,10 +246,16 @@ void ServerNode::onEdit(CCObject *sender) {
 
 void ServerNode::onDelete(CCObject *sender) {
     if (m_locked) return;
-    createQuickPopup("Delete Server", fmt::format("Are you sure you want to delete {}?", m_server.name), "No", "Yes", [this](auto, bool second) {
+    createQuickPopup("Delete Server", fmt::format("Are you sure you want to delete {}? This will delete your save data for the server.", m_server.name), "No", "Yes", [this](auto, bool second) {
         if (second) {
-            GDPSMain::get()->m_servers.erase(m_server.id);
-            GDPSMain::get()->save();
+            auto main = GDPSMain::get();
+            main->m_shouldSaveGameData = false;
+            std::filesystem::remove_all(geode::dirs::getSaveDir() / "gdpses" / m_server.saveDir);
+            log::debug("Deleting {}", geode::dirs::getSaveDir() / "gdpses" / m_server.saveDir);
+            main->m_servers.erase(m_server.id);
+            main->save();
+            m_listLayer->m_selectedServer = -2;
+            Mod::get()->setSavedValue("current", -2);
             m_listLayer->updateList();
         }
     });

src/utils/GDPSMain.hpp

@@ -24,4 +24,5 @@ class GDPSMain {
         std::map<int, GDPSTypes::Server> m_servers;
         int m_currentServer = -2;
         int m_serverApiId = 0;
+        bool m_shouldSaveGameData = true;
 };