Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions MPF.ExecutionContexts/Redumper/CommandStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions MPF.ExecutionContexts/Redumper/ExecutionContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions MPF.Processors.Test/TestData/Redumper/CDROM/test.log
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
23 changes: 21 additions & 2 deletions MPF.Processors/Redumper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1465,8 +1465,8 @@ internal static bool GetErrorCount(string log, out long redumpErrors, out long c
}
}

// REDUMP.ORG errors: <error count>
else if (line.StartsWith("REDUMP.ORG errors:"))
// REDUMP.INFO errors: <error count>
else if (line.StartsWith("REDUMP.INFO errors:"))
{
// Ensure there are the correct number of parts
string[] parts = line!.Split(' ');
Expand Down Expand Up @@ -2955,6 +2955,25 @@ internal static bool GetVolumeLabels(string log, out Dictionary<string, List<str
currentFilesystem = "HFS";
}

// Joliet Volume Identifier
else if (line.StartsWith("joliet volume identifier: "))
{
#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
string label = line["joliet volume identifier: ".Length..];
#else
string label = line.Substring("joliet volume identifier: ".Length);
#endif

// Skip if label is blank
if (label is null || label.Length <= 0)
break;

if (volLabels.TryGetValue(label, out List<string>? value))
value.Add("Joliet");
else
volLabels[label] = ["Joliet"];
}

// ISO9660 and HFS Volume Identifier
else if (line.StartsWith("volume identifier: "))
{
Expand Down
16 changes: 8 additions & 8 deletions publish-nix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/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/b726/redumper-b726-windows-x86.zip"

# Download and extract files
echo "===== Downloading Required Programs ====="
Expand Down
16 changes: 8 additions & 8 deletions publish-win.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down