From 704dd7d4536a784828f9b57fef0457014ca8ab2e Mon Sep 17 00:00:00 2001 From: Deterous <138427222+Deterous@users.noreply.github.com> Date: Mon, 22 Jun 2026 14:45:43 +0900 Subject: [PATCH 1/2] Update Redumper to build 726 --- CHANGELIST.md | 1 + .../Redumper/CommandStrings.cs | 1 + .../Redumper/ExecutionContext.cs | 1 + .../TestData/Redumper/CDROM/test.log | 4 ++-- MPF.Processors/Redumper.cs | 23 +++++++++++++++++-- publish-nix.sh | 16 ++++++------- publish-win.ps1 | 16 ++++++------- 7 files changed, 42 insertions(+), 20 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index bca17019d..8b47e07c5 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -51,6 +51,7 @@ - Fix supported region list - Fix some lingering naming issues - Remove PS5 hack +- Update Redumper to build 726 ### 3.7.1 (2026-03-30) diff --git a/MPF.ExecutionContexts/Redumper/CommandStrings.cs b/MPF.ExecutionContexts/Redumper/CommandStrings.cs index 22a20906f..6b80e8ccf 100644 --- a/MPF.ExecutionContexts/Redumper/CommandStrings.cs +++ b/MPF.ExecutionContexts/Redumper/CommandStrings.cs @@ -20,6 +20,7 @@ public static class CommandStrings public const string Info = "info"; public const string Skeleton = "skeleton"; public const string FlashMT1339 = "flash::mt1339"; + public const string FlashMT1959 = "flash::mt1959"; public const string FlashSD616 = "flash::sd616"; public const string FlashPlextor = "flash::plextor"; public const string Subchannel = "subchannel"; diff --git a/MPF.ExecutionContexts/Redumper/ExecutionContext.cs b/MPF.ExecutionContexts/Redumper/ExecutionContext.cs index ed5468ba7..870a3e300 100644 --- a/MPF.ExecutionContexts/Redumper/ExecutionContext.cs +++ b/MPF.ExecutionContexts/Redumper/ExecutionContext.cs @@ -472,6 +472,7 @@ protected override bool ValidateAndSetParameters(string? parameters) case CommandStrings.Info: case CommandStrings.Skeleton: case CommandStrings.FlashMT1339: + case CommandStrings.FlashMT1959: case CommandStrings.FlashSD616: case CommandStrings.FlashPlextor: case CommandStrings.Subchannel: diff --git a/MPF.Processors.Test/TestData/Redumper/CDROM/test.log b/MPF.Processors.Test/TestData/Redumper/CDROM/test.log index 653ec2a84..e432e2a62 100644 --- a/MPF.Processors.Test/TestData/Redumper/CDROM/test.log +++ b/MPF.Processors.Test/TestData/Redumper/CDROM/test.log @@ -27,10 +27,10 @@ copyright: << GetErrorCount >> C2: 12345 -REDUMP.ORG errors: 12345 +REDUMP.INFO errors: 12345 C2: 1 -REDUMP.ORG errors: 2 +REDUMP.INFO errors: 2 C2: 12 samples diff --git a/MPF.Processors/Redumper.cs b/MPF.Processors/Redumper.cs index 9d64eccdc..910c72616 100644 --- a/MPF.Processors/Redumper.cs +++ b/MPF.Processors/Redumper.cs @@ -1465,8 +1465,8 @@ internal static bool GetErrorCount(string log, out long redumpErrors, out long c } } - // REDUMP.ORG errors: - else if (line.StartsWith("REDUMP.ORG errors:")) + // REDUMP.INFO errors: + else if (line.StartsWith("REDUMP.INFO errors:")) { // Ensure there are the correct number of parts string[] parts = line!.Split(' '); @@ -2955,6 +2955,25 @@ internal static bool GetVolumeLabels(string log, out Dictionary? value)) + value.Add("Joliet"); + else + volLabels[label] = ["Joliet"]; + } + // ISO9660 and HFS Volume Identifier else if (line.StartsWith("volume identifier: ")) { diff --git a/publish-nix.sh b/publish-nix.sh index 4cf59efc9..9a6baab1e 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -103,14 +103,14 @@ function download_programs() { DL_MAP["Creator_win-x86"]="https://github.com/user-attachments/files/24401506/DiscImageCreator_20260101.zip" # Redumper - DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-arm64.zip" - DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-x64.zip" - #DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-x86.zip" - DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-macos-arm64.zip" - DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-macos-x64.zip" - DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-arm64.zip" - DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-x64.zip" - DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-x86.zip" + DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-arm64.zip" + DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x64.zip" + #DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x86.zip" + DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-arm64.zip" + DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-x64.zip" + DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-arm64.zip" + DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-x64.zip" + DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x86.zip" # Download and extract files echo "===== Downloading Required Programs =====" diff --git a/publish-win.ps1 b/publish-win.ps1 index 5ff5c4c99..4970fedcc 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -92,14 +92,14 @@ function Download-Programs { "Creator_win-x64" = "https://github.com/user-attachments/files/24401506/DiscImageCreator_20260101.zip" # Redumper - "Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-arm64.zip" - "Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-x64.zip" - #"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-linux-x86.zip" - "Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-macos-arm64.zip" - "Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-macos-x64.zip" - "Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-arm64.zip" - "Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-x86.zip" - "Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b706-windows-x64.zip" + "Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-arm64.zip" + "Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x64.zip" + #"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x86.zip" + "Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-arm64.zip" + "Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-x64.zip" + "Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-arm64.zip" + "Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x86.zip" + "Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x64.zip" } # Download and extract files From c632af2338da347102eea67302b11a41668696b9 Mon Sep 17 00:00:00 2001 From: Deterous <138427222+Deterous@users.noreply.github.com> Date: Mon, 22 Jun 2026 14:48:56 +0900 Subject: [PATCH 2/2] Fix links --- publish-nix.sh | 14 +++++++------- publish-win.ps1 | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/publish-nix.sh b/publish-nix.sh index 9a6baab1e..38f37768d 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -103,14 +103,14 @@ function download_programs() { DL_MAP["Creator_win-x86"]="https://github.com/user-attachments/files/24401506/DiscImageCreator_20260101.zip" # Redumper - DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-arm64.zip" - DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x64.zip" - #DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x86.zip" - DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-arm64.zip" - DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-x64.zip" - DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-arm64.zip" + DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-arm64.zip" + DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-x64.zip" + #DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-x86.zip" + DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-macos-arm64.zip" + DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-macos-x64.zip" + DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-arm64.zip" DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-x64.zip" - DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x86.zip" + DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-x86.zip" # Download and extract files echo "===== Downloading Required Programs =====" diff --git a/publish-win.ps1 b/publish-win.ps1 index 4970fedcc..72a8cca99 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -92,14 +92,14 @@ function Download-Programs { "Creator_win-x64" = "https://github.com/user-attachments/files/24401506/DiscImageCreator_20260101.zip" # Redumper - "Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-arm64.zip" - "Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x64.zip" - #"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-linux-x86.zip" - "Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-arm64.zip" - "Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-macos-x64.zip" - "Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-arm64.zip" - "Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x86.zip" - "Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b706/redumper-b726-windows-x64.zip" + "Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-arm64.zip" + "Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-x64.zip" + #"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-linux-x86.zip" + "Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-macos-arm64.zip" + "Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-macos-x64.zip" + "Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-arm64.zip" + "Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-x86.zip" + "Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b726/redumper-b726-windows-x64.zip" } # Download and extract files