Update Redumper to build 416

SabreTools · Oct 13, 2024 · 172a0fb · 172a0fb
1 parent 83a189a
commit 172a0fb
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 32 deletions.
diff --git a/.github/workflows/build_ui.yml b/.github/workflows/build_ui.yml
@@ -37,10 +37,10 @@ jobs:
 
     - name: Bundle Redumper
       run: |
-        wget https://github.com/superg/redumper/releases/download/build_371/redumper-2024.05.27_build371-win64.zip
-        unzip redumper-2024.05.27_build371-win64.zip
+        wget https://github.com/superg/redumper/releases/download/build_416/redumper-2024.10.12_build416-win64.zip
+        unzip redumper-2024.10.12_build416-win64.zip
         mkdir -p MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper
-        mv redumper-2024.05.27_build371-win64/bin/redumper.exe MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/
+        mv redumper-2024.10.12_build416-win64/bin/redumper.exe MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/
 
     - name: Archive build
       run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/

diff --git a/CHANGELIST.md b/CHANGELIST.md
@@ -11,6 +11,7 @@
 - Remove ReadLine in list commands
 - Sum track errors in Redumper
 - Format CleanRip BCA wtih 2-byte blocks
+- Update Redumper to build 416
 
 ### 3.2.2 (2024-09-24)
 

diff --git a/MPF.Processors/DiscImageCreator.cs b/MPF.Processors/DiscImageCreator.cs
@@ -328,12 +328,15 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         if (!string.IsNullOrEmpty(info.Extras.Header))
                             info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
 
-                        if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate))
+                        if (GetGDROMBuildInfo(info.Extras.Header,
+                            out var serial,
+                            out var version,
+                            out var date))
                         {
                             // Ensure internal serial is pulled from local data
-                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty;
-                            info.VersionAndEditions!.Version = gdVersion ?? string.Empty;
-                            info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty;
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
+                            info.VersionAndEditions!.Version = version ?? string.Empty;
+                            info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
                         }
                     }
 
@@ -364,12 +367,15 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         if (!string.IsNullOrEmpty(info.Extras.Header))
                             info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
 
-                        if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate))
+                        if (GetGDROMBuildInfo(info.Extras.Header,
+                            out var serial,
+                            out var version,
+                            out var date))
                         {
                             // Ensure internal serial is pulled from local data
-                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty;
-                            info.VersionAndEditions!.Version = gdVersion ?? string.Empty;
-                            info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty;
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
+                            info.VersionAndEditions!.Version = version ?? string.Empty;
+                            info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
                         }
                     }
 
@@ -384,12 +390,15 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         if (!string.IsNullOrEmpty(info.Extras.Header))
                             info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
 
-                        if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate))
+                        if (GetGDROMBuildInfo(info.Extras.Header,
+                            out var serial,
+                            out var version,
+                            out var date))
                         {
                             // Ensure internal serial is pulled from local data
-                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty;
-                            info.VersionAndEditions!.Version = gdVersion ?? string.Empty;
-                            info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty;
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
+                            info.VersionAndEditions!.Version = version ?? string.Empty;
+                            info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
                         }
                     }
 
@@ -404,12 +413,15 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         if (!string.IsNullOrEmpty(info.Extras.Header))
                             info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
 
-                        if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate))
+                        if (GetGDROMBuildInfo(info.Extras.Header,
+                            out var serial,
+                            out var version,
+                            out var date))
                         {
                             // Ensure internal serial is pulled from local data
-                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty;
-                            info.VersionAndEditions!.Version = gdVersion ?? string.Empty;
-                            info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty;
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
+                            info.VersionAndEditions!.Version = version ?? string.Empty;
+                            info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
                         }
                     }
 
@@ -424,12 +436,15 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         if (!string.IsNullOrEmpty(info.Extras.Header))
                             info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
 
-                        if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate))
+                        if (GetGDROMBuildInfo(info.Extras.Header,
+                            out var serial,
+                            out var version,
+                            out var date))
                         {
                             // Ensure internal serial is pulled from local data
-                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty;
-                            info.VersionAndEditions!.Version = gdVersion ?? string.Empty;
-                            info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty;
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
+                            info.VersionAndEditions!.Version = version ?? string.Empty;
+                            info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
                         }
                     }
 
@@ -1899,7 +1914,7 @@ private static bool GetVolumeLabels(string volDesc, out Dictionary<string, List<
                     while (sr.ReadLine()?.Trim()?.StartsWith("========== Offset") == false) ;
                     if (sr.EndOfStream)
                         break;
-                    
+
                     sr.ReadLine(); // Combined Offset
                     sr.ReadLine(); // Drive Offset
                     sr.ReadLine(); // Separator line

diff --git a/MPF.Processors/Redumper.cs b/MPF.Processors/Redumper.cs
@@ -865,6 +865,10 @@ private static bool GetErrorCount(string log, out long redumpErrors, out long c2
                     {
                         buildDate = line.Substring("build date: ".Length).Trim();
                     }
+                    else if (line.StartsWith("version:"))
+                    {
+                        version = line.Substring("version: ".Length).Trim();
+                    }
                     else if (line.StartsWith("serial:"))
                     {
                         serial = line.Substring("serial: ".Length).Trim();
@@ -877,10 +881,6 @@ private static bool GetErrorCount(string log, out long redumpErrors, out long c2
                     {
                         region = line.Substring("regions: ".Length).Trim();
                     }
-                    else if (line.StartsWith("version:"))
-                    {
-                        version = line.Substring("version: ".Length).Trim();
-                    }
                     else if (line.StartsWith("header:"))
                     {
                         line = sr.ReadLine()?.TrimStart();
@@ -1445,6 +1445,10 @@ private static bool GetSaturnBuildInfo(string? segaHeader, out string? buildDate
                     {
                         buildDate = line.Substring("build date: ".Length).Trim();
                     }
+                    else if (line.StartsWith("version:"))
+                    {
+                        version = line.Substring("version: ".Length).Trim();
+                    }
                     else if (line.StartsWith("serial:"))
                     {
                         serial = line.Substring("serial: ".Length).Trim();
@@ -1457,10 +1461,6 @@ private static bool GetSaturnBuildInfo(string? segaHeader, out string? buildDate
                     {
                         region = line.Substring("regions: ".Length).Trim();
                     }
-                    else if (line.StartsWith("version:"))
-                    {
-                        version = line.Substring("version: ".Length).Trim();
-                    }
                     else if (line?.StartsWith("header:") == true)
                     {
                         line = sr.ReadLine()?.TrimStart();