dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-05-12 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix trophy extraction for games with separated updates (#4355)

Browse Source
This commit is contained in:
Stephen Miller 2026-05-05 16:22:26 -05:00 committed by GitHub
parent 8175194bba
commit 4ee33c6636
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/file_format/trp.cpp
View File

@ -44,17 +44,14 @@ static void hexToBytes(const char* hex, unsigned char* dst) {
bool TRP::Extract(const std::filesystem::path& trophyPath, int index, std::string npCommId,
const std::filesystem::path& outputPath) {
std::filesystem::path trophyDir = trophyPath / "sce_sys/trophy";
if (!std::filesystem::exists(trophyDir)) {
LOG_WARNING(Common_Filesystem, "Trophy directory doesn't exist: {}", trophyDir.string());
if (!std::filesystem::exists(trophyPath)) {
LOG_WARNING(Common_Filesystem, "Trophy directory doesn't exist: {}", trophyPath.string());
return false;
}
// Collect all .trp files in the directory
std::vector<std::filesystem::path> trpFiles;
for (const auto& entry : std::filesystem::directory_iterator(trophyDir)) {
for (const auto& entry : std::filesystem::directory_iterator(trophyPath)) {
if (entry.is_regular_file() && entry.path().extension() == ".trp") {
trpFiles.push_back(entry.path());
}

18
src/emulator.cpp
View File

@ -199,15 +199,15 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
}
game_info.game_folder = game_folder;
std::filesystem::path npbindPath = game_folder / "sce_sys/npbind.dat";
std::filesystem::path trophyDir = game_folder / "sce_sys/trophy";
std::filesystem::path npbindPath = mnt->GetHostPath("/app0/sce_sys/npbind.dat");
std::filesystem::path trophyDir = mnt->GetHostPath("/app0/sce_sys/trophy");
NPBindFile npbind;
if (!npbind.Load(npbindPath.string())) {
LOG_WARNING(Common_Filesystem, "Failed to load npbind.dat file");
} else {
auto npCommIds = npbind.GetNpCommIds();
if (npCommIds.empty()) {
LOG_WARNING(Common_Filesystem, "No NPComm IDs found in npbind.dat");
if (!std::filesystem::exists(trophyDir) || npCommIds.empty()) {
LOG_WARNING(Common_Filesystem, "Cannot extract game trophies");
} else {
std::vector<std::pair<int, std::string>> trophyFiles; // (trophy_index, filename)
std::string pattern = "trophy";
@ -346,11 +346,11 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
int index = 0;
for (std::string npCommId : game_info.npCommIds) {
const auto trophyDir =
const auto trophyOutputDir =
Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "trophy" / npCommId;
if (!std::filesystem::exists(trophyDir)) {
if (!std::filesystem::exists(trophyOutputDir)) {
TRP trp;
if (!trp.Extract(game_folder, index, npCommId, trophyDir)) {
if (!trp.Extract(trophyDir, index, npCommId, trophyOutputDir)) {
LOG_ERROR(Loader, "Couldn't extract trophies");
}
}
@ -362,8 +362,8 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
auto temp = user_trophy_file.parent_path();
std::filesystem::create_directories(temp);
std::error_code discard;
std::filesystem::copy_file(trophyDir / "Xml" / "TROPCONF.XML", user_trophy_file,
discard);
std::filesystem::copy_file(trophyOutputDir / "Xml" / "TROPCONF.XML",
user_trophy_file, discard);
}
}
index++;