From f5ebe968c07f339f1920087fbafe260f2579115e Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 24 Jan 2024 22:50:16 -0500 Subject: [PATCH] Fix information pulling for CleanRip and UIC (fixes #637) --- CHANGELIST.md | 1 + MPF.Core/Modules/CleanRIp/Parameters.cs | 4 ++++ MPF.Core/Modules/UmdImageCreator/Parameters.cs | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/CHANGELIST.md b/CHANGELIST.md index cd1427d2..3fc61d38 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -19,6 +19,7 @@ - Differentiate CD32 from CDTV (Deterous) - Skip warning line in Redumper log - Normalise Disc Titles in Submission Info (Deterous) +- Fix information pulling for CleanRip and UIC ### 3.0.3 (2023-12-04) diff --git a/MPF.Core/Modules/CleanRIp/Parameters.cs b/MPF.Core/Modules/CleanRIp/Parameters.cs index 29c69c56..26a5407c 100644 --- a/MPF.Core/Modules/CleanRIp/Parameters.cs +++ b/MPF.Core/Modules/CleanRIp/Parameters.cs @@ -69,8 +69,12 @@ namespace MPF.Core.Modules.CleanRip info.DumpingInfo!.DumpingProgram = EnumConverter.LongName(this.InternalProgram); info.DumpingInfo.DumpingDate = InfoTool.GetFileModifiedDate(basePath + "-dumpinfo.txt")?.ToString("yyyy-MM-dd HH:mm:ss"); + // Get the Datafile information var datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt"); + // Fill in the hash data + info.TracksAndWriteOffsets!.ClrMameProData = InfoTool.GenerateDatfile(datafile); + // Get the individual hash data, as per internal if (InfoTool.GetISOHashValues(datafile, out long size, out var crc32, out var md5, out var sha1)) { diff --git a/MPF.Core/Modules/UmdImageCreator/Parameters.cs b/MPF.Core/Modules/UmdImageCreator/Parameters.cs index 10988085..e4e25d41 100644 --- a/MPF.Core/Modules/UmdImageCreator/Parameters.cs +++ b/MPF.Core/Modules/UmdImageCreator/Parameters.cs @@ -80,6 +80,15 @@ namespace MPF.Core.Modules.UmdImageCreator if (Hasher.GetFileHashes(basePath + ".iso", out long filesize, out var crc32, out var md5, out var sha1)) { + // Get the Datafile information + var datafile = new Datafile + { + Games = [new Game { Roms = [new Rom { Name = string.Empty, Size = filesize.ToString(), Crc = crc32, Md5 = md5, Sha1 = sha1, }] }] + }; + + // Fill in the hash data + info.TracksAndWriteOffsets!.ClrMameProData = InfoTool.GenerateDatfile(datafile); + info.SizeAndChecksums!.Size = filesize; info.SizeAndChecksums.CRC32 = crc32; info.SizeAndChecksums.MD5 = md5;