Skip to content

Commit ca885c3

Browse files
DeterousDeterous
authored
Update Redumper to build 671 (#924)
* Update Redumper to build 669 * Fix tests * Bump to build 670 * Update to build 671 * Bump changelist * Fix tests
1 parent 94fd614 commit ca885c3

File tree

9 files changed

+90
-105
lines changed

9 files changed

+90
-105
lines changed

‎CHANGELIST.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- Check for null or empty layerbreak arrays
44
- Check range-specific values in layerbreak
5+
- Update Redumper to build 671
56

67
### 3.6.0 (2025-11-28)
78

‎MPF.ExecutionContexts.Test/RedumperTests.cs‎

Lines changed: 57 additions & 57 deletions
Large diffs are not rendered by default.

‎MPF.ExecutionContexts/Redumper/ExecutionContext.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public override int? Speed
9999
[FlagStrings.LeaveUnchanged] = new FlagInput(FlagStrings.LeaveUnchanged),
100100
[FlagStrings.ForceQTOC] = new FlagInput(FlagStrings.ForceQTOC),
101101
[FlagStrings.SkipFill] = new UInt8Input(FlagStrings.SkipFill),
102-
[FlagStrings.ISO9660Trim] = new FlagInput(FlagStrings.ISO9660Trim),
102+
[FlagStrings.FilesystemTrim] = new FlagInput(FlagStrings.FilesystemTrim),
103103

104104
// Drive Test
105105
[FlagStrings.DriveTestSkipPlextorLeadin] = new FlagInput(FlagStrings.DriveTestSkipPlextorLeadin),
@@ -118,6 +118,7 @@ public override int? Speed
118118
[FlagStrings.ForceUnscrambled] = new FlagInput(FlagStrings.ForceUnscrambled),
119119
[FlagStrings.ForceRefine] = new FlagInput(FlagStrings.ForceRefine),
120120
//[FlagStrings.Firmware] = new StringInput(FlagStrings.Firmware) { Quotes = true },
121+
[FlagStrings.ForceFlash] = new FlagInput(FlagStrings.ForceFlash),
121122
[FlagStrings.SkipSubcodeDesync] = new FlagInput(FlagStrings.SkipSubcodeDesync),
122123
[FlagStrings.Rings] = new FlagInput(FlagStrings.Rings),
123124
[FlagStrings.CdrErrorThreshold] = new Int32Input(FlagStrings.CdrErrorThreshold),
@@ -198,7 +199,7 @@ public override Dictionary<string, List<string>> GetCommandSupport()
198199
FlagStrings.LeaveUnchanged,
199200
FlagStrings.ForceQTOC,
200201
FlagStrings.SkipFill,
201-
FlagStrings.ISO9660Trim,
202+
FlagStrings.FilesystemTrim,
202203

203204
// Drive Test
204205
FlagStrings.DriveTestSkipPlextorLeadin,
@@ -217,6 +218,7 @@ public override Dictionary<string, List<string>> GetCommandSupport()
217218
FlagStrings.ForceUnscrambled,
218219
FlagStrings.ForceRefine,
219220
//FlagStrings.Firmware,
221+
FlagStrings.ForceFlash,
220222
FlagStrings.SkipSubcodeDesync,
221223
FlagStrings.Rings,
222224
FlagStrings.CdrErrorThreshold,

‎MPF.ExecutionContexts/Redumper/FlagStrings.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static class FlagStrings
6363
public const string LeaveUnchanged = "--leave-unchanged";
6464
public const string ForceQTOC = "--force-qtoc";
6565
public const string SkipFill = "--skip-fill";
66-
public const string ISO9660Trim = "--iso9660-trim";
66+
public const string FilesystemTrim = "--filesystem-trim";
6767

6868
#endregion
6969

@@ -88,6 +88,7 @@ public static class FlagStrings
8888
public const string ForceUnscrambled = "--force-unscrambled";
8989
public const string ForceRefine = "--force-refine";
9090
public const string Firmware = "--firmware";
91+
public const string ForceFlash = "--force-flash";
9192
public const string SkipSubcodeDesync = "--skip-subcode-desync";
9293
public const string Rings = "--rings";
9394
public const string CdrErrorThreshold = "--cdr-error-threshold";

‎MPF.Processors.Test/DiscImageCreatorTests.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,15 +1242,13 @@ public void GetXGDAuxInfo_Null_Null()
12421242
out string? dmihash,
12431243
out string? pfihash,
12441244
out string? sshash,
1245-
out string? ss,
1246-
out string? ssver);
1245+
out string? ss);
12471246

12481247
Assert.False(actual);
12491248
Assert.Null(dmihash);
12501249
Assert.Null(pfihash);
12511250
Assert.Null(sshash);
12521251
Assert.Null(ss);
1253-
Assert.Null(ssver);
12541252
}
12551253

12561254
[Fact]
@@ -1261,36 +1259,31 @@ public void GetXGDAuxInfo_Invalid_Null()
12611259
out string? dmihash,
12621260
out string? pfihash,
12631261
out string? sshash,
1264-
out string? ss,
1265-
out string? ssver);
1262+
out string? ss);
12661263

12671264
Assert.False(actual);
12681265
Assert.Null(dmihash);
12691266
Assert.Null(pfihash);
12701267
Assert.Null(sshash);
12711268
Assert.Null(ss);
1272-
Assert.Null(ssver);
12731269
}
12741270

12751271
[Fact]
12761272
public void GetXGDAuxInfo_Valid_Filled()
12771273
{
12781274
string? expectedSs = "0-12345";
1279-
string? expectedSsver = "01";
12801275
string disc = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM", "test_disc.txt");
12811276
bool actual = DiscImageCreator.GetXGDAuxInfo(disc,
12821277
out string? dmihash,
12831278
out string? pfihash,
12841279
out string? sshash,
1285-
out string? ss,
1286-
out string? ssver);
1280+
out string? ss);
12871281

12881282
Assert.True(actual);
12891283
Assert.Equal("00000000", dmihash);
12901284
Assert.Equal("00000000", pfihash);
12911285
Assert.Equal("00000000", sshash);
12921286
Assert.Equal(expectedSs, ss);
1293-
Assert.Equal(expectedSsver, ssver);
12941287
}
12951288

12961289
#endregion

‎MPF.Processors/DiscImageCreator.cs‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -345,22 +345,18 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
345345
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
346346
}
347347

348-
if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd1SS, out _))
348+
if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd1SS))
349349
{
350-
// SS Version from DIC is ignored now
351-
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd1SSVer ?? string.Empty;
352350
info.Extras.SecuritySectorRanges = xgd1SS ?? string.Empty;
353351
}
354352
}
355353
else
356354
{
357-
if (GetXGDAuxInfo($"{basePath}_disc.txt", out var xgd1DMIHash, out var xgd1PFIHash, out var xgd1SSHash, out var xgd1SS, out _))
355+
if (GetXGDAuxInfo($"{basePath}_disc.txt", out var xgd1DMIHash, out var xgd1PFIHash, out var xgd1SSHash, out var xgd1SS))
358356
{
359357
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd1DMIHash ?? string.Empty;
360358
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd1PFIHash ?? string.Empty;
361359
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
362-
// SS Version from DIC is ignored now
363-
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd1SSVer ?? string.Empty;
364360
info.Extras.SecuritySectorRanges = xgd1SS ?? string.Empty;
365361
}
366362
}
@@ -391,22 +387,18 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
391387
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
392388
}
393389

394-
if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd23SS, out _))
390+
if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd23SS))
395391
{
396-
// SS Version from DIC is ignored now
397-
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd23SSVer ?? string.Empty;
398392
info.Extras.SecuritySectorRanges = xgd23SS ?? string.Empty;
399393
}
400394
}
401395
else
402396
{
403-
if (GetXGDAuxInfo($"{basePath}_disc.txt", out var xgd23DMIHash, out var xgd23PFIHash, out var xgd23SSHash, out var xgd23SS, out _))
397+
if (GetXGDAuxInfo($"{basePath}_disc.txt", out var xgd23DMIHash, out var xgd23PFIHash, out var xgd23SSHash, out var xgd23SS))
404398
{
405399
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd23DMIHash ?? string.Empty;
406400
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd23PFIHash ?? string.Empty;
407401
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
408-
// SS Version from DIC is ignored now
409-
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd23SSVer ?? string.Empty;
410402
info.Extras.SecuritySectorRanges = xgd23SS ?? string.Empty;
411403
}
412404
}
@@ -2387,11 +2379,10 @@ internal static bool GetXGDAuxHashInfo(Datafile? suppl, out string? dmihash, out
23872379
/// <param name="pfihash">Extracted PFI.bin CRC32 hash (upper-cased)</param>
23882380
/// <param name="sshash">Extracted SS.bin CRC32 hash (upper-cased)</param>
23892381
/// <param name="ss">Extracted security sector data</param>
2390-
/// <param name="ssver">Extracted security sector version</param>
23912382
/// <returns>True on successful extraction of info, false otherwise</returns>
2392-
internal static bool GetXGDAuxInfo(string disc, out string? dmihash, out string? pfihash, out string? sshash, out string? ss, out string? ssver)
2383+
internal static bool GetXGDAuxInfo(string disc, out string? dmihash, out string? pfihash, out string? sshash, out string? ss)
23932384
{
2394-
dmihash = null; pfihash = null; sshash = null; ss = null; ssver = null;
2385+
dmihash = null; pfihash = null; sshash = null; ss = null;
23952386

23962387
// If the file doesn't exist, we can't get info from it
23972388
if (string.IsNullOrEmpty(disc))
@@ -2402,9 +2393,6 @@ internal static bool GetXGDAuxInfo(string disc, out string? dmihash, out string?
24022393
// This flag is needed because recent versions of DIC include security data twice
24032394
bool foundSecuritySectors = false;
24042395

2405-
// SS version for all Kreon DIC dumps is v1
2406-
ssver = "01";
2407-
24082396
try
24092397
{
24102398
using var sr = File.OpenText(disc);

‎MPF.UI/Resources/Strings.fr.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212

213213
<!-- Eject Window -->
214214
<system:String x:Key="EjectTitleString">Éjecter</system:String>
215-
<system:String x:Key="EjectMessageString">Il est maintenant sûr d’éjecter le disque</system:String>
215+
<system:String x:Key="EjectMessageString">Vous pouvez maintenant éjecter le disque en toute sécurité</system:String>
216216

217217
<!-- Ask Before Quit Window -->
218218
<system:String x:Key="QuitTitleString">Quitter</system:String>

‎publish-nix.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ function download_programs() {
100100
DL_MAP["Creator_win-x86"]="https://github.com/user-attachments/files/22080480/DiscImageCreator_20250901.zip"
101101

102102
# Redumper
103-
DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-arm64.zip"
104-
DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-x64.zip"
105-
#DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-x86.zip"
106-
DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-macos-arm64.zip"
107-
DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-macos-x64.zip"
108-
DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-arm64.zip"
109-
DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-x64.zip"
110-
DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-x86.zip"
103+
DL_MAP["Redumper_linux-arm64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-arm64.zip"
104+
DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-x64.zip"
105+
#DL_MAP["Redumper_linux_x86"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-x86.zip"
106+
DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-macos-arm64.zip"
107+
DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-macos-x64.zip"
108+
DL_MAP["Redumper_win-arm64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-arm64.zip"
109+
DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-x64.zip"
110+
DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-x86.zip"
111111

112112
# Download and extract files
113113
echo "===== Downloading Required Programs ====="

‎publish-win.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ function Download-Programs {
8989
"Creator_win-x64" = "https://github.com/user-attachments/files/22080480/DiscImageCreator_20250901.zip"
9090

9191
# Redumper
92-
"Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-arm64.zip"
93-
"Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-x64.zip"
94-
#"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-linux-x86.zip"
95-
"Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-macos-arm64.zip"
96-
"Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-macos-x64.zip"
97-
"Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-arm64.zip"
98-
"Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-x86.zip"
99-
"Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b665/redumper-b665-windows-x64.zip"
92+
"Redumper_linux-arm64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-arm64.zip"
93+
"Redumper_linux-x64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-x64.zip"
94+
#"Redumper_linux-x86" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-linux-x86.zip"
95+
"Redumper_osx-arm64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-macos-arm64.zip"
96+
"Redumper_osx-x64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-macos-x64.zip"
97+
"Redumper_win-arm64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-arm64.zip"
98+
"Redumper_win-x86" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-x86.zip"
99+
"Redumper_win-x64" = "https://github.com/superg/redumper/releases/download/b671/redumper-b671-windows-x64.zip"
100100
}
101101

102102
# Download and extract files

0 commit comments

Comments
 (0)