From a5a8fbbf51283128aea0197d91218bb1c987efa4 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 7 Dec 2023 21:38:38 -0500 Subject: [PATCH] Update Redumper to build 294 --- CHANGELIST.md | 1 + MPF.Core/Modules/Redumper/Parameters.cs | 26 +++++++++++++++++++++++++ appveyor.yml | 4 ++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index e1c6518d..b5254a28 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,6 +1,7 @@ ### WIP (xxxx-xx-xx) - Update RedumpLib +- Update Redumper to build 294 ### 3.0.3 (2023-12-04) diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs index 6944177d..0aa35547 100644 --- a/MPF.Core/Modules/Redumper/Parameters.cs +++ b/MPF.Core/Modules/Redumper/Parameters.cs @@ -204,6 +204,10 @@ namespace MPF.Core.Modules.Redumper // // Depends on the disc // if (!File.Exists($"{basePath}.cdtext")) // missingFiles.Add($"{basePath}.cdtext"); + // + // // Not available in all versions + // if (!File.Exists($"{basePath}.skeleton")) + // missingFiles.Add($"{basePath}.skeleton"); //} break; @@ -223,6 +227,13 @@ namespace MPF.Core.Modules.Redumper missingFiles.Add($"{basePath}.state"); } + // Removed or inconsistent files + //{ + // // Not available in all versions + // if (!File.Exists($"{basePath}.skeleton")) + // missingFiles.Add($"{basePath}.skeleton"); + //} + break; case MediaType.HDDVD: // TODO: Verify that this is output @@ -239,6 +250,13 @@ namespace MPF.Core.Modules.Redumper missingFiles.Add($"{basePath}.state"); } + // Removed or inconsistent files + //{ + // // Not available in all versions + // if (!File.Exists($"{basePath}.skeleton")) + // missingFiles.Add($"{basePath}.skeleton"); + //} + break; default: @@ -503,6 +521,8 @@ namespace MPF.Core.Modules.Redumper info.Artifacts["physical1"] = GetBase64(GetFullFile($"{basePath}.1.physical")) ?? string.Empty; if (File.Exists($"{basePath}.2.physical")) info.Artifacts["physical2"] = GetBase64(GetFullFile($"{basePath}.2.physical")) ?? string.Empty; + // if (File.Exists($"{basePath}.skeleton")) + // info.Artifacts["scram"] = GetBase64(GetFullFile($"{basePath}.skeleton")) ?? string.Empty; // if (File.Exists($"{basePath}.scram")) // info.Artifacts["scram"] = GetBase64(GetFullFile($"{basePath}.scram")) ?? string.Empty; // if (File.Exists($"{basePath}.scrap")) @@ -834,6 +854,8 @@ namespace MPF.Core.Modules.Redumper logFiles.Add($"{basePath}.fulltoc"); if (File.Exists($"{basePath}.log")) logFiles.Add($"{basePath}.log"); + if (File.Exists($"{basePath}.skeleton")) + logFiles.Add($"{basePath}.skeleton"); if (File.Exists($"{basePath}.state")) logFiles.Add($"{basePath}.state"); if (File.Exists($"{basePath}.subcode")) @@ -857,6 +879,8 @@ namespace MPF.Core.Modules.Redumper logFiles.Add($"{basePath}.1.physical"); if (File.Exists($"{basePath}.2.physical")) logFiles.Add($"{basePath}.2.physical"); + if (File.Exists($"{basePath}.skeleton")) + logFiles.Add($"{basePath}.skeleton"); if (File.Exists($"{basePath}.state")) logFiles.Add($"{basePath}.state"); break; @@ -871,6 +895,8 @@ namespace MPF.Core.Modules.Redumper logFiles.Add($"{basePath}.1.physical"); if (File.Exists($"{basePath}.2.physical")) logFiles.Add($"{basePath}.2.physical"); + if (File.Exists($"{basePath}.skeleton")) + logFiles.Add($"{basePath}.skeleton"); if (File.Exists($"{basePath}.state")) logFiles.Add($"{basePath}.state"); break; diff --git a/appveyor.yml b/appveyor.yml index 7fb51cc2..df4ddfd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,8 +48,8 @@ after_build: - 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Creator Release_ANSI\* # Redumper -- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_271/redumper-2023.11.30_build271-win64.zip -- 7z e redumper-2023.11.30_build271-win64.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Redumper redumper-2023.11.30_build271-win64\bin\* +- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_294/redumper-2023.12.08_build294-win64.zip +- 7z e redumper-2023.12.08_build294-win64.zip -oMPF\bin\Debug\net8.0-windows\win-x64\publish\Programs\Redumper redumper-2023.12.08_build294-win64\bin\* # Create MPF Debug archives - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net8.0-windows\win-x64\publish\