ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GameList: Re-extract memcard icon if deleted 

But don't keep trying if the game doesn't have a save.
This commit is contained in:
Stenzek 2024-07-14 12:56:37 +10:00
parent ff77bd029f
commit fd0626aa6d
No known key found for this signature in database
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/game_list.cpp
View File

@ -66,10 +66,11 @@ struct MemcardTimestampCacheEntry
{ {
enum : u32 enum : u32
{ {
MAX_SERIAL_LENGTH = 32, MAX_SERIAL_LENGTH = 31,
}; };
char serial[MAX_SERIAL_LENGTH]; char serial[MAX_SERIAL_LENGTH];
bool icon_was_extracted;
s64 memcard_timestamp; s64 memcard_timestamp;
}; };
#pragma pack(pop) #pragma pack(pop)
@ -1650,7 +1651,7 @@ std::optional<DiscRegion> GameList::GetCustomRegionForPath(const std::string_vie
return std::nullopt; return std::nullopt;
} }
static constexpr const char MEMCARD_TIMESTAMP_CACHE_SIGNATURE[] = {'M', 'C', 'D', 'I', 'C', 'N', '0', '2'}; static constexpr const char MEMCARD_TIMESTAMP_CACHE_SIGNATURE[] = {'M', 'C', 'D', 'I', 'C', 'N', '0', '3'};
FileSystem::ManagedCFilePtr GameList::OpenMemoryCardTimestampCache(bool for_write) FileSystem::ManagedCFilePtr GameList::OpenMemoryCardTimestampCache(bool for_write)
{ {
@ -1772,9 +1773,10 @@ std::string GameList::GetGameIconPath(std::string_view serial, std::string_view
{ {
if (StringUtil::EqualNoCase(index_serial, entry.serial)) if (StringUtil::EqualNoCase(index_serial, entry.serial))
{ {
if (entry.memcard_timestamp == timestamp) // user might've deleted the file, so re-extract it if so
// otherwise, card hasn't changed, still no icon
if (entry.memcard_timestamp == timestamp && !entry.icon_was_extracted)
{ {
// card hasn't changed, still no icon
ret = {}; ret = {};
return ret; return ret;
} }
@ -1791,6 +1793,7 @@ std::string GameList::GetGameIconPath(std::string_view serial, std::string_view
} }
serial_entry->memcard_timestamp = timestamp; serial_entry->memcard_timestamp = timestamp;
serial_entry->icon_was_extracted = false;
StringUtil::Strlcpy(serial_entry->serial, index_serial.view(), sizeof(serial_entry->serial)); StringUtil::Strlcpy(serial_entry->serial, index_serial.view(), sizeof(serial_entry->serial));
// Try extracting an icon. // Try extracting an icon.
@ -1809,7 +1812,8 @@ std::string GameList::GetGameIconPath(std::string_view serial, std::string_view
RGBA8Image image(MemoryCardImage::ICON_WIDTH, MemoryCardImage::ICON_HEIGHT); RGBA8Image image(MemoryCardImage::ICON_WIDTH, MemoryCardImage::ICON_HEIGHT);
std::memcpy(image.GetPixels(), &fi.icon_frames.front().pixels, std::memcpy(image.GetPixels(), &fi.icon_frames.front().pixels,
MemoryCardImage::ICON_WIDTH * MemoryCardImage::ICON_HEIGHT * sizeof(u32)); MemoryCardImage::ICON_WIDTH * MemoryCardImage::ICON_HEIGHT * sizeof(u32));
if (!image.SaveToFile(ret.c_str())) serial_entry->icon_was_extracted = image.SaveToFile(ret.c_str());
if (!serial_entry->icon_was_extracted)
{ {
ERROR_LOG("Failed to save memory card icon to {}.", ret); ERROR_LOG("Failed to save memory card icon to {}.", ret);
ret = {}; ret = {};