ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VMManager: Display title as serial or ELF

This commit is contained in:
Stenzek 2023-07-23 16:22:18 +10:00 committed by refractionpcsx2
parent 2539a07b7d
commit 2f105cbe15
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/CDVD/IsoReader.cpp
View File

@ -30,6 +30,12 @@ IsoReader::IsoReader() = default;
IsoReader::~IsoReader() = default;
std::string_view IsoReader::RemoveVersionIdentifierFromPath(const std::string_view& path)
{
const std::string_view::size_type pos = path.find(';');
return (pos != std::string_view::npos) ? path.substr(0, pos) : path;
}
bool IsoReader::Open(Error* error)
{
if (!ReadPVD(error))

2
pcsx2/CDVD/IsoReader.h
View File

@ -148,6 +148,8 @@ public:
IsoReader();
~IsoReader();
static std::string_view RemoveVersionIdentifierFromPath(const std::string_view& path);
const ISOPrimaryVolumeDescriptor& GetPVD() const { return m_pvd; }
// TODO: Eventually we'll want to pass a handle to the currently-open file here.

25
pcsx2/VMManager.cpp
View File

@ -17,6 +17,7 @@
#include "Achievements.h"
#include "CDVD/CDVD.h"
#include "CDVD/IsoReader.h"
#include "Counters.h"
#include "DEV9/DEV9.h"
#include "DebugTools/MIPSAnalyst.h"
@ -825,14 +826,13 @@ void VMManager::UpdateDiscDetails(bool booting)
s_disc_serial = Path::GetFileTitle(FileSystem::GetDisplayNameFromPath(s_elf_override));
s_disc_version = {};
s_disc_crc = 0; // set below
title = s_disc_serial;
}
else
{
s_disc_serial = BiosSerial;
s_disc_version = {};
s_disc_crc = 0;
title = fmt::format("PS2 BIOS ({})", BiosZone);
title = fmt::format(TRANSLATE_FS("VMManager", "PS2 BIOS ({})"), BiosZone);
}
// If we're booting an ELF, use its CRC, not the disc (if any).
@ -867,22 +867,17 @@ void VMManager::UpdateDiscDetails(bool booting)
else
{
Console.Warning(fmt::format("Serial '{}' not found in GameDB.", s_disc_serial));
// Use ELF title, otherwise the serial.
if (!s_elf_override.empty())
{
title = fmt::format("Unknown Game: {} [{}]", s_disc_serial,
Path::GetFileTitle(FileSystem::GetDisplayNameFromPath(s_elf_override)));
}
else
{
title = fmt::format("Unknown Game: {}", s_disc_serial);
}
}
}
else if (title.empty())
if (title.empty())
{
title = "Unknown Game";
if (!s_disc_serial.empty())
title = fmt::format("{} [?]", s_disc_serial);
else if (!s_disc_elf.empty())
title = fmt::format("{} [?]", Path::GetFileName(IsoReader::RemoveVersionIdentifierFromPath(s_disc_elf)));
else
title = TRANSLATE_STR("VMManager", "Unknown Game");
}
s_title = std::move(title);