Fix fake game ID generation to work with scoped storage

hrydgard · Jan 23, 2024 · 2e16fd3 · 2e16fd3
1 parent 796787d
commit 2e16fd3
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/Core/ELF/ParamSFO.cpp b/Core/ELF/ParamSFO.cpp
@@ -96,7 +96,7 @@ std::vector<std::string> ParamSFOData::GetKeys() const {
 std::string ParamSFOData::GetDiscID() {
 	const std::string discID = GetValueString("DISC_ID");
 	if (discID.empty()) {
-		std::string fakeID = GenerateFakeID();
+		std::string fakeID = GenerateFakeID(Path());
 		WARN_LOG(LOADER, "No DiscID found - generating a fake one: '%s' (from %s)", fakeID.c_str(), PSP_CoreParameter().fileToStart.c_str());
 		ValueData data;
 		data.type = VT_UTF8;
@@ -320,15 +320,15 @@ void ParamSFOData::ValueData::SetData(const u8* data, int size) {
 	u_size = size;
 }
 
-std::string ParamSFOData::GenerateFakeID(const std::string &filename) const {
+std::string ParamSFOData::GenerateFakeID(const Path &filename) const {
 	// Generates fake gameID for homebrew based on it's folder name.
 	// Should probably not be a part of ParamSFO, but it'll be called in same places.
-	std::string file = PSP_CoreParameter().fileToStart.ToString();
+	// FileToStart here is actually a directory name, not a file, so taking GetFilename on it gets what we want.
+	Path path = PSP_CoreParameter().fileToStart;
 	if (!filename.empty())
-		file = filename;
+		path = filename;
 
-	std::size_t lslash = file.find_last_of("/");
-	file = file.substr(lslash + 1);
+	std::string file = path.GetFilename();
 
 	int sumOfAllLetters = 0;
 	for (char &c : file) {

diff --git a/Core/ELF/ParamSFO.h b/Core/ELF/ParamSFO.h
@@ -24,6 +24,8 @@
 #include "Common/CommonTypes.h"
 #include "Common/Log.h"
 
+class Path;
+
 class ParamSFOData
 {
 public:
@@ -36,7 +38,7 @@ class ParamSFOData
 	const u8 *GetValueData(const std::string &key, unsigned int *size) const;
 
 	std::vector<std::string> GetKeys() const;
-	std::string GenerateFakeID(const std::string &filename = "") const;
+	std::string GenerateFakeID(const Path &filename) const;
 
 	std::string GetDiscID();
 

diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp
@@ -449,7 +449,7 @@ bool Load_PSP_ELF_PBP(FileLoader *fileLoader, std::string *error_string) {
 		homebrewTitle = homebrewName;
 	std::string discID = g_paramSFO.GetDiscID();
 	std::string discVersion = g_paramSFO.GetValueString("DISC_VERSION");
-	std::string madeUpID = g_paramSFO.GenerateFakeID();
+	std::string madeUpID = g_paramSFO.GenerateFakeID(Path());
 
 	std::string title = StringFromFormat("%s : %s", discID.c_str(), homebrewTitle.c_str());
 	INFO_LOG(LOADER, "%s", title.c_str());

diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
@@ -524,7 +524,7 @@ namespace SaveState
 		std::string discId = g_paramSFO.GetValueString("DISC_ID");
 		std::string discVer = g_paramSFO.GetValueString("DISC_VERSION");
 		if (discId.empty()) {
-			discId = g_paramSFO.GenerateFakeID();
+			discId = g_paramSFO.GenerateFakeID(Path());
 			discVer = "1.00";
 		}
 		return StringFromFormat("%s_%s", discId.c_str(), discVer.c_str());

diff --git a/GPU/Vulkan/TextureCacheVulkan.cpp b/GPU/Vulkan/TextureCacheVulkan.cpp
@@ -496,6 +496,7 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
 	}
 
 	if (plan.saveTexture) {
+		INFO_LOG(G3D, "About to save texture");
 		actualFmt = VULKAN_8888_FORMAT;
 	}
 
@@ -647,6 +648,8 @@ void TextureCacheVulkan::BuildTexture(TexCacheEntry *const entry) {
 			}
 			// Format might be wrong in lowMemoryMode_, so don't save.
 			if (plan.saveTexture && !lowMemoryMode_) {
+				INFO_LOG(G3D, "Calling NotifyTextureDecoded %08x", entry->addr);
+
 				// When hardware texture scaling is enabled, this saves the original.
 				int w = dataScaled ? mipWidth : mipUnscaledWidth;
 				int h = dataScaled ? mipHeight : mipUnscaledHeight;

diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp
@@ -57,7 +57,7 @@ bool CwCheatScreen::TryLoadCheatInfo() {
 	}
 	if ((info->id.empty() || !info->disc_total)
 		&& gamePath_.FilePathContainsNoCase("PSP/GAME/")) {
-		gameID = g_paramSFO.GenerateFakeID(gamePath_.ToString());
+		gameID = g_paramSFO.GenerateFakeID(gamePath_);
 	}
 
 	if (!engine_ || gameID != gameID_) {

diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp
@@ -472,7 +472,7 @@ class GameInfoWorkItem : public Task {
 					if ((info_->id.empty() || !info_->disc_total)
 						&& gamePath_.FilePathContainsNoCase("PSP/GAME/")
 						&& info_->fileType == IdentifiedFileType::PSP_PBP_DIRECTORY) {
-						info_->id = g_paramSFO.GenerateFakeID(gamePath_.ToString());
+						info_->id = g_paramSFO.GenerateFakeID(gamePath_);
 						info_->id_version = info_->id + "_1.00";
 						info_->region = GAMEREGION_MAX + 1; // Homebrew
 					}
@@ -529,7 +529,7 @@ class GameInfoWorkItem : public Task {
 			// An elf on its own has no usable information, no icons, no nothing.
 			{
 				std::lock_guard<std::mutex> lock(info_->lock);
-				info_->id = g_paramSFO.GenerateFakeID(gamePath_.ToString());
+				info_->id = g_paramSFO.GenerateFakeID(gamePath_);
 				info_->id_version = info_->id + "_1.00";
 				info_->region = GAMEREGION_MAX + 1; // Homebrew
 

diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
@@ -452,7 +452,7 @@ UI::EventReturn GameScreen::OnGameSettings(UI::EventParams &e) {
 	if (info && info->paramSFOLoaded) {
 		std::string discID = info->paramSFO.GetValueString("DISC_ID");
 		if ((discID.empty() || !info->disc_total) && gamePath_.FilePathContainsNoCase("PSP/GAME/"))
-			discID = g_paramSFO.GenerateFakeID(gamePath_.ToString());
+			discID = g_paramSFO.GenerateFakeID(gamePath_);
 		screenManager()->push(new GameSettingsScreen(gamePath_, discID, true));
 	}
 	return UI::EVENT_DONE;