finally add song label updating for blacklisting songs

Author: RayDeeUx

src/SongControl.cpp

@@ -120,15 +120,16 @@ namespace SongControl {
 		if (!Utils::getBool("playlistMode")) Utils::setNewSong();
 		else Utils::constantShuffleModeNewSong();
 
+		Utils::composeAndSetCurrentSongDisplayNameOnlyWhenBlacklistingSongs();
+		Utils::queueUpdateSCMLabel();
+
 		if (songManager.isOriginalMenuLoop()) {
 			if (useCustomSongs && !customSong.empty()) return Utils::newNotification(fmt::format("Blacklisted {}. Have fun with the original menu loop. :)", customSong));
 			if (!useCustomSongs && !songName.empty()) return Utils::newNotification(fmt::format("Blacklisted {}. Have fun with the original menu loop. :)", songName));
 		}
 
 		if (!useCustomSongs) return Utils::newNotification(fmt::format("Blacklisted {} by {} ({}), now playing {}.", songName, songArtist, songID, Utils::getSongName()));
 		if (!customSong.empty()) return Utils::newNotification(fmt::format("Blacklisted {}, now playing {}.", customSong, Utils::currentCustomSong()));
-
-		Utils::queueUpdateSCMLabel();
 	}
 	void copySong() {
 		if (VANILLA_GD_MENU_LOOP_DISABLED) return;
@@ -140,7 +141,7 @@ namespace SongControl {
 		if (VANILLA_GD_MENU_LOOP_DISABLED || !Utils::getBool("enableNotification")) return;
 		Utils::newCardAndDisplayNameFromCurrentSong();
 	}
-	void shuffleSong(SongManager& songManager) {
+	void shuffleSong(const SongManager& songManager) {
 		Utils::removeCard();
 		if (VANILLA_GD_MENU_LOOP_DISABLED) return;
 

src/SongControl.hpp

@@ -10,6 +10,6 @@ namespace SongControl {
 	void blacklistSong(SongManager& songManager = SongManager::get());
 	void copySong();
 	void regenSong();
-	void shuffleSong(SongManager& songManager = SongManager::get());
+	void shuffleSong(const SongManager& songManager = SongManager::get());
 	void addSongToPlaylist(const std::string& songPath = SongManager::get().getCurrentSong());
 }

src/Utils.cpp

@@ -131,6 +131,27 @@ void Utils::newNotification(const std::string& notifString, const bool checkSett
 	card->runAction(sequence);
 }
 
+void Utils::composeAndSetCurrentSongDisplayNameOnlyWhenBlacklistingSongs() {
+	SongManager& songManager = SongManager::get();
+	const std::filesystem::path& currentSong = std::filesystem::path(songManager.getCurrentSong());
+	const std::string& songFileName = Utils::toNormalizedString(currentSong.filename());
+	const std::string& songFileExtension = Utils::toNormalizedString(currentSong.extension());
+	const std::string& customSongDisplayName = geode::utils::string::replace(songFileName, songFileExtension, "");
+	if (songManager.getLavaChicken()) return songManager.setCurrentSongDisplayName(fmt::format("{} (My condolences for your ears.)", songFileName));
+	if (Utils::getBool("useCustomSongs") && songManager.getPlaylistIsEmpty()) return songManager.setCurrentSongDisplayName(customSongDisplayName);
+	if (songManager.isOriginalMenuLoop()) return songManager.setCurrentSongDisplayName("Original Menu Loop by RobTop");
+	const size_t dotPos = songFileName.find_last_of('.');
+	if (dotPos == std::string::npos) return songManager.setCurrentSongDisplayName("Unknown");
+	const std::string& songFileNameWithoutExtension = songFileName.substr(0, dotPos);
+	geode::Result<int> songFileNameAsID = geode::utils::numFromString<int>(songFileNameWithoutExtension);
+	if (songFileNameAsID.isErr()) {
+		if (!songManager.getPlaylistIsEmpty()) return songManager.setCurrentSongDisplayName(songFileNameWithoutExtension);
+		return songManager.setCurrentSongDisplayName(fmt::format("Unknown ({})", songFileNameWithoutExtension));
+	}
+	if (SongInfoObject* songInfo = MusicDownloadManager::sharedState()->getSongInfoObject(songFileNameAsID.unwrap())) return songManager.setCurrentSongDisplayName(Utils::getFormattedNGMLSongName(songInfo));
+	return songManager.setCurrentSongDisplayName(customSongDisplayName);
+}
+
 std::string Utils::composedNotifString(std::string notifString, const std::string& middle, const std::string& suffix) {
 	SongManager& songManager = SongManager::get();
 	if (!Utils::getBool("useCustomSongs") || !songManager.getPlaylistIsEmpty()) songManager.setCurrentSongDisplayName(middle);
@@ -164,7 +185,7 @@ void Utils::newCardAndDisplayNameFromCurrentSong() {
 
 	geode::log::info("attempting to play {}", songFileName);
 	// if it's not menuLoop.mp3, then get info
-	size_t dotPos = songFileName.find_last_of('.');
+	const size_t dotPos = songFileName.find_last_of('.');
 
 	if (dotPos == std::string::npos) {
 		geode::log::error("{} was not a valid file name...? [NG/Music Library]", songFileName);

src/Utils.hpp

@@ -13,6 +13,7 @@ class Utils {
 	static void setNewSong();
 	static void constantShuffleModeNewSong(const bool fromGJBGL = false);
 	static void newNotification(const std::string& notifString, const bool checkSetting = false);
+	static void composeAndSetCurrentSongDisplayNameOnlyWhenBlacklistingSongs();
 	static std::string composedNotifString(std::string notifString, const std::string& middle, const std::string& suffix);
 	static void newCardAndDisplayNameFromCurrentSong();
 	static std::string getFormattedNGMLSongName(SongInfoObject* songInfo);