diff --git a/CHANGELIST.md b/CHANGELIST.md index bb881dc1..4efb77bd 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -18,6 +18,7 @@ - Skip system detection on inactive drives - Fix path tests - Clean up csproj files +- Update redumper to build 221 ### 2.6.5 (2023-09-27) diff --git a/MPF.Modules/Redumper/Constants.cs b/MPF.Modules/Redumper/Constants.cs index 6ede96f8..dc6dca2a 100644 --- a/MPF.Modules/Redumper/Constants.cs +++ b/MPF.Modules/Redumper/Constants.cs @@ -69,5 +69,6 @@ namespace MPF.Modules.Redumper public const string RefineSubchannel = "--refine-subchannel"; public const string Skip = "--skip"; public const string DumpReadSize = "--dump-read-size"; + public const string OverreadLeadout = "--overread-leadout"; } } \ No newline at end of file diff --git a/MPF.Modules/Redumper/Parameters.cs b/MPF.Modules/Redumper/Parameters.cs index 5c5c7c5e..8dbda434 100644 --- a/MPF.Modules/Redumper/Parameters.cs +++ b/MPF.Modules/Redumper/Parameters.cs @@ -695,6 +695,10 @@ namespace MPF.Modules.Redumper parameters.Add($"{FlagStrings.DumpReadSize}={DumpReadSizeValue}"); } + // Overread Leadout + if (this[FlagStrings.OverreadLeadout] == true) + parameters.Add(FlagStrings.OverreadLeadout); + #endregion return string.Join(" ", parameters); @@ -752,6 +756,7 @@ namespace MPF.Modules.Redumper FlagStrings.RefineSubchannel, FlagStrings.Skip, FlagStrings.DumpReadSize, + FlagStrings.OverreadLeadout, }, }; } @@ -1148,6 +1153,9 @@ namespace MPF.Modules.Redumper if (!string.IsNullOrWhiteSpace(stringValue)) DumpReadSizeValue = intValue; + // Overread Leadout + ProcessFlagParameter(parts, FlagStrings.OverreadLeadout, ref i); + #endregion } diff --git a/appveyor.yml b/appveyor.yml index 837cfeb5..71ae2a60 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,34 +78,13 @@ after_build: # - 7z e DiscImageCreator_20230606.zip -oMPF\bin\Release\net7.0-windows\win-x64\publish\Programs\Creator Release_ANSI\* # Redumper -- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_219/redumper-2023.09.26_build219-win64.zip -- 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.09.26_build219-win64\bin\* -- 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.09.26_build219-win64\bin\* -- 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Debug\net7.0-windows\win-x64\publish\Programs\Redumper redumper-2023.09.26_build219-win64\bin\* -# - 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Release\net48\publish\Programs\Redumper redumper-2023.09.26_build219-win64\bin\* -# - 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Release\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.09.26_build219-win64\bin\* -# - 7z e redumper-2023.09.26_build219-win64.zip -oMPF\bin\Release\net7.0-windows\win-x64\publish\Programs\Redumper redumper-2023.09.26_build219-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.exe -# - 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows * -# - mkdir MPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Subdump -# - mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Subdump\subdump.exe -# - 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net7.0-windows * -# - mkdir MPF\bin\Debug\net7.0-windows\win-x64\publish\Programs\Subdump -# - mv MPF\bin\Debug\net7.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net7.0-windows\win-x64\publish\Programs\Subdump\subdump.exe -# - 7z e subdump_fua_0x28.zip -oMPF\bin\Release\net48\publish * -# - mkdir MPF\bin\Release\net48\publish\Programs\Subdump -# - mv MPF\bin\Release\net48\publish\subdump_fua_0x28.exe MPF\bin\Release\net48\publish\Programs\Subdump\subdump.exe -# - 7z e subdump_fua_0x28.zip -oMPF\bin\Release\net6.0-windows * -# - mkdir MPF\bin\Release\net6.0-windows\win-x64\publish\Programs\Subdump -# - mv MPF\bin\Release\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Release\net6.0-windows\win-x64\publish\Programs\Subdump\subdump.exe -# - 7z e subdump_fua_0x28.zip -oMPF\bin\Release\net7.0-windows * -# - mkdir MPF\bin\Release\net7.0-windows\win-x64\publish\Programs\Subdump -# - mv MPF\bin\Release\net7.0-windows\subdump_fua_0x28.exe MPF\bin\Release\net7.0-windows\win-x64\publish\Programs\Subdump\subdump.exe +- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_221/redumper-2023.10.02_build221-win64.zip +- 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* +- 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Debug\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* +- 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Debug\net7.0-windows\win-x64\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* +# - 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Release\net48\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* +# - 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Release\net6.0-windows\win-x64\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* +# - 7z e redumper-2023.10.02_build221-win64.zip -oMPF\bin\Release\net7.0-windows\win-x64\publish\Programs\Redumper redumper-2023.10.02_build221-win64\bin\* # Create MPF Debug archives - cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48\publish\