libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 21:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AD: Allow mixed md5 calculation method to exist for single file

Browse Source
This commit is contained in:
Eugene Sandulenko 2021-10-19 12:45:46 +03:00
parent ec5a71e93f
commit 3146b2ffae
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/advancedDetector.cpp
View File

@ -574,18 +574,19 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
Common::String fname = Common::punycode_decodefilename(fileDesc->fileName);
Common::String key = flagsToMD5Prefix(g->flags) + ':' + fname;
if (filesProps.contains(fname))
if (filesProps.contains(key))
continue;
FileProperties tmp;
if (getFileProperties(allFiles, *g, fname, tmp)) {
debugC(3, kDebugGlobalDetection, "> '%s': '%s' %ld", fname.c_str(), tmp.md5.c_str(), tmp.size);
debugC(3, kDebugGlobalDetection, "> '%s': '%s' %ld", key.c_str(), tmp.md5.c_str(), tmp.size);
}
// Both positive and negative results are cached to avoid
// repeatedly checking for files.
filesProps[fname] = tmp;
filesProps[key] = tmp;
}
}
@ -615,25 +616,26 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
// Try to match all files for this game
for (fileDesc = game.desc->filesDescriptions; fileDesc->fileName; fileDesc++) {
Common::String tstr = Common::punycode_decodefilename(fileDesc->fileName);
Common::String key = flagsToMD5Prefix(g->flags) + ':' + tstr;
if (!filesProps.contains(tstr) || filesProps[tstr].size == -1) {
if (!filesProps.contains(key) || filesProps[key].size == -1) {
allFilesPresent = false;
break;
}
game.matchedFiles[tstr] = filesProps[tstr];
game.matchedFiles[tstr] = filesProps[key];
if (game.hasUnknownFiles)
continue;
if (fileDesc->md5 != nullptr && fileDesc->md5 != filesProps[tstr].md5) {
debugC(3, kDebugGlobalDetection, "MD5 Mismatch. Skipping (%s) (%s)", fileDesc->md5, filesProps[tstr].md5.c_str());
debugC(3, kDebugGlobalDetection, "MD5 Mismatch. Skipping (%s) (%s)", fileDesc->md5, filesProps[key].md5.c_str());
game.hasUnknownFiles = true;
continue;
}
if (fileDesc->fileSize != -1 && fileDesc->fileSize != filesProps[tstr].size) {
debugC(3, kDebugGlobalDetection, "Size Mismatch. Skipping (%ld) (%ld)", fileDesc->fileSize, filesProps[tstr].size);
debugC(3, kDebugGlobalDetection, "Size Mismatch. Skipping (%ld) (%ld)", fileDesc->fileSize, filesProps[key].size);
game.hasUnknownFiles = true;
continue;
}