less string copying

Author: RayDeeUx

src/SongControl.cpp

@@ -192,7 +192,7 @@ namespace SongControl {
 		} else songManager.resetTowerRepeatCount();
 
 		const std::filesystem::path& playlistFilePath = geode::Mod::get()->getSettingValue<std::filesystem::path>("playlistFile");
-		if (playlistFilePath.string().empty() || playlistFilePath.extension() != ".txt" || !Utils::notFavoritesNorBlacklist(playlistFilePath)) {
+		if (const std::string& normalizedPlaylistPath = Utils::toNormalizedString(playlistFilePath); normalizedPlaylistPath.empty() || Utils::toNormalizedString(playlistFilePath.extension()) != ".txt" || !Utils::notFavoritesNorBlacklist(playlistFilePath)) {
 			return geode::Notification::create(
 				"Invalid text file selected as your MLR playlist file!",
 				geode::NotificationIcon::Error, 5.f

src/Utils.cpp

@@ -637,7 +637,7 @@ void Utils::addButton(const std::string& name, const cocos2d::SEL_MenuHandler fu
 	if (menu->getLayout()) menu->updateLayout();
 }
 
-bool Utils::notFavoritesNorBlacklist(std::filesystem::path filePath) {
+bool Utils::notFavoritesNorBlacklist(const std::filesystem::path& filePath) {
 	const std::string& fileString = Utils::toNormalizedString(filePath);
 	return !geode::utils::string::endsWith(fileString, "favorites.txt") && !geode::utils::string::endsWith(fileString, "blacklist.txt");
 }
@@ -665,7 +665,7 @@ std::string Utils::generatePlatformWarning() {
 	return fmt::format("This playlist file was created using {}. ***__YOU REALLY SHOULD NOT BE SHARING THIS FILE WITH OTHERS__***, but if you have to, only share this file with other MLR users on {}.", platform, platform);
 }
 
-void Utils::writeToFile(const std::string& toWriteToFile, std::filesystem::path fileForWriting) {
+void Utils::writeToFile(const std::string& toWriteToFile, const std::filesystem::path& fileForWriting) {
 	if (!std::filesystem::exists(fileForWriting) && Utils::notFavoritesNorBlacklist(fileForWriting)) {
 		const std::string& platformWarning = Utils::generatePlatformWarning();
 		const std::string& playlistSpecificIntro = fmt::format(R"(# Welcome to a Menu Loop Randomizer playlist file!
@@ -706,12 +706,12 @@ platformWarning, platformWarning);
 		auto result = geode::utils::file::writeString(fileForWriting, playlistSpecificIntro);
 		if (result.isErr()) return geode::log::error("Error writing to {}", fileForWriting);
 	} else if (!std::filesystem::exists(fileForWriting)) return geode::log::info("error finding {}!", fileForWriting);
-	std::string toWriteToFileFinal = toWriteToFile;
-	if (geode::utils::string::endsWith(toWriteToFileFinal, " [MLR] #") && SongManager::get().getSawbladeCustomSongsFolder()) {
-		toWriteToFileFinal = geode::utils::string::replace(toWriteToFileFinal, " [MLR] #", " (Note: This was added to this file while using a non-vanilla custom songs folder location.) [MLR] #");
-	}
 	std::ofstream fileOutput;
 	fileOutput.open(fileForWriting, std::ios_base::app);
-	fileOutput << std::endl << toWriteToFileFinal;
+	if (geode::utils::string::endsWith(toWriteToFile, " [MLR] #") && SongManager::get().getSawbladeCustomSongsFolder()) {
+		fileOutput << std::endl << geode::utils::string::replace(toWriteToFile, " [MLR] #", " (Note: This was added to this file while using a non-vanilla custom songs folder location.) [MLR] #");
+	} else {
+		fileOutput << std::endl << toWriteToFile;
+	}
 	fileOutput.close();
 }

src/Utils.hpp

@@ -37,8 +37,8 @@ class Utils {
 	static void removeCardRemotely(cocos2d::CCNode* card = Utils::findCardRemotely());
 	static void queueUpdateSCMLabel();
 	static void addButton(const std::string& name, const cocos2d::SEL_MenuHandler function, cocos2d::CCMenu* menu, cocos2d::CCNode* target);
-	static bool notFavoritesNorBlacklist(std::filesystem::path fileForWriting);
+	static bool notFavoritesNorBlacklist(const std::filesystem::path& fileForWriting);
 	static std::string getPlatform();
 	static std::string generatePlatformWarning();
-	static void writeToFile(const std::string& toWriteToFile, std::filesystem::path fileForWriting);
+	static void writeToFile(const std::string& toWriteToFile, const std::filesystem::path& fileForWriting);
 };