From 32faa33ad36b0914f6447d6cbf6e36c8a67b6e66 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 26 Jun 2023 01:06:46 -0400 Subject: [PATCH] Update redumper to build 176 --- CHANGELIST.md | 1 + MPF.Modules/Redumper/Constants.cs | 1 + MPF.Modules/Redumper/Parameters.cs | 5 ++++- appveyor.yml | 14 +++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index f1e509b7..6cd7a80e 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -79,6 +79,7 @@ - Normalize multi-instance site tags - Add missing Aaru error log to zip - Check Redumper dat section for completeness +- Update redumper to build 176 ### 2.5 (2023-03-12) diff --git a/MPF.Modules/Redumper/Constants.cs b/MPF.Modules/Redumper/Constants.cs index 05a91590..027e4cf0 100644 --- a/MPF.Modules/Redumper/Constants.cs +++ b/MPF.Modules/Redumper/Constants.cs @@ -16,6 +16,7 @@ namespace MPF.Modules.Redumper public const string Refine = "refine"; public const string Split = "split"; public const string Verify = "verify"; + public const string DVDKey = "dvdkey"; } /// diff --git a/MPF.Modules/Redumper/Parameters.cs b/MPF.Modules/Redumper/Parameters.cs index 874337d7..353eecf9 100644 --- a/MPF.Modules/Redumper/Parameters.cs +++ b/MPF.Modules/Redumper/Parameters.cs @@ -940,6 +940,7 @@ namespace MPF.Modules.Redumper case CommandStrings.Refine: case CommandStrings.Split: case CommandStrings.Verify: + case CommandStrings.DVDKey: case CommandStrings.Info: ModeValues.Add(part); break; @@ -1268,8 +1269,10 @@ namespace MPF.Modules.Redumper if (match.Success) { string normalizedKey = match.Groups[2].Value.Replace(':', ' '); - if (normalizedKey == "none") + if (normalizedKey == "") normalizedKey = "No Title Key"; + else if (normalizedKey == "") + normalizedKey = "Error Retrieving Title Key"; vobKeys += $"{match.Groups[1].Value} Title Key: {match.Groups[2].Value.Replace(':', ' ')}\n"; } diff --git a/appveyor.yml b/appveyor.yml index 2487ae2f..7668bdf6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,18 +68,18 @@ after_build: - 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\* # Redumper -- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_174/redumper-2023.06.19_build174-win64.zip -- 7z e redumper-2023.06.19_build174-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.06.19_build174-win64\bin\* -- 7z e redumper-2023.06.19_build174-win64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Redumper redumper-2023.06.19_build174-win64\bin\* -- 7z e redumper-2023.06.19_build174-win64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Redumper redumper-2023.06.19_build174-win64\bin\* -- 7z e redumper-2023.06.19_build174-win64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Redumper redumper-2023.06.19_build174-win64\bin\* -- 7z e redumper-2023.06.19_build174-win64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Redumper redumper-2023.06.19_build174-win64\bin\* +- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_176/redumper-2023.06.26_build176-win64.zip +- 7z e redumper-2023.06.26_build176-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.06.26_build176-win64\bin\* +- 7z e redumper-2023.06.26_build176-win64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Redumper redumper-2023.06.26_build176-win64\bin\* +- 7z e redumper-2023.06.26_build176-win64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Redumper redumper-2023.06.26_build176-win64\bin\* +- 7z e redumper-2023.06.26_build176-win64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Redumper redumper-2023.06.26_build176-win64\bin\* +- 7z e redumper-2023.06.26_build176-win64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Redumper redumper-2023.06.26_build176-win64\bin\* # Subdump - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip - 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48\publish * - mkdir MPF\bin\Debug\net48\publish\Programs\Subdump -- mv MPF\bin\Debug\net48\publish\subdump_fua_0x28.exe MPF\bin\Debug\net48\publish\Programs\Subdump\subdump.ex +- mv MPF\bin\Debug\net48\publish\subdump_fua_0x28.exe MPF\bin\Debug\net48\publish\Programs\Subdump\subdump.exe - 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows * - mkdir MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump - mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump\subdump.exe