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

Folder memcards: Improve handling of legacy folder memcards (without the index file)

This commit is contained in:
Silent 2020-12-18 23:45:37 +01:00 committed by lightningterror
parent 607b56be97
commit 19af887257
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/gui/MemoryCardFolder.cpp
View File

@ -1369,6 +1369,14 @@ std::vector<FolderMemoryCard::EnumeratedFileEntry> FolderMemoryCard::GetOrderedF
int64_t orderForDirectories = 1; int64_t orderForDirectories = 1;
int64_t orderForLegacyFiles = -1; int64_t orderForLegacyFiles = -1;
const auto getOptionalNodeAttribute = []( const YAML::Node& node, const char* attribName, auto def ) {
auto result = std::move(def);
if ( node.IsDefined() ) {
result = node[attribName].as<decltype(def)>( def );
}
return result;
};
wxString fileName; wxString fileName;
bool hasNext = dir.GetFirst( &fileName ); bool hasNext = dir.GetFirst( &fileName );
while ( hasNext ) { while ( hasNext ) {
@ -1386,9 +1394,9 @@ std::vector<FolderMemoryCard::EnumeratedFileEntry> FolderMemoryCard::GetOrderedF
const YAML::Node& node = index[ fileNameUTF8.data() ]; const YAML::Node& node = index[ fileNameUTF8.data() ];
// orderForLegacyFiles will decrement even if it ends up being unused, but that's fine // orderForLegacyFiles will decrement even if it ends up being unused, but that's fine
auto key = std::make_pair( true, node["order"].as<unsigned int>( orderForLegacyFiles-- ) ); auto key = std::make_pair( true, getOptionalNodeAttribute( node, "order", orderForLegacyFiles-- ) );
EnumeratedFileEntry entry { fileName, node["timeCreated"].as<time_t>( creationTime.GetTicks() ), EnumeratedFileEntry entry { fileName, getOptionalNodeAttribute( node, "timeCreated", creationTime.GetTicks() ),
node["timeModified"].as<time_t>( modificationTime.GetTicks() ), true }; getOptionalNodeAttribute( node, "timeModified", modificationTime.GetTicks() ), true };
sortContainer.try_emplace( std::move(key), std::move(entry) ); sortContainer.try_emplace( std::move(key), std::move(entry) );
} }
else { else {
@ -1403,8 +1411,8 @@ std::vector<FolderMemoryCard::EnumeratedFileEntry> FolderMemoryCard::GetOrderedF
// orderForDirectories will increment even if it ends up being unused, but that's fine // orderForDirectories will increment even if it ends up being unused, but that's fine
auto key = std::make_pair( false, orderForDirectories++ ); auto key = std::make_pair( false, orderForDirectories++ );
EnumeratedFileEntry entry { fileName, node["timeCreated"].as<time_t>( creationTime.GetTicks() ), EnumeratedFileEntry entry { fileName, getOptionalNodeAttribute( node, "timeCreated", creationTime.GetTicks() ),
node["timeModified"].as<time_t>( modificationTime.GetTicks() ), false }; getOptionalNodeAttribute( node, "timeModified", modificationTime.GetTicks() ), false };
sortContainer.try_emplace( std::move(key), std::move(entry) ); sortContainer.try_emplace( std::move(key), std::move(entry) );
} }