thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Allow specifying Md5 calculation on per-entry basis

Browse source
This commit is contained in:
Vladimir Serbinenko 2022-12-19 23:27:22 +01:00 • committed by Eugene Sandulenko
parent 275379c3d2
commit 58bb2e81d3
1 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
engines/advancedDetector.cpp
View file

@ -504,15 +504,31 @@ namespace Common {
} }
static MD5Properties gameFlagsToDefaultMD5Props(uint32 flags) { static MD5Properties gameFileToMD5Props(const ADGameFileDescription *fileEntry, uint32 gameFlags) {
MD5Properties ret = kMD5Head; MD5Properties ret = kMD5Head;
if (fileEntry && fileEntry->md5 && strchr(fileEntry->md5, ':')) {
if (flags & ADGF_MACRESFORK) { const char *ptr;
ret = (MD5Properties) (ret | kMD5MacResOrDataFork); for (ptr = fileEntry->md5; *ptr != ':'; ptr++)
switch (*ptr) {
case 'r':
ret = (MD5Properties)(ret | kMD5MacResFork);
break;
case 'd':
ret = (MD5Properties)(ret | kMD5MacDataFork);
break;
case 't':
ret = (MD5Properties)(ret | kMD5Tail);
break;
}
return ret;
} }
if (flags & ADGF_TAILMD5) { if (gameFlags & ADGF_MACRESFORK) {
ret = (MD5Properties) (ret | kMD5Tail); ret = (MD5Properties)(ret | kMD5MacResOrDataFork);
}
if (gameFlags & ADGF_TAILMD5) {
ret = (MD5Properties)(ret | kMD5Tail);
} }
return ret; return ret;
@ -615,9 +631,9 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
// they are present. Compute MD5s and file sizes for the available files. // they are present. Compute MD5s and file sizes for the available files.
for (descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameId != nullptr; descPtr += _descItemSize) { for (descPtr = _gameDescriptors; ((const ADGameDescription *)descPtr)->gameId != nullptr; descPtr += _descItemSize) {
g = (const ADGameDescription *)descPtr; g = (const ADGameDescription *)descPtr;
MD5Properties md5prop = gameFlagsToDefaultMD5Props(g->flags);
for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) { for (fileDesc = g->filesDescriptions; fileDesc->fileName; fileDesc++) {
MD5Properties md5prop = gameFileToMD5Props(fileDesc, g->flags);
Common::String fname = fileDesc->fileName; Common::String fname = fileDesc->fileName;
Common::String key = Common::String::format("%c:%s", md5PropToCacheChar(md5prop), fname.c_str()); Common::String key = Common::String::format("%c:%s", md5PropToCacheChar(md5prop), fname.c_str());
@ -666,7 +682,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
// Try to match all files for this game // Try to match all files for this game
for (fileDesc = game.desc->filesDescriptions; fileDesc->fileName; fileDesc++) { for (fileDesc = game.desc->filesDescriptions; fileDesc->fileName; fileDesc++) {
Common::String tstr = fileDesc->fileName; Common::String tstr = fileDesc->fileName;
MD5Properties md5prop = gameFlagsToDefaultMD5Props(g->flags); MD5Properties md5prop = gameFileToMD5Props(fileDesc, g->flags);
Common::String key = Common::String::format("%c:%s", md5PropToCacheChar(md5prop), tstr.c_str()); Common::String key = Common::String::format("%c:%s", md5PropToCacheChar(md5prop), tstr.c_str());
if (!filesProps.contains(key) || filesProps[key].size == -1) { if (!filesProps.contains(key) || filesProps[key].size == -1) {
@ -679,7 +695,11 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
if (game.hasUnknownFiles) if (game.hasUnknownFiles)
continue; continue;
if (fileDesc->md5 != nullptr && fileDesc->md5 != filesProps[key].md5) { const char *md5_wo_prefix = fileDesc->md5;
if (md5_wo_prefix && strchr(md5_wo_prefix, ':'))
md5_wo_prefix = strchr(md5_wo_prefix, ':') + 1;
if (md5_wo_prefix != nullptr && md5_wo_prefix != filesProps[key].md5) {
debugC(3, kDebugGlobalDetection, "MD5 Mismatch. Skipping (%s) (%s)", fileDesc->md5, filesProps[key].md5.c_str()); debugC(3, kDebugGlobalDetection, "MD5 Mismatch. Skipping (%s) (%s)", fileDesc->md5, filesProps[key].md5.c_str());
game.hasUnknownFiles = true; game.hasUnknownFiles = true;
continue; continue;
@ -770,7 +790,7 @@ ADDetectedGame AdvancedMetaEngineDetection::detectGameFilebased(const FileMap &a
debugC(4, kDebugGlobalDetection, "Matched: %s", agdesc->gameId); debugC(4, kDebugGlobalDetection, "Matched: %s", agdesc->gameId);
if (numMatchedFiles > maxNumMatchedFiles) { if (numMatchedFiles > maxNumMatchedFiles) {
MD5Properties md5prop = gameFlagsToDefaultMD5Props(agdesc->flags); MD5Properties md5prop = gameFileToMD5Props(nullptr, agdesc->flags);
maxNumMatchedFiles = numMatchedFiles; maxNumMatchedFiles = numMatchedFiles;
debugC(4, kDebugGlobalDetection, "and overridden"); debugC(4, kDebugGlobalDetection, "and overridden");