Skip to content

Commit d053761

Browse files
committed
small internal changes
1 parent cda2f03 commit d053761

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

src/hooks/GManager.cpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#include "GManager.hpp"
22
#include "../utils/GDPSMain.hpp"
33

4+
#ifdef GEODE_IS_IOS
5+
static constexpr const char* const gdpsesPath = "save/gdpses";
6+
#else
7+
static constexpr const char* const gdpsesPath = "gdpses";
8+
#endif
9+
410
std::vector<GSGManager*> GSGManager::Fields::m_managers = {};
511

612
void GSGManager::setup() {
@@ -30,11 +36,7 @@ void GSGManager::setup() {
3036
return log::error("Error after creating directory '{}', data will not save: {}", dir.string(), err.message());
3137
}
3238
}
33-
#ifdef GEODE_IS_IOS
34-
m_fileName = fmt::format("save/gdpses/{}/{}", server.saveDir, m_fileName);
35-
#else
36-
m_fileName = fmt::format("gdpses/{}/{}", server.saveDir, m_fileName);
37-
#endif
39+
m_fileName = fmt::format("{}/{}/{}", gdpsesPath, server.saveDir, m_fileName);
3840
GManager::setup();
3941
}
4042

@@ -68,11 +70,7 @@ void GSGManager::updateFileNames() {
6870
}
6971
}
7072
if (main->isActive()) {
71-
#ifdef GEODE_IS_IOS
72-
manager->m_fileName = fmt::format("save/gdpses/{}/{}", server.saveDir, manager->m_fields->m_originalFileName);
73-
#else
74-
manager->m_fileName = fmt::format("gdpses/{}/{}", server.saveDir, manager->m_fields->m_originalFileName);
75-
#endif
73+
manager->m_fileName = fmt::format("{}/{}/{}", gdpsesPath, server.saveDir, manager->m_fields->m_originalFileName);
7674
}
7775
}
7876
}

src/ui/BonusSettingsPopup.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using namespace geode::prelude;
2626
} \
2727
m_scroll->m_contentLayer->addChild(var); \
2828
m_options.push_back(var); \
29-
odd = !odd;
29+
odd = !odd
3030

3131
#define makeToggle(var, text, id, value, default, callback) \
3232
CCMenu* var = CCMenu::create(); \
@@ -51,7 +51,7 @@ using namespace geode::prelude;
5151
} \
5252
m_scroll->m_contentLayer->addChild(var); \
5353
m_options.push_back(var); \
54-
odd = !odd;
54+
odd = !odd
5555

5656
bool BonusSettingsPopup::setup() {
5757
m_scroll = ScrollLayer::create({360, 240});
@@ -73,11 +73,11 @@ bool BonusSettingsPopup::setup() {
7373
makeToggle(nintendoSwitcher, "Nintendo Switcher (2025 april fools)", "nintendo-switcher-toggle", "ss-nintendo-switcher", false, [this](CCMenuItemToggler *toggler){
7474
Mod::get()->setSavedValue("ss-nintendo-switcher", !toggler->m_toggled);
7575
m_reloadLayer = true;
76-
})
76+
});
7777
makeToggle(rainbow, "Rainbow Nodes", "rainbow-toggle", "ss-rainbow", false, [this](CCMenuItemToggler *toggler){
7878
Mod::get()->setSavedValue("ss-rainbow", !toggler->m_toggled);
7979
m_reloadLayer = true;
80-
})
80+
});
8181
makeButton(hideBtn, "hide-button", "Deactivate Menu", "GJ_button_01.png", [this](auto){
8282
geode::createQuickPopup("Are you sure?", "Are you sure you want to disable the secret settings?", "Cancel", "Yes", [this](FLAlertLayer* popup, bool second){
8383
if (second) {
@@ -94,7 +94,7 @@ bool BonusSettingsPopup::setup() {
9494
}
9595
}
9696
});
97-
})
97+
});
9898

9999
m_scroll->m_contentLayer->updateLayout();
100100
float y = 0;

src/utils/MigrationManager.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ Result<> MigrationManager::setup() {
2828
return Ok();
2929
}
3030

31-
std::string MigrationManager::urlToFilenameSafe(const std::string url) {
31+
std::string MigrationManager::urlToFilenameSafe(std::string_view url) {
3232
std::string ret = "";
33+
ret.reserve(url.size());
3334
for (char c : url) {
3435
if (std::isalnum(c) || c == '.' || c == '-' || c == '_') {
3536
ret += c;
@@ -46,7 +47,7 @@ void MigrationManager::migrateData() {
4647
auto main = GDPSMain::get();
4748
auto oldSel = Mod::get()->getSavedValue<std::string>("server", "https://www.boomlings.com/database/");
4849

49-
for (auto old : Mod::get()->getSavedValue<std::vector<GDPSTypes::OldServer>>("saved-servers")) {
50+
for (auto& old : Mod::get()->getSavedValue<std::vector<GDPSTypes::OldServer>>("saved-servers")) {
5051
auto serv = fromOldServer(old);
5152
main->m_servers[serv.id] = serv;
5253
if (oldSel == serv.url) {

src/utils/MigrationManager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ class MigrationManager {
1414
GDPSTypes::Server fromOldServer(GDPSTypes::OldServer server);
1515
public:
1616
Result<> setup();
17-
static std::string urlToFilenameSafe(std::string url);
17+
static std::string urlToFilenameSafe(std::string_view url);
1818
};

0 commit comments

Comments
 (0)