From 04d7817d28696d337c67fc80cebd1928d2a73491 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 30 Oct 2023 12:45:19 -0400 Subject: [PATCH] Enable Bluray dumping with Redumper --- CHANGELIST.md | 1 + MPF.Core/Converters/EnumConverter.cs | 2 +- MPF.Core/Modules/Redumper/Parameters.cs | 13 +++++++++++-- MPF.Core/Utilities/Tools.cs | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 10c10290..d9ed0333 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -11,6 +11,7 @@ - Ignore empty protection results - Remove and Sort Usings - Update Redumper to build 244 +- Enable Bluray dumping with Redumper ### 2.7.3 (2023-10-26) diff --git a/MPF.Core/Converters/EnumConverter.cs b/MPF.Core/Converters/EnumConverter.cs index 8c91efbf..4c5cec66 100644 --- a/MPF.Core/Converters/EnumConverter.cs +++ b/MPF.Core/Converters/EnumConverter.cs @@ -93,7 +93,7 @@ namespace MPF.Core.Converters case InternalProgram.DiscImageCreator: return "DiscImageCreator"; case InternalProgram.Redumper: - return "redumper"; + return "Redumper"; #endregion diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs index 702de082..a14c9fb9 100644 --- a/MPF.Core/Modules/Redumper/Parameters.cs +++ b/MPF.Core/Modules/Redumper/Parameters.cs @@ -267,6 +267,7 @@ namespace MPF.Core.Modules.Redumper break; case MediaType.DVD: + case MediaType.BluRay: // TODO: Confirm that this information outputs if (!File.Exists($"{basePath}_logs.zip") || !preCheck) { if (!File.Exists($"{basePath}.log")) @@ -376,6 +377,7 @@ namespace MPF.Core.Modules.Redumper break; case MediaType.DVD: + case MediaType.BluRay: // TODO: Confirm any differences between outputs #if NET48 info.Extras.PVD = GetPVD($"{basePath}.log") ?? "Disc has no PVD"; info.TracksAndWriteOffsets.ClrMameProData = GetDatfile($"{basePath}.log"); @@ -397,6 +399,7 @@ namespace MPF.Core.Modules.Redumper info.SizeAndChecksums.SHA1 = sha1; } + // TODO: Support multiple layerbreaks when implemented string layerbreak = GetLayerbreak($"{basePath}.log") ?? string.Empty; #if NET48 info.SizeAndChecksums.Layerbreak = !string.IsNullOrEmpty(layerbreak) ? Int64.Parse(layerbreak) : default; @@ -968,6 +971,7 @@ namespace MPF.Core.Modules.Redumper break; case MediaType.DVD: + case MediaType.BluRay: // TODO: Confirm that this information outputs if (File.Exists($"{basePath}.log")) logFiles.Add($"{basePath}.log"); if (File.Exists($"{basePath}.manufacturer")) @@ -1044,9 +1048,13 @@ namespace MPF.Core.Modules.Redumper protected override void SetDefaultParameters(string? drivePath, string filename, int? driveSpeed, Options options) #endif { - // If we don't have a CD or DVD, we can't dump using redumper - if (this.Type != MediaType.CDROM && this.Type != MediaType.DVD) + // If we don't have a CD, DVD, or BD, we can't dump using redumper + if (this.Type != MediaType.CDROM + && this.Type != MediaType.DVD + && this.Type != MediaType.BluRay) + { return; + } BaseCommand = CommandStrings.NONE; switch (this.Type) @@ -1632,6 +1640,7 @@ namespace MPF.Core.Modules.Redumper /// /// Log file location /// Layerbreak if possible, null on error + /// TODO: Support multiple layerbreaks when added #if NET48 private static string GetLayerbreak(string log) #else diff --git a/MPF.Core/Utilities/Tools.cs b/MPF.Core/Utilities/Tools.cs index 1721c17c..366ca48c 100644 --- a/MPF.Core/Utilities/Tools.cs +++ b/MPF.Core/Utilities/Tools.cs @@ -167,6 +167,7 @@ namespace MPF.Core.Utilities case MediaType.CDROM: case MediaType.DVD: case MediaType.GDROM: + case MediaType.BluRay: return true; // All other formats considered unsupported @@ -208,7 +209,8 @@ namespace MPF.Core.Utilities // Formats considered at least partially supported by Redumper MediaType.CDROM or MediaType.DVD - or MediaType.GDROM => true, + or MediaType.GDROM + or MediaType.BluRay => true, // All other formats considered unsupported _ => false,