Update Redumper to build 311 (#622)

* Update redumper to build 311

* Update changelog

* Deal with new redumper parameters properly

CHANGELIST.md

@@ -8,6 +8,7 @@
 - Support redumper skeleton and hash files (Deterous)
 - Support ringcode and PIC for triple/quad-layer (fuzz6001)
 - Cleanup !protectionInfo.txt (Deterous)
+- Update Redumper to build 311 (Deterous)
 
 ### 3.0.3 (2023-12-04)
 

MPF.Core/Modules/Redumper/Constants.cs

@@ -10,8 +10,11 @@ namespace MPF.Core.Modules.Redumper
         public const string DVD = "dvd"; // Synonym for CD
         public const string BluRay = "bd"; // Synonym for CD
         public const string SACD = "sacd"; // Synonym for CD
+        public const string Rings = "rings";
         public const string Dump = "dump";
+        public const string DumpNew = "dumpnew"; // Temporary command, to be removed later
         public const string Refine = "refine";
+        public const string RefineNew = "refinenew"; // Temporary command, to be removed later
         public const string Verify = "verify";
         public const string DVDKey = "dvdkey";
         public const string DVDIsoKey = "dvdisokey";
@@ -30,6 +33,7 @@ namespace MPF.Core.Modules.Redumper
         // General
         public const string HelpLong = "--help";
         public const string HelpShort = "-h";
+        public const string Version = "--version";
         public const string Verbose = "--verbose";
         public const string Debug = "--debug";
         public const string Drive = "--drive";
@@ -48,7 +52,7 @@ namespace MPF.Core.Modules.Redumper
         public const string DriveSectorOrder = "--drive-sector-order";
 
         // Drive Specific
-        public const string PlextorLeadinSkip = "--plextor-leadin-skip";
+        public const string PlextorSkipLeadin = "--plextor-skip-leadin";
         public const string PlextorLeadinRetries = "--plextor-leadin-retries";
         public const string AsusSkipLeadout = "--asus-skip-leadout";
 
@@ -70,7 +74,10 @@ namespace MPF.Core.Modules.Redumper
         public const string LBAEnd = "--lba-end";
         public const string RefineSubchannel = "--refine-subchannel";
         public const string Skip = "--skip";
+        public const string DumpWriteOffset = "--dump-write-offset";
         public const string DumpReadSize = "--dump-read-size";
         public const string OverreadLeadout = "--overread-leadout";
+        public const string LegacySubs = "--legacy-subs";
+        public const string DisableCDText = "--disable-cdtext";
     }
 }

MPF.Core/Modules/Redumper/Parameters.cs

@@ -146,6 +146,11 @@ namespace MPF.Core.Modules.Redumper
         /// </summary>
         public string? SkipValue { get; set; }
 
+        /// <summary>
+        /// Write offset for dumps when reading as data
+        /// </summary>
+        public int? DumpWriteOffsetValue { get; set; }
+
         /// <summary>
         /// Number of sectors to read at once on initial dump, DVD only (Default 32)
         /// </summary>
@@ -578,6 +583,10 @@ namespace MPF.Core.Modules.Redumper
             if (this[FlagStrings.HelpLong] == true)
                 parameters.Add(FlagStrings.HelpLong);
 
+            // Version
+            if (this[FlagStrings.Version] == true)
+                parameters.Add(FlagStrings.Version);
+
             // Verbose
             if (this[FlagStrings.Verbose] == true)
                 parameters.Add(FlagStrings.Verbose);
@@ -676,8 +685,8 @@ namespace MPF.Core.Modules.Redumper
             #region Drive Specific
 
             // Plextor Leadin Skip
-            if (this[FlagStrings.PlextorLeadinSkip] == true)
-                parameters.Add(FlagStrings.PlextorLeadinSkip);
+            if (this[FlagStrings.PlextorSkipLeadin] == true)
+                parameters.Add(FlagStrings.PlextorSkipLeadin);
 
             // Plextor Leadin Retries
             if (this[FlagStrings.PlextorLeadinRetries] == true)
@@ -772,6 +781,13 @@ namespace MPF.Core.Modules.Redumper
                     parameters.Add($"{FlagStrings.Skip}={SkipValue}");
             }
 
+            // Dump Write Offset
+            if (this[FlagStrings.DumpWriteOffset] == true)
+            {
+                if (DumpWriteOffsetValue != null)
+                    parameters.Add($"{FlagStrings.DumpWriteOffset}={DumpWriteOffsetValue}");
+            }
+
             // Dump Read Size
             if (this[FlagStrings.DumpReadSize] == true)
             {
@@ -783,6 +799,14 @@ namespace MPF.Core.Modules.Redumper
             if (this[FlagStrings.OverreadLeadout] == true)
                 parameters.Add(FlagStrings.OverreadLeadout);
 
+            // Legacy Subs
+            if (this[FlagStrings.LegacySubs] == true)
+                parameters.Add(FlagStrings.LegacySubs);
+
+            // Disable CD Text
+            if (this[FlagStrings.DisableCDText] == true)
+                parameters.Add(FlagStrings.DisableCDText);
+
             #endregion
 
             return string.Join(" ", [.. parameters]);
@@ -799,6 +823,7 @@ namespace MPF.Core.Modules.Redumper
                     // General
                     FlagStrings.HelpLong,
                     FlagStrings.HelpShort,
+                    FlagStrings.Version,
                     FlagStrings.Verbose,
                     FlagStrings.Debug,
                     FlagStrings.Drive,
@@ -817,7 +842,7 @@ namespace MPF.Core.Modules.Redumper
                     FlagStrings.DriveSectorOrder,
 
                     // Drive Specific
-                    FlagStrings.PlextorLeadinSkip,
+                    FlagStrings.PlextorSkipLeadin,
                     FlagStrings.PlextorLeadinRetries,
                     FlagStrings.AsusSkipLeadout,
 
@@ -839,8 +864,11 @@ namespace MPF.Core.Modules.Redumper
                     FlagStrings.LBAEnd,
                     FlagStrings.RefineSubchannel,
                     FlagStrings.Skip,
+                    FlagStrings.DumpWriteOffset,
                     FlagStrings.DumpReadSize,
                     FlagStrings.OverreadLeadout,
+                    FlagStrings.LegacySubs,
+                    FlagStrings.DisableCDText,
                 ],
             };
         }
@@ -1116,8 +1144,11 @@ namespace MPF.Core.Modules.Redumper
                     case CommandStrings.DVD:
                     case CommandStrings.BluRay:
                     case CommandStrings.SACD:
+                    case CommandStrings.Rings:
                     case CommandStrings.Dump:
+                    case CommandStrings.DumpNew: // Temporary command, to be removed later
                     case CommandStrings.Refine:
+                    case CommandStrings.RefineNew: // Temporary command, to be removed later
                     case CommandStrings.Verify:
                     case CommandStrings.DVDKey:
                     case CommandStrings.DVDIsoKey:
@@ -1160,6 +1191,9 @@ namespace MPF.Core.Modules.Redumper
                 // Help
                 ProcessFlagParameter(parts, FlagStrings.HelpShort, FlagStrings.HelpLong, ref i);
 
+                // Version
+                ProcessFlagParameter(parts, FlagStrings.Version, ref i);
+
                 // Verbose
                 ProcessFlagParameter(parts, FlagStrings.Verbose, ref i);
 
@@ -1232,8 +1266,8 @@ namespace MPF.Core.Modules.Redumper
 
                 #region Drive Specific
 
-                // Plextor Leadin Skip
-                ProcessFlagParameter(parts, FlagStrings.PlextorLeadinSkip, ref i);
+                // Plextor Skip Leadin
+                ProcessFlagParameter(parts, FlagStrings.PlextorSkipLeadin, ref i);
 
                 // Plextor Leadin Retries
                 intValue = ProcessInt32Parameter(parts, FlagStrings.PlextorLeadinRetries, ref i);
@@ -1306,14 +1340,25 @@ namespace MPF.Core.Modules.Redumper
                 if (!string.IsNullOrEmpty(stringValue))
                     SkipValue = stringValue;
 
-                // Skip
+                // Dump Write Offset
+                intValue = ProcessInt32Parameter(parts, FlagStrings.DumpWriteOffset, ref i);
+                if (intValue != null && intValue != Int32.MinValue)
+                    DumpWriteOffsetValue = intValue;
+
+                // Dump Read Size
                 intValue = ProcessInt32Parameter(parts, FlagStrings.DumpReadSize, ref i);
-                if (!string.IsNullOrEmpty(stringValue))
+                if (intValue != null && intValue != Int32.MinValue)
                     DumpReadSizeValue = intValue;
 
                 // Overread Leadout
                 ProcessFlagParameter(parts, FlagStrings.OverreadLeadout, ref i);
 
+                // Legacy Subs
+                ProcessFlagParameter(parts, FlagStrings.LegacySubs, ref i);
+
+                // Disable CD Text
+                ProcessFlagParameter(parts, FlagStrings.DisableCDText, ref i);
+
                 #endregion
             }
 

appveyor.yml

@@ -48,8 +48,8 @@ after_build:
 - 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Creator Release_ANSI\*
 
 # Redumper
-- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_294/redumper-2023.12.08_build294-win64.zip
-- 7z e redumper-2023.12.08_build294-win64.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Redumper redumper-2023.12.08_build294-win64\bin\*
+- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_311/redumper-2024.01.08_build311-win64.zip
+- 7z e redumper-2024.01.08_build311-win64.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Redumper redumper-2024.01.08_build311-win64\bin\*
 
 # Create MPF Debug archives
 - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net8.0-windows\win-x64\publish\