v1.4.1?

README.md

@@ -5,4 +5,6 @@ This is where she makes a mod.
 
 <img src="logo.png" width="150" alt="the mod's logo" />
 
-Read [about.md](./about.md) to learn more.
+Read [about.md](./about.md) to learn more.
+
+This [Geode mod](https://geode-sdk.org) is licensed under LGPLv2.

about.md

@@ -24,4 +24,6 @@ If you want to add your own songs to the mod you should go to the settings tab,
 
 # Discord servers
 - [Join elnexreal's Discord server](https://discord.gg/vfFazvmKKb).
-- [Join RayDeeUx's Discord server](https://discord.gg/WqZBYdBWZW) to report issues with using the mod, or [open a GitHub issue](https://github.com/elnexreal/menuloop_randomizer/issues/new).
+- [Join RayDeeUx's Discord server](https://discord.gg/WqZBYdBWZW) to report issues with using the mod, or [open a GitHub issue](https://github.com/elnexreal/menuloop_randomizer/issues/new).
+
+This [Geode mod](https://geode-sdk.org) is licensed under LGPLv2.

changelog.md

@@ -1,3 +1,6 @@
+# v1.4.1
+- Attempted to fix a weird `stoi` crash. Not sure why it happens, but it did for the one person who reported it, and they didn't really provide further context beyond a crashlog file reading `C++ Exception: class std::out_of_range("stoi argument out of range")`.
+- License the mod under LGPLv2.
 # v1.4.0
 - Added setting to choose font for "Now Playing" notifications.
 - Added an extra child folder in the mod's config directory for enabling/disabling menuloops easily. The mod itself doesn't do anything to it beyond creating the child folder.

mod.json

@@ -5,7 +5,7 @@
 		"mac": "2.206",
 		"android": "2.206"
 	},
-	"version": "v1.4.0",
+	"version": "v1.4.1",
 	"id": "elnexreal.menuloop_randomizer",
 	"name": "Menu Loop Randomizer",
 	"developers": ["RayDeeUx", "elnexreal"],

src/EditorPauseLayer.cpp

@@ -1,6 +1,9 @@
 #include "SongManager.hpp"
 #include "Utils.hpp"
 #include <Geode/modify/EditorPauseLayer.hpp>
+#include <Geode/binding/FLAlertLayer.hpp>
+#include <Geode/binding/TextArea.hpp>
+#include <Geode/utils/Cocos.hpp>
 
 using namespace geode::prelude;
 

src/MenuLayer.cpp

@@ -2,6 +2,11 @@
 #include "Utils.hpp"
 #include "ui/PlayingCard.hpp"
 #include <Geode/modify/MenuLayer.hpp>
+#include <Geode/binding/MusicDownloadManager.hpp>
+#include <Geode/binding/CCMenuItemSpriteExtra.hpp>
+#include <Geode/binding/SongInfoObject.hpp>
+#include <Geode/ui/BasedButtonSprite.hpp>
+#include <filesystem>
 
 using namespace geode::prelude;
 
@@ -45,31 +50,40 @@ class $modify(MenuLoopMLHook, MenuLayer) {
 				size_t dotPos = songFileName.string().find_last_of('.');
 
 				if (dotPos == std::string::npos) {
+					log::error("{} was not a valid file name..? [NG/Music Library]", songFileName.string());
 					notifString = notifString.append("Unknown");
-				} else {
-					songFileName = songFileName.string().substr(0, dotPos);
-
-					auto songInfo = MusicDownloadManager::sharedState()->getSongInfoObject(Utils::stoi(songFileName.string()));
-
-					// sometimes songInfo is nullptr, so improvise
-					if (songInfo) {
-						// default: "Song Name, Artist, Song ID"
-						// fmt::format("{} by {} ({})", songInfo->m_songName, songInfo->m_artistName, songInfo->m_songID);
-						std::string resultString = "";
-						auto formatSetting = Mod::get()->getSettingValue<std::string>("songFormatNGML");
-						if (formatSetting == "Song Name, Artist, Song ID") {
-							resultString = fmt::format("{} by {} ({})", songInfo->m_songName, songInfo->m_artistName, songInfo->m_songID);
-						} else if (formatSetting == "Song Name + Artist") {
-							resultString = fmt::format("{} by {}", songInfo->m_songName, songInfo->m_artistName);
-						} else if (formatSetting == "Song Name + Song ID") {
-							resultString = fmt::format("{} ({})", songInfo->m_songName, songInfo->m_songID);
-						} else {
-							resultString = fmt::format("{}", songInfo->m_songName);
-						}
-						notifString = notifString.append(resultString);
+					return;
+				}
+				std::string songFileNameAsAtring = songFileName.string().substr(0, dotPos);
+
+				Result<int> songFileNameAsID = geode::utils::numFromString<int>(songFileNameAsAtring);
+
+				if (songFileNameAsID.isErr()) {
+					log::error("{} had an invalid Song ID! [NG/Music Library]", songFileNameAsAtring);
+					notifString = notifString.append("Unknown (Invalid Song ID)");
+					return;
+				}
+
+				auto songInfo = MusicDownloadManager::sharedState()->getSongInfoObject(songFileNameAsID.unwrap());
+
+				// sometimes songInfo is nullptr, so improvise
+				if (songInfo) {
+					// default: "Song Name, Artist, Song ID"
+					// fmt::format("{} by {} ({})", songInfo->m_songName, songInfo->m_artistName, songInfo->m_songID);
+					std::string resultString = "";
+					auto formatSetting = Mod::get()->getSettingValue<std::string>("songFormatNGML");
+					if (formatSetting == "Song Name, Artist, Song ID") {
+						resultString = fmt::format("{} by {} ({})", songInfo->m_songName, songInfo->m_artistName, songInfo->m_songID);
+					} else if (formatSetting == "Song Name + Artist") {
+						resultString = fmt::format("{} by {}", songInfo->m_songName, songInfo->m_artistName);
+					} else if (formatSetting == "Song Name + Song ID") {
+						resultString = fmt::format("{} ({})", songInfo->m_songName, songInfo->m_songID);
 					} else {
-						notifString = notifString.append(songFileName.string());
+						resultString = fmt::format("{}", songInfo->m_songName);
 					}
+					notifString = notifString.append(resultString);
+				} else {
+					notifString = notifString.append(songFileName.string());
 				}
 			}
 		}

src/OptionsLayer.cpp

@@ -1,4 +1,6 @@
 #include <Geode/modify/OptionsLayer.hpp>
+#include <Geode/binding/CCMenuItemSpriteExtra.hpp>
+#include <Geode/ui/BasedButtonSprite.hpp>
 
 using namespace geode::prelude;
 

src/SongManager.cpp

@@ -1,5 +1,6 @@
 #include "SongManager.hpp"
 #include "Utils.hpp"
+#include <Geode/loader/Log.hpp>
 
 SongManager::SongManager() {}
 

src/SongManager.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#include <string>
+#include <vector>
 
 class SongManager {
   public:
@@ -20,4 +22,4 @@ class SongManager {
 	std::vector<std::string> m_songs;
 	std::string m_currentSong;
 	bool m_isMenuLoop;
-};
+};

src/Utils.cpp

@@ -1,5 +1,10 @@
+#include "SongManager.hpp"
 #include "Utils.hpp"
 #include <random>
+#include <Geode/binding/FMODAudioEngine.hpp>
+#include <Geode/binding/GameManager.hpp>
+#include <Geode/binding/MenuLayer.hpp>
+#include <Geode/loader/Mod.hpp>
 
 int Utils::randomIndex(int size) {
 	// select a random item from the vector and return the path
@@ -11,13 +16,16 @@ int Utils::randomIndex(int size) {
 	return randomIndex;
 }
 
-int Utils::stoi(std::string text) {
+uint64_t Utils::stoi(std::string text) {
 	// create a new string containing only digits
 	std::string digits;
 	std::copy_if(text.begin(), text.end(), std::back_inserter(digits), ::isdigit);
 
+	uint64_t result = std::stoi(digits);
+	if (!result) return 0;
+
 	// convert the digits string to an integer (or 0 if empty)
-	return digits.empty() ? 0 : std::stoi(digits);
+	return digits.empty() ? 0 : result;
 }
 
 bool Utils::isSupportedExtension(std::string path) {
@@ -48,8 +56,6 @@ void Utils::removeCard() {
 		card->removeMeAndCleanup();
 }
 
-#include "SongManager.hpp"
-
 void Utils::setNewSong() {
 	FMODAudioEngine::sharedEngine()->m_backgroundMusicChannel->stop();
 	SongManager::get().pickRandomSong();

src/Utils.hpp

@@ -1,13 +1,15 @@
 #pragma once
+#include <string>
+#include <Geode/cocos/base_nodes/CCNode.h>
 
 class Utils {
   public:
 	static int randomIndex(int size);
-	static int stoi(std::string);
+	static uint64_t stoi(std::string);
 	static bool isSupportedExtension(std::string);
 	static bool getBool(std::string);
 	static void removeCard();
 	static cocos2d::CCNode* findCard();
 	static cocos2d::CCNode* findCardRemotely();
 	static void setNewSong();
-};
+};

src/main.cpp

@@ -1,6 +1,9 @@
 #include "SongManager.hpp"
 #include "Utils.hpp"
 #include <Geode/loader/SettingEvent.hpp>
+#include <Geode/binding/SongInfoObject.hpp>
+#include <Geode/binding/MusicDownloadManager.hpp>
+#include <Geode/utils/Cocos.hpp>
 
 using namespace geode::prelude;
 
@@ -39,7 +42,7 @@ void populateVector(bool customSongs) {
 		- only reason it didn't work was because file support was limited to `.mp3`.
 		--raydeeux
 		*/
-		CCArrayExt<SongInfoObject *> songs = downloadManager->getDownloadedSongs();
+		CCArrayExt<SongInfoObject*> songs = downloadManager->getDownloadedSongs();
 		for (auto song : songs) {
 			if (!song) continue;
 

src/ui/PlayingCard.cpp

@@ -1,6 +1,8 @@
 #include "PlayingCard.hpp"
 #include "../Utils.hpp"
 #include <regex>
+#include <GUI/CCControlExtension/CCScale9Sprite.h>
+#include <Geode/loader/Mod.hpp>
 
 using namespace geode::prelude;
 

src/ui/PlayingCard.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <Geode/cocos/base_nodes/CCNode.h>
 
 class PlayingCard : public cocos2d::CCNode {
   protected:
@@ -8,4 +9,4 @@ class PlayingCard : public cocos2d::CCNode {
 	static PlayingCard *create(std::string);
 	cocos2d::CCPoint position;
 	const cocos2d::CCPoint cardSize = {380.0f, 55.0f};
-};
+};