Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameDatabase: Fix stale database cache check

Browse source
This commit is contained in:
Stenzek 2023-09-02 23:17:56 +10:00
parent 7ad1b8d093
commit 25fb69564b
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/game_database.cpp
View file

@ -35,7 +35,7 @@ namespace GameDatabase {
enum : u32 enum : u32
{ {
GAME_DATABASE_CACHE_SIGNATURE = 0x45434C48, GAME_DATABASE_CACHE_SIGNATURE = 0x45434C48,
GAME_DATABASE_CACHE_VERSION = 4, GAME_DATABASE_CACHE_VERSION = 5,
}; };
static Entry* GetMutableEntry(const std::string_view& serial); static Entry* GetMutableEntry(const std::string_view& serial);
@ -482,13 +482,6 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
#undef BIT_FOR #undef BIT_FOR
} }
static void GetTimestamps(u64* gamedb_ts, u64* gamesettings_ts, u64* compat_ts)
{
*gamedb_ts = Host::GetResourceFileTimestamp("database/gamedb.json").value_or(0);
*gamesettings_ts = Host::GetResourceFileTimestamp("database/gamesettings.ini").value_or(0);
*compat_ts = Host::GetResourceFileTimestamp("database/compatibility.xml").value_or(0);
}
template<typename T> template<typename T>
bool ReadOptionalFromStream(ByteStream* stream, std::optional<T>* dest) bool ReadOptionalFromStream(ByteStream* stream, std::optional<T>* dest)
{ {
@ -535,21 +528,19 @@ bool GameDatabase::LoadFromCache()
return false; return false;
} }
u64 gamedb_ts, gamesettings_ts, compat_ts; const u64 gamedb_ts = Host::GetResourceFileTimestamp("gamedb.json").value_or(0);
GetTimestamps(&gamedb_ts, &gamesettings_ts, &compat_ts);
u32 signature, version, num_entries, num_codes; u32 signature, version, num_entries, num_codes;
u64 file_gamedb_ts, file_gamesettings_ts, file_compat_ts; u64 file_gamedb_ts;
if (!stream->ReadU32(&signature) || !stream->ReadU32(&version) || !stream->ReadU64(&file_gamedb_ts) || if (!stream->ReadU32(&signature) || !stream->ReadU32(&version) || !stream->ReadU64(&file_gamedb_ts) ||
!stream->ReadU64(&file_gamesettings_ts) || !stream->ReadU64(&file_compat_ts) || !stream->ReadU32(&num_entries) || !stream->ReadU32(&num_entries) || !stream->ReadU32(&num_codes) || signature != GAME_DATABASE_CACHE_SIGNATURE ||
!stream->ReadU32(&num_codes) || signature != GAME_DATABASE_CACHE_SIGNATURE ||
version != GAME_DATABASE_CACHE_VERSION) version != GAME_DATABASE_CACHE_VERSION)
{ {
Log_DevPrintf("Cache header is corrupted or version mismatch."); Log_DevPrintf("Cache header is corrupted or version mismatch.");
return false; return false;
} }
if (gamedb_ts != file_gamedb_ts || gamesettings_ts != file_gamesettings_ts || compat_ts != file_compat_ts) if (gamedb_ts != file_gamedb_ts)
{ {
Log_DevPrintf("Cache is out of date, recreating."); Log_DevPrintf("Cache is out of date, recreating.");
return false; return false;
@ -631,8 +622,7 @@ bool GameDatabase::LoadFromCache()
bool GameDatabase::SaveToCache() bool GameDatabase::SaveToCache()
{ {
u64 gamedb_ts, gamesettings_ts, compat_ts; const u64 gamedb_ts = Host::GetResourceFileTimestamp("gamedb.json").value_or(0);
GetTimestamps(&gamedb_ts, &gamesettings_ts, &compat_ts);
std::unique_ptr<ByteStream> stream( std::unique_ptr<ByteStream> stream(
ByteStream::OpenFile(GetCacheFile().c_str(), BYTESTREAM_OPEN_CREATE | BYTESTREAM_OPEN_WRITE | ByteStream::OpenFile(GetCacheFile().c_str(), BYTESTREAM_OPEN_CREATE | BYTESTREAM_OPEN_WRITE |
@ -643,8 +633,6 @@ bool GameDatabase::SaveToCache()
bool result = stream->WriteU32(GAME_DATABASE_CACHE_SIGNATURE); bool result = stream->WriteU32(GAME_DATABASE_CACHE_SIGNATURE);
result = result && stream->WriteU32(GAME_DATABASE_CACHE_VERSION); result = result && stream->WriteU32(GAME_DATABASE_CACHE_VERSION);
result = result && stream->WriteU64(static_cast<u64>(gamedb_ts)); result = result && stream->WriteU64(static_cast<u64>(gamedb_ts));
result = result && stream->WriteU64(static_cast<u64>(gamesettings_ts));
result = result && stream->WriteU64(static_cast<u64>(compat_ts));
result = result && stream->WriteU32(static_cast<u32>(s_entries.size())); result = result && stream->WriteU32(static_cast<u32>(s_entries.size()));
result = result && stream->WriteU32(static_cast<u32>(s_code_lookup.size())); result = result && stream->WriteU32(static_cast<u32>(s_code_lookup.size()));