From 740d867d7bb3ab19f0d9c9ee3be84c6e58d3dc3d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 3 Jan 2026 21:57:14 -0500 Subject: [PATCH] Update DIC to 20260101 --- CHANGELIST.md | 1 + .../DiscImageCreatorTests.cs | 15 +++++++++++++++ .../DiscImageCreator/CommandStrings.cs | 1 + .../DiscImageCreator/ExecutionContext.cs | 11 +++++++++++ MPF.Processors.Test/DiscImageCreatorTests.cs | 6 +++--- .../DiscImageCreator/CDROM-zip/test_logs.zip | Bin 4609 -> 4923 bytes .../CDROM/test_interleave.sub | 1 + .../DiscImageCreator/CDROM/test_with_cdg.bin | 1 + MPF.Processors/DiscImageCreator.cs | 6 ++++++ publish-nix.sh | 10 +++++----- publish-win.ps1 | 10 +++++----- 11 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 MPF.Processors.Test/TestData/DiscImageCreator/CDROM/test_interleave.sub create mode 100644 MPF.Processors.Test/TestData/DiscImageCreator/CDROM/test_with_cdg.bin diff --git a/CHANGELIST.md b/CHANGELIST.md index b78ffb52..a7101a34 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -7,6 +7,7 @@ - Use default media type if not provided - Update Redumper to build 682 (Dreamcast support) - Add default subfolder to CLI outputs +- Update DIC to 20260101 ### 3.6.0 (2025-11-28) diff --git a/MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs b/MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs index 2473a1f3..a3c6d960 100644 --- a/MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs +++ b/MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs @@ -102,6 +102,21 @@ namespace MPF.ExecutionContexts.Test #endregion + #region AuthPS3 + + [Theory] + [InlineData("authps3 f")] + public void AuthPS3Test(string parameters) + { + string? expected = "authps3 f"; + var context = new ExecutionContext(parameters); + string? actual = context.GenerateParameters(); + Assert.Equal(expected, actual); + Assert.False(context.IsDumpingCommand()); + } + + #endregion + #region BluRay [Theory] diff --git a/MPF.ExecutionContexts/DiscImageCreator/CommandStrings.cs b/MPF.ExecutionContexts/DiscImageCreator/CommandStrings.cs index 48808f23..01828e1e 100644 --- a/MPF.ExecutionContexts/DiscImageCreator/CommandStrings.cs +++ b/MPF.ExecutionContexts/DiscImageCreator/CommandStrings.cs @@ -7,6 +7,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator { public const string NONE = ""; public const string Audio = "audio"; + public const string AuthPS3 = "authps3"; public const string BluRay = "bd"; public const string Close = "close"; public const string CompactDisc = "cd"; diff --git a/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs b/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs index 8ed8b762..4f2a37a2 100644 --- a/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs +++ b/MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs @@ -208,6 +208,8 @@ namespace MPF.ExecutionContexts.DiscImageCreator FlagStrings.Tages, ], + [CommandStrings.AuthPS3] = [], + [CommandStrings.BluRay] = [ FlagStrings.DatExpand, @@ -418,6 +420,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator // Drive Letter if (BaseCommand == CommandStrings.Audio + || BaseCommand == CommandStrings.AuthPS3 || BaseCommand == CommandStrings.BluRay || BaseCommand == CommandStrings.Close || BaseCommand == CommandStrings.CompactDisc @@ -1186,6 +1189,14 @@ namespace MPF.ExecutionContexts.DiscImageCreator index = 6; break; + case CommandStrings.AuthPS3: + if (parts.Length != 2) + return false; + + // Blindly assume the path exists + DrivePath = parts[1]; + break; + case CommandStrings.BluRay: if (parts.Length < 4) return false; diff --git a/MPF.Processors.Test/DiscImageCreatorTests.cs b/MPF.Processors.Test/DiscImageCreatorTests.cs index e0b1171b..abc766cc 100644 --- a/MPF.Processors.Test/DiscImageCreatorTests.cs +++ b/MPF.Processors.Test/DiscImageCreatorTests.cs @@ -95,7 +95,7 @@ namespace MPF.Processors.Test var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible); var actual = processor.GetOutputFiles(MediaType.CDROM, outputDirectory, outputFilename); - Assert.Equal(26, actual.Count); + Assert.Equal(28, actual.Count); } [Fact] @@ -276,7 +276,7 @@ namespace MPF.Processors.Test string outputFilename = "test.cue"; var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible); var actual = processor.GenerateArtifacts(MediaType.CDROM, outputDirectory, outputFilename); - Assert.Equal(21, actual.Count); + Assert.Equal(23, actual.Count); } #endregion @@ -324,7 +324,7 @@ namespace MPF.Processors.Test string outputFilename = "test.cue"; var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible); var actual = processor.GetZippableFilePaths(MediaType.CDROM, outputDirectory, outputFilename); - Assert.Equal(24, actual.Count); + Assert.Equal(26, actual.Count); } #region GetPreservedFilePaths diff --git a/MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test_logs.zip b/MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test_logs.zip index 50622e580e89ebc6708495f0c0d33940b7bc0ecd..65ac0ed1058a273c3e521d3864767804c9f9a7a4 100644 GIT binary patch delta 362 zcmZov*{!xgpH01Eg;Gr9eC{w#1_lNY7G_{zC`m0YiOoq%pQmekYL1cwlmfU_9g3$y)?1CvkD* zV!B%eY$F4MLc@~AEKaDikbQydD4Pu@B0-MH6*~o{Vf+AZRyL41k_?gz&72Gji$DR& F000E?V~hX* delta 107 zcmdn3)~K>UpKT(S#O6k}*G!Wy3rKC=$2oy@@&`VF$@@6@7*!`<;!kFbn`|bK#5im6 zOo1e(OYD>X3M4RcPL2~yWAf&hypTg|@*P1x#