Bump version

* Minor Check UI improvements

* Move Check warning below status box

* Hover text on status message

* Full status in tooltip

* Add ellipsis to status text

* null ref assignment

* OneWay

* trigger StatusFirstLine property changed

* Better status property block

* wrong op

CHANGELIST.md

@@ -1,3 +1,71 @@
+### 3.3.1 (2025-05-23)
+
+- Fix typo for L1Toolstamp!.Label (bikerspade)
+- Update redumper to build 549
+- Allow max speed dumping ("0")
+- Normalize file path in CLI
+- Always write full configuration file
+- Short-circuit CLI first-run experience
+- Start defining all download URLs
+- Add all separate downloads
+- Make more paths configurable
+- Add commented placeholders instead of omitting
+- Move function definitions
+- Smarter mapping of URLs to runtimes
+- Unify download maps
+- Trailing commas caused issues
+- Add initial extraction to new functions
+- Add cleanup to download functions
+- Fix most issues in new download code
+- Fix issue with some downloads
+- Replace old download implementations
+- Enable packing programs for CLI
+- Fix minor packing issues
+- Comment download scripts more
+- Fix removing empty subdirectories
+- Add interactive mode to CLI
+- Add padding above root interactive node label
+- Clean up case-sensitivity
+- Add interactive mode to Check
+- Fix menu title in Check interactive
+- It's not dumping, it's checking
+- Make interactive mode cleaner
+- Avoid redundant redundancy
+- Allow exiting from interactive modes
+- Update RedumpLib to 1.6.5
+- Fix package reference layout
+- Update Nuget packages
+- Normalize Shift-JIS characters, when possible
+- Update to DIC 20250501
+- Update RedumpLib to 1.6.6
+- Pre-clean file path in CLI interactive mode
+- Tweak to previous commit for some build versions
+- Fix lines wiped before displayed
+- Update redumper to build 565
+- Close the log archive, if it exists
+- Support checking Redumper DAT from zip; add tests
+- Add Check warnings around overwriting and parsing
+- Clarification on some options
+- One more note about hidden settings
+- Explicitly unset Redumper speed, if needed
+- Simplify WriteOutputData path handling
+- Serialize JSON a slightly different way
+- Add newlines to pkg info printing
+- Better audio-only check
+- Minor cleanup from last commit
+- Relax PS3CFW output filename requirements
+- Fix bracket formatting from last commit
+- Fix speed dropdown with Redumper
+- Update redumper to build 585
+- Further fix speed dropdown with Redumper
+- Use null for 0 speed internally
+- Don't hash bad SS
+- Add and use status label for Check window
+- Minor Check UI improvements
+- Reset Redump errors when an INFO block is found
+- Handle error count resets in Redumper
+- Remove unnecessary conditional
+
 ### 3.3.0 (2025-01-03)
 
 - Update packages

MPF.CLI/MPF.CLI.csproj

@@ -12,7 +12,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
 
         <!-- Package Properties -->
         <Title>MPF CLI</Title>
@@ -43,7 +43,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
     </ItemGroup>
 
 </Project>

MPF.CLI/Program.cs

@@ -26,7 +26,11 @@ namespace MPF.CLI
 
                 // Reset first run
                 options.FirstRun = false;
-                OptionsLoader.SaveToConfig(options, saveDefault: true);
+                OptionsLoader.SaveToConfig(options);
+
+                // Display non-error message
+                DisplayHelp("First-run detected! Please fill out config.json and run again.");
+                return;
             }
 
             // Try processing the standalone arguments
@@ -38,33 +42,48 @@ namespace MPF.CLI
                 return;
             }
 
-            // Try processing the common arguments
-            bool success = OptionsLoader.ProcessCommonArguments(args, out MediaType mediaType, out RedumpSystem? knownSystem, out var error);
-            if (!success)
+            // Setup common outputs
+            CommandOptions opts;
+            MediaType mediaType;
+            RedumpSystem? knownSystem;
+
+            // Use interactive mode
+            if (args.Length > 0 && (args[0] == "-i" || args[0] == "--interactive"))
             {
-                DisplayHelp(error);
-                return;
+                opts = InteractiveMode(options, out mediaType, out knownSystem);
             }
 
-            // Validate the supplied credentials
-            if (!string.IsNullOrEmpty(options.RedumpUsername) && !string.IsNullOrEmpty(options.RedumpPassword))
+            // Use normal commandline parameters
+            else
             {
-                bool? validated = RedumpClient.ValidateCredentials(options.RedumpUsername!, options.RedumpPassword!).GetAwaiter().GetResult();
-                string message = validated switch
+                // Try processing the common arguments
+                bool success = OptionsLoader.ProcessCommonArguments(args, out mediaType, out knownSystem, out var error);
+                if (!success)
                 {
-                    true => "Redump username and password accepted!",
-                    false => "Redump username and password denied!",
-                    null => "An error occurred validating your credentials!",
-                };
+                    DisplayHelp(error);
+                    return;
+                }
 
-                if (!string.IsNullOrEmpty(message))
-                    Console.WriteLine(message);
+                // Validate the supplied credentials
+                if (!string.IsNullOrEmpty(options.RedumpUsername) && !string.IsNullOrEmpty(options.RedumpPassword))
+                {
+                    bool? validated = RedumpClient.ValidateCredentials(options.RedumpUsername!, options.RedumpPassword!).GetAwaiter().GetResult();
+                    string message = validated switch
+                    {
+                        true => "Redump username and password accepted!",
+                        false => "Redump username and password denied!",
+                        null => "An error occurred validating your credentials!",
+                    };
+
+                    if (!string.IsNullOrEmpty(message))
+                        Console.WriteLine(message);
+                }
+
+                // Process any custom parameters
+                int startIndex = 2;
+                opts = LoadFromArguments(args, options, ref startIndex);
             }
 
-            // Process any custom parameters
-            int startIndex = 2;
-            CommandOptions opts = LoadFromArguments(args, options, ref startIndex);
-            
             // Validate the internal program
             switch (options.InternalProgram)
             {
@@ -104,6 +123,10 @@ namespace MPF.CLI
                 return;
             }
 
+            // Normalize the file path
+            if (opts.FilePath != null)
+                opts.FilePath = Path.GetFullPath(opts.FilePath);
+
             // Get the speed from the options
             int speed = opts.DriveSpeed ?? FrontendTool.GetDefaultSpeedForMediaType(mediaType, options);
 
@@ -124,6 +147,7 @@ namespace MPF.CLI
                 DisplayHelp("No valid environment could be created, exiting...");
                 return;
             }
+
             env.SetExecutionContext(paramStr);
 
             // Invoke the dumping program
@@ -177,6 +201,7 @@ namespace MPF.CLI
             Console.WriteLine("-lm, --listmedia        List supported media types");
             Console.WriteLine("-ls, --listsystems      List supported system types");
             Console.WriteLine("-lp, --listprograms     List supported dumping program outputs");
+            Console.WriteLine("-i, --interactive       Enable interactive mode");
             Console.WriteLine();
 
             Console.WriteLine("CLI Options:");
@@ -198,6 +223,150 @@ namespace MPF.CLI
             Console.WriteLine();
         }
 
+        /// <summary>
+        /// Enable interactive mode for entering information
+        /// </summary>
+        private static CommandOptions InteractiveMode(Frontend.Options options, out MediaType mediaType, out RedumpSystem? system)
+        {
+            // Create return values
+            var opts = new CommandOptions();
+            mediaType = MediaType.NONE;
+            system = null;
+
+            // Create state values
+            string? result = string.Empty;
+
+        root:
+            Console.Clear();
+            Console.WriteLine("MPF.CLI Interactive Mode - Main Menu");
+            Console.WriteLine("-------------------------");
+            Console.WriteLine();
+            Console.WriteLine($"1) Set media type (Currently '{mediaType}')");
+            Console.WriteLine($"2) Set system (Currently '{system}')");
+            Console.WriteLine($"3) Set dumping program (Currently '{options.InternalProgram}')");
+            Console.WriteLine($"4) Set device path (Currently '{opts.DevicePath}')");
+            Console.WriteLine($"5) Set mounted path (Currently '{opts.MountedPath}')");
+            Console.WriteLine($"6) Set file path (Currently '{opts.FilePath}')");
+            Console.WriteLine($"7) Set override speed (Currently '{opts.DriveSpeed}')");
+            Console.WriteLine($"8) Set custom parameters (Currently '{opts.CustomParams}')");
+            Console.WriteLine();
+            Console.WriteLine($"Q) Exit the program");
+            Console.WriteLine($"X) Start dumping");
+            Console.Write("> ");
+
+            result = Console.ReadLine();
+            switch (result)
+            {
+                case "1":
+                    goto mediaType;
+                case "2":
+                    goto system;
+                case "3":
+                    goto dumpingProgram;
+                case "4":
+                    goto devicePath;
+                case "5":
+                    goto mountedPath;
+                case "6":
+                    goto filePath;
+                case "7":
+                    goto overrideSpeed;
+                case "8":
+                    goto customParams;
+
+                case "q":
+                case "Q":
+                    Environment.Exit(0);
+                    break;
+                case "x":
+                case "X":
+                    Console.Clear();
+                    goto exit;
+                case "z":
+                case "Z":
+                    Console.WriteLine("It is pitch black. You are likely to be eaten by a grue.");
+                    Console.Write("> ");
+                    Console.ReadLine();
+                    goto root;
+                default:
+                    Console.WriteLine($"Invalid selection: {result}");
+                    Console.ReadLine();
+                    goto root;
+            }
+
+        mediaType:
+            Console.WriteLine();
+            Console.WriteLine("Input the media type and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            mediaType = OptionsLoader.ToMediaType(result);
+            goto root;
+
+        system:
+            Console.WriteLine();
+            Console.WriteLine("Input the system and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            system = Extensions.ToRedumpSystem(result);
+            goto root;
+
+        dumpingProgram:
+            Console.WriteLine();
+            Console.WriteLine("Input the dumping program and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            options.InternalProgram = result.ToInternalProgram();
+            goto root;
+
+        devicePath:
+            Console.WriteLine();
+            Console.WriteLine("Input the device path and press Enter:");
+            Console.Write("> ");
+            opts.DevicePath = Console.ReadLine();
+            goto root;
+
+        mountedPath:
+            Console.WriteLine();
+            Console.WriteLine("Input the mounted path and press Enter:");
+            Console.Write("> ");
+            opts.MountedPath = Console.ReadLine();
+            goto root;
+
+        filePath:
+            Console.WriteLine();
+            Console.WriteLine("Input the file path and press Enter:");
+            Console.Write("> ");
+
+            result = Console.ReadLine();
+            if (!string.IsNullOrEmpty(result))
+                result = Path.GetFullPath(result!);
+
+            opts.FilePath = result;
+            goto root;
+
+        overrideSpeed:
+            Console.WriteLine();
+            Console.WriteLine("Input the override speed and press Enter:");
+            Console.Write("> ");
+
+            result = Console.ReadLine();
+            if (!int.TryParse(result, out int speed))
+                speed = -1;
+
+            opts.DriveSpeed = speed;
+            goto root;
+
+        customParams:
+            Console.WriteLine();
+            Console.WriteLine("Input the custom parameters and press Enter:");
+            Console.Write("> ");
+            opts.CustomParams = Console.ReadLine();
+            goto root;
+
+        exit:
+            return opts;
+        }
+
         /// <summary>
         /// Load the current set of options from application arguments
         /// </summary>

MPF.Check/MPF.Check.csproj

@@ -12,7 +12,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
 
         <!-- Package Properties -->
         <Title>MPF Check</Title>
@@ -43,7 +43,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
     </ItemGroup>
 
 </Project>

MPF.Check/Program.cs

@@ -51,17 +51,35 @@ namespace MPF.Check
                 return;
             }
 
-            // Try processing the common arguments
-            bool success = OptionsLoader.ProcessCommonArguments(args, out MediaType mediaType, out RedumpSystem? knownSystem, out var error);
-            if (!success)
+            // Setup common outputs
+            CommandOptions opts;
+            MediaType mediaType;
+            RedumpSystem? knownSystem;
+            int startIndex;
+
+            // Use interactive mode
+            if (args.Length > 0 && (args[0] == "-i" || args[0] == "--interactive"))
             {
-                DisplayHelp(error);
-                return;
+                startIndex = 1;
+                opts = InteractiveMode(options, out mediaType, out knownSystem);
+            }
+
+            // Use normal commandline parameters
+            else
+            {
+                // Try processing the common arguments
+                bool success = OptionsLoader.ProcessCommonArguments(args, out mediaType, out knownSystem, out var error);
+                if (!success)
+                {
+                    DisplayHelp(error);
+                    return;
+                }
+
+                // Loop through and process options
+                startIndex = 2;
+                opts = LoadFromArguments(args, options, ref startIndex);
             }
 
-            // Loop through and process options
-            int startIndex = 2;
-            CommandOptions opts = LoadFromArguments(args, options, ref startIndex);
             if (options.InternalProgram == InternalProgram.NONE)
             {
                 DisplayHelp("A program name needs to be provided");
@@ -128,6 +146,7 @@ namespace MPF.Check
             Console.WriteLine("-lm, --listmedia        List supported media types");
             Console.WriteLine("-ls, --listsystems      List supported system types");
             Console.WriteLine("-lp, --listprograms     List supported dumping program outputs");
+            Console.WriteLine("-i, --interactive       Enable interactive mode");
             Console.WriteLine();
 
             Console.WriteLine("Check Options:");
@@ -148,6 +167,206 @@ namespace MPF.Check
             Console.WriteLine("-z, --zip                      Enable log file compression");
             Console.WriteLine("-d, --delete                   Enable unnecessary file deletion");
             Console.WriteLine();
+            Console.WriteLine("WARNING: Check will overwrite both any existing submission information files as well");
+            Console.WriteLine("as any log archives. Please make backups of those if you need to before running Check.");
+            Console.WriteLine();
+        }
+
+        /// <summary>
+        /// Enable interactive mode for entering information
+        /// </summary>
+        private static CommandOptions InteractiveMode(Frontend.Options options, out MediaType mediaType, out RedumpSystem? system)
+        {
+            // Create return values
+            var opts = new CommandOptions();
+            mediaType = MediaType.NONE;
+            system = null;
+
+            // These values require multiple parts to be active
+            bool scan = false,
+                enableArchives = true,
+                enableDebug = false,
+                hideDriveLetters = false;
+
+            // Create state values
+            string? result = string.Empty;
+
+        root:
+            Console.Clear();
+            Console.WriteLine("MPF.Check Interactive Mode - Main Menu");
+            Console.WriteLine("-------------------------");
+            Console.WriteLine();
+            Console.WriteLine($"1) Set media type (Currently '{mediaType}')");
+            Console.WriteLine($"2) Set system (Currently '{system}')");
+            Console.WriteLine($"3) Set dumping program (Currently '{options.InternalProgram}')");
+            Console.WriteLine($"4) Set seed path (Currently '{opts.Seed}')");
+            Console.WriteLine($"5) Add placeholders (Currently '{options.AddPlaceholders}')");
+            Console.WriteLine($"6) Create IRD (Currently '{options.CreateIRDAfterDumping}')");
+            Console.WriteLine($"7) Redump credentials (Currently '{options.RedumpUsername}')");
+            Console.WriteLine($"8) Pull all information (Currently '{options.PullAllInformation}')");
+            Console.WriteLine($"9) Set device path (Currently '{opts.DevicePath}')");
+            Console.WriteLine($"A) Scan for protection (Currently '{scan}')");
+            Console.WriteLine($"B) Scan archives for protection (Currently '{enableArchives}')");
+            Console.WriteLine($"C) Debug protection scan output (Currently '{enableDebug}')");
+            Console.WriteLine($"D) Hide drive letters in protection output (Currently '{hideDriveLetters}')");
+            Console.WriteLine($"E) Hide filename suffix (Currently '{options.AddFilenameSuffix}')");
+            Console.WriteLine($"F) Output submission JSON (Currently '{options.OutputSubmissionJSON}')");
+            Console.WriteLine($"G) Include JSON artifacts (Currently '{options.IncludeArtifacts}')");
+            Console.WriteLine($"H) Compress logs (Currently '{options.CompressLogFiles}')");
+            Console.WriteLine($"I) Delete unnecessary files (Currently '{options.DeleteUnnecessaryFiles}')");
+            Console.WriteLine();
+            Console.WriteLine($"Q) Exit the program");
+            Console.WriteLine($"X) Start checking");
+            Console.Write("> ");
+
+            result = Console.ReadLine();
+            switch (result)
+            {
+                case "1":
+                    goto mediaType;
+                case "2":
+                    goto system;
+                case "3":
+                    goto dumpingProgram;
+                case "4":
+                    goto seedPath;
+                case "5":
+                    options.AddPlaceholders = !options.AddPlaceholders;
+                    goto root;
+                case "6":
+                    options.CreateIRDAfterDumping = !options.CreateIRDAfterDumping;
+                    goto root;
+                case "7":
+                    goto redumpCredentials;
+                case "8":
+                    options.PullAllInformation = !options.PullAllInformation;
+                    goto root;
+                case "9":
+                    goto devicePath;
+                case "a":
+                case "A":
+                    scan = !scan;
+                    goto root;
+                case "b":
+                case "B":
+                    enableArchives = !enableArchives;
+                    goto root;
+                case "c":
+                case "C":
+                    enableDebug = !enableDebug;
+                    goto root;
+                case "d":
+                case "D":
+                    hideDriveLetters = !hideDriveLetters;
+                    goto root;
+                case "e":
+                case "E":
+                    options.AddFilenameSuffix = !options.AddFilenameSuffix;
+                    goto root;
+                case "f":
+                case "F":
+                    options.OutputSubmissionJSON = !options.OutputSubmissionJSON;
+                    goto root;
+                case "g":
+                case "G":
+                    options.IncludeArtifacts = !options.IncludeArtifacts;
+                    goto root;
+                case "h":
+                case "H":
+                    options.CompressLogFiles = !options.CompressLogFiles;
+                    goto root;
+                case "i":
+                case "I":
+                    options.DeleteUnnecessaryFiles = !options.DeleteUnnecessaryFiles;
+                    goto root;
+
+                case "q":
+                case "Q":
+                    Environment.Exit(0);
+                    break;
+                case "x":
+                case "X":
+                    Console.Clear();
+                    goto exit;
+                case "z":
+                case "Z":
+                    Console.WriteLine("It is pitch black. You are likely to be eaten by a grue.");
+                    Console.Write("> ");
+                    Console.ReadLine();
+                    goto root;
+                default:
+                    Console.WriteLine($"Invalid selection: {result}");
+                    Console.ReadLine();
+                    goto root;
+            }
+
+        mediaType:
+            Console.WriteLine();
+            Console.WriteLine("Input the media type and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            mediaType = OptionsLoader.ToMediaType(result);
+            goto root;
+
+        system:
+            Console.WriteLine();
+            Console.WriteLine("Input the system and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            system = Extensions.ToRedumpSystem(result);
+            goto root;
+
+        dumpingProgram:
+            Console.WriteLine();
+            Console.WriteLine("Input the dumping program and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            options.InternalProgram = result.ToInternalProgram();
+            goto root;
+
+        seedPath:
+            Console.WriteLine();
+            Console.WriteLine("Input the seed path and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            opts.Seed = Builder.CreateFromFile(result);
+            goto root;
+
+        redumpCredentials:
+            Console.WriteLine();
+            Console.WriteLine("Enter your Redumper username and press Enter:");
+            Console.Write("> ");
+            options.RedumpUsername = Console.ReadLine();
+
+            Console.WriteLine("Enter your Redumper password (hidden) and press Enter:");
+            Console.Write("> ");
+            options.RedumpPassword = string.Empty;
+            while (true)
+            {
+                var key = Console.ReadKey(true);
+                if (key.Key == ConsoleKey.Enter)
+                    break;
+
+                options.RedumpPassword += key.KeyChar;
+            }
+
+            goto root;
+
+        devicePath:
+            Console.WriteLine();
+            Console.WriteLine("Input the device path and press Enter:");
+            Console.Write("> ");
+            opts.DevicePath = Console.ReadLine();
+            goto root;
+
+        exit:
+            // Now deal with the complex options
+            options.ScanForProtection = scan && !string.IsNullOrEmpty(opts.DevicePath);
+            options.ScanArchivesForProtection = enableArchives && scan && !string.IsNullOrEmpty(opts.DevicePath);
+            options.IncludeDebugProtectionInformation = enableDebug && scan && !string.IsNullOrEmpty(opts.DevicePath);
+            options.HideDriveLetters = hideDriveLetters && scan && !string.IsNullOrEmpty(opts.DevicePath);
+
+            return opts;
         }
 
         /// <summary>
@@ -283,7 +502,7 @@ namespace MPF.Check
                     options.OutputSubmissionJSON = true;
                 }
 
-                // Output submission JSON
+                // Include JSON artifacts
                 else if (args[startIndex].Equals("--include-artifacts"))
                 {
                     options.IncludeArtifacts = true;
@@ -295,7 +514,7 @@ namespace MPF.Check
                     options.CompressLogFiles = true;
                 }
 
-                // Delete unnecessary files files
+                // Delete unnecessary files
                 else if (args[startIndex].Equals("-d") || args[startIndex].Equals("--delete"))
                 {
                     options.DeleteUnnecessaryFiles = true;

MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs

@@ -90,10 +90,10 @@ namespace MPF.ExecutionContexts.Test
         #region Audio
 
         [Theory]
-        [InlineData("audio F filename.bin 0 1 2 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t")]
+        [InlineData("audio F filename.bin 0 1 2 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t")]
         public void AudioTest(string parameters)
         {
-            string? expected = "audio F \"filename.bin\" 0 1 2 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t";
+            string? expected = "audio F \"filename.bin\" 0 1 2 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -135,10 +135,10 @@ namespace MPF.ExecutionContexts.Test
         #region CompactDisc
 
         [Theory]
-        [InlineData("cd f filename.bin 0 /a 0 /p /aj /be raw /c2 1 2 3 1 5 6 /d8 /d /q /mscf /f 0 /fulltoc /mr 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /toc /trp /vn 0 /vnc /vnx")]
+        [InlineData("cd f filename.bin 0 /a 0 /p /aj /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /mscf /fdesc sync edc /f 0 /fulltoc /mr 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /toc /trp /vn 0 /vnc /vnx")]
         public void CompactDiscTest(string parameters)
         {
-            string? expected = "cd f \"filename.bin\" 0 /a 0 /p /aj /be raw /c2 1 2 3 1 5 6 /d8 /d /q /mscf /f 0 /fulltoc /mr 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /toc /trp /vn 0 /vnc /vnx";
+            string? expected = "cd f \"filename.bin\" 0 /a 0 /p /aj /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /mscf /fdesc sync edc /f 0 /fulltoc /mr 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /toc /trp /vn 0 /vnc /vnx";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -150,10 +150,10 @@ namespace MPF.ExecutionContexts.Test
         #region Data
 
         [Theory]
-        [InlineData("data F filename.bin 0 1 2 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t")]
+        [InlineData("data F filename.bin 0 1 2 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t")]
         public void DataTest(string parameters)
         {
-            string? expected = "data F \"filename.bin\" 0 1 2 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t";
+            string? expected = "data F \"filename.bin\" 0 1 2 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /r /am /sf 1 /ss /sk 1 0 /s 0 /t";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -240,10 +240,10 @@ namespace MPF.ExecutionContexts.Test
         #region GDROM
 
         [Theory]
-        [InlineData("gd f filename.bin 0 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /s 0")]
+        [InlineData("gd f filename.bin 0 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /s 0")]
         public void GDROMTest(string parameters)
         {
-            string? expected = "gd f \"filename.bin\" 0 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nr /s 0";
+            string? expected = "gd f \"filename.bin\" 0 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nr /s 0";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -360,10 +360,10 @@ namespace MPF.ExecutionContexts.Test
         #region Swap
 
         [Theory]
-        [InlineData("swap f filename.bin 0 /a 0 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /trp /vn 0 /vnc /vnx")]
+        [InlineData("swap f filename.bin 0 /a 0 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /trp /vn 0 /vnc /vnx")]
         public void SwapTest(string parameters)
         {
-            string? expected = "swap f \"filename.bin\" 0 /a 0 /be raw /c2 1 2 3 1 5 6 /d8 /d /q /f 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /trp /vn 0 /vnc /vnx";
+            string? expected = "swap f \"filename.bin\" 0 /a 0 /be raw /c2 1 2 3 1 5 6 /c2new 1 /d8 /d /q /f 0 /np /nq /nl /ns /nr /am /sf 1 /ss /74 /s 0 /trp /vn 0 /vnc /vnx";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);

MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj

@@ -14,22 +14,22 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.18.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.assert" Version="2.9.3" />
+        <PackageReference Include="xunit.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.ExecutionContexts.Test/RedumperTests.cs

@@ -44,14 +44,13 @@ namespace MPF.ExecutionContexts.Test
 
         [Theory]
         [InlineData(null, null, null, "filename.bin", null, "")]
-        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.CDROM, "/dev/sr0", "path/filename.bin", 2, "cd skeleton --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.SuperAudioCD, MediaType.CDROM, "/dev/sr0", "path/filename.bin", 2, "sacd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.DVD, "/dev/sr0", "path/filename.bin", 2, "dvd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, "/dev/sr0", "path/filename.bin", 2, "dvd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.NintendoWii, MediaType.NintendoWiiOpticalDisc, "/dev/sr0", "path/filename.bin", 2, "dvd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.HDDVDVideo, MediaType.HDDVD, "/dev/sr0", "path/filename.bin", 2, "dvd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.BDVideo, MediaType.BluRay, "/dev/sr0", "path/filename.bin", 2, "bd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
-        [InlineData(RedumpSystem.NintendoWiiU, MediaType.NintendoWiiUOpticalDisc, "/dev/sr0", "path/filename.bin", 2, "bd --verbose --debug --drive=/dev/sr0 --speed=1000 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB")]
+        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.CDROM, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --skeleton --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.DVD, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.NintendoWii, MediaType.NintendoWiiOpticalDisc, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.HDDVDVideo, MediaType.HDDVD, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.BDVideo, MediaType.BluRay, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.NintendoWiiU, MediaType.NintendoWiiUOpticalDisc, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --debug --drive=/dev/sr0 --speed=2 --retries=1000 --image-path=\"path\" --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
         public void DefaultValueTest(RedumpSystem? system,
             MediaType? type,
             string? drivePath,
@@ -66,14 +65,14 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
 
-        #region CD
+        #region Disc
 
         [Theory]
-        [InlineData("cd -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("cd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void CDTest(string parameters)
+        [InlineData("disc -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("disc --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void DiscTest(string parameters)
         {
-            string? expected = "cd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "disc --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -81,74 +80,10 @@ namespace MPF.ExecutionContexts.Test
         }
 
         [Theory]
-        [InlineData("cd --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"")]
+        [InlineData("disc --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"")]
         public void SpacesTest(string parameters)
         {
-            string? expected = "cd --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region DVD
-
-        [Theory]
-        [InlineData("dvd -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("dvd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void DVDTest(string parameters)
-        {
-            string? expected = "dvd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region BD
-
-        [Theory]
-        [InlineData("bd -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("bd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void BDTest(string parameters)
-        {
-            string? expected = "bd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region SACD
-
-        [Theory]
-        [InlineData("sacd -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("sacd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void SACDTest(string parameters)
-        {
-            string? expected = "sacd --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region New
-
-        [Theory]
-        [InlineData("new -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("new --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void NewTest(string parameters)
-        {
-            string? expected = "new --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "disc --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -160,11 +95,11 @@ namespace MPF.ExecutionContexts.Test
         #region Rings
 
         [Theory]
-        [InlineData("rings -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("rings --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("rings -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("rings --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void RingsTest(string parameters)
         {
-            string? expected = "rings --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "rings --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -176,43 +111,11 @@ namespace MPF.ExecutionContexts.Test
         #region Dump
 
         [Theory]
-        [InlineData("dump -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("dump --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dump -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dump --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void DumpTest(string parameters)
         {
-            string? expected = "dump --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region DumpNew
-
-        [Theory]
-        [InlineData("dumpnew -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("dumpnew --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void DumpNewTest(string parameters)
-        {
-            string? expected = "dumpnew --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-            var context = new ExecutionContext(parameters);
-            string? actual = context.GenerateParameters();
-            Assert.Equal(expected, actual);
-            Assert.True(context.IsDumpingCommand());
-        }
-
-        #endregion
-
-        #region Refine
-
-        [Theory]
-        [InlineData("refine -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("refine --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void RefineTest(string parameters)
-        {
-            string? expected = "refine --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "dump --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -221,14 +124,30 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
 
-        #region RefineNew
+        #region DumpExtra
 
         [Theory]
-        [InlineData("refinenew -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("refinenew --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        public void RefineNewTest(string parameters)
+        [InlineData("dump::extra -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dump::extra --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void DumpExtraTest(string parameters)
         {
-            string? expected = "refinenew --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "dump::extra --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+            Assert.False(context.IsDumpingCommand());
+        }
+
+        #endregion
+
+        #region Refine
+
+        [Theory]
+        [InlineData("refine -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("refine --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void RefineTest(string parameters)
+        {
+            string? expected = "refine --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -240,11 +159,11 @@ namespace MPF.ExecutionContexts.Test
         #region Verify
 
         [Theory]
-        [InlineData("verify -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("verify --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("verify -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("verify --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void VerifyTest(string parameters)
         {
-            string? expected = "verify --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "verify --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -256,11 +175,11 @@ namespace MPF.ExecutionContexts.Test
         #region DVDKey
 
         [Theory]
-        [InlineData("dvdkey -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("dvdkey --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dvdkey -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dvdkey --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void DVDKeyTest(string parameters)
         {
-            string? expected = "dvdkey --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "dvdkey --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -272,11 +191,11 @@ namespace MPF.ExecutionContexts.Test
         #region Eject
 
         [Theory]
-        [InlineData("eject -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("eject --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("eject -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("eject --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void EjectTest(string parameters)
         {
-            string? expected = "eject --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "eject --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -288,11 +207,11 @@ namespace MPF.ExecutionContexts.Test
         #region DVDIsoKey
 
         [Theory]
-        [InlineData("dvdisokey -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("dvdisokey --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dvdisokey -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("dvdisokey --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void DVDIsoKeyTest(string parameters)
         {
-            string? expected = "dvdisokey --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "dvdisokey --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -304,11 +223,11 @@ namespace MPF.ExecutionContexts.Test
         #region Protection
 
         [Theory]
-        [InlineData("protection -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("protection --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("protection -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("protection --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void ProtectionTest(string parameters)
         {
-            string? expected = "protection --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "protection --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -320,11 +239,11 @@ namespace MPF.ExecutionContexts.Test
         #region Split
 
         [Theory]
-        [InlineData("split -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("split --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("split -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("split --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void SplitTest(string parameters)
         {
-            string? expected = "split --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "split --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -336,11 +255,11 @@ namespace MPF.ExecutionContexts.Test
         #region Hash
 
         [Theory]
-        [InlineData("hash -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("hash --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("hash -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("hash --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void HashTest(string parameters)
         {
-            string? expected = "hash --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "hash --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -352,11 +271,11 @@ namespace MPF.ExecutionContexts.Test
         #region Info
 
         [Theory]
-        [InlineData("info -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("info --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("info -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("info --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void InfoTest(string parameters)
         {
-            string? expected = "info --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "info --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -368,11 +287,27 @@ namespace MPF.ExecutionContexts.Test
         #region Skeleton
 
         [Theory]
-        [InlineData("skeleton -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("skeleton --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("skeleton -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("skeleton --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void SkeletonTest(string parameters)
         {
-            string? expected = "skeleton --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "skeleton --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+            Assert.False(context.IsDumpingCommand());
+        }
+
+        #endregion
+
+        #region Subchannel
+
+        [Theory]
+        [InlineData("subchannel -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("subchannel --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void SubchannelTest(string parameters)
+        {
+            string? expected = "subchannel --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -384,11 +319,11 @@ namespace MPF.ExecutionContexts.Test
         #region Debug
 
         [Theory]
-        [InlineData("debug -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        [InlineData("debug --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("debug -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("debug --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
         public void DebugTest(string parameters)
         {
-            string? expected = "debug --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            string? expected = "debug --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -397,19 +332,48 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
 
-        // Currently disabled
         #region FixMSF
 
-        // [Theory]
-        // [InlineData("fixmsf -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        // [InlineData("fixmsf --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
-        // public void FixMSFTest(string parameters)
-        // {
-        //     string? expected = "fixmsf --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
-        //     var context = new ExecutionContext(parameters);
-        //     string? actual = context.GenerateParameters();
-        //     Assert.Equal(expected, actual);
-        // }
+        [Theory]
+        [InlineData("fixmsf -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("fixmsf --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void FixMSFTest(string parameters)
+        {
+            string? expected = "fixmsf --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+
+        #region DebugFlip
+
+        [Theory]
+        [InlineData("debug::flip -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("debug::flip --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void DebugFlipTest(string parameters)
+        {
+            string? expected = "debug::flip --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+
+        #region DriveTest
+
+        [Theory]
+        [InlineData("drive::test -h --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        [InlineData("drive::test --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
+        public void DriveTestTest(string parameters)
+        {
+            string? expected = "drive::test --help --version --verbose --auto-eject --skeleton --drive=dr --speed=8 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+        }
 
         #endregion
     }

MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs

@@ -97,6 +97,13 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         /// </summary>
         public int? FixValue { get; set; }
 
+        /// <summary>
+        /// Force descramble value
+        /// Possible values: sync, edc, sync edc, ecc, sync ecc, edc ecc
+        /// </summary>
+        /// TODO: Make this an enum
+        public string? ForceDescrambleSectorValue { get; set; }
+
         /// <summary>
         /// Set the force unit access flag value (default 1)
         /// </summary>
@@ -185,6 +192,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                 [
                     FlagStrings.BEOpcode,
                     FlagStrings.C2Opcode,
+                    FlagStrings.C2OpcodeNew,
                     FlagStrings.D8Opcode,
                     FlagStrings.DatExpand,
                     FlagStrings.DisableBeep,
@@ -220,10 +228,12 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                     FlagStrings.AtariJaguar,
                     FlagStrings.BEOpcode,
                     FlagStrings.C2Opcode,
+                    FlagStrings.C2OpcodeNew,
                     FlagStrings.D8Opcode,
                     FlagStrings.DatExpand,
                     FlagStrings.DisableBeep,
                     FlagStrings.ExtractMicroSoftCabFile,
+                    FlagStrings.ForceDescrambleSector,
                     FlagStrings.ForceUnitAccess,
                     FlagStrings.FullToc,
                     FlagStrings.MultiSectorRead,
@@ -248,6 +258,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                 [
                     FlagStrings.BEOpcode,
                     FlagStrings.C2Opcode,
+                    FlagStrings.C2OpcodeNew,
                     FlagStrings.D8Opcode,
                     FlagStrings.DatExpand,
                     FlagStrings.DisableBeep,
@@ -300,6 +311,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                 [
                     FlagStrings.BEOpcode,
                     FlagStrings.C2Opcode,
+                    FlagStrings.C2OpcodeNew,
                     FlagStrings.D8Opcode,
                     FlagStrings.DatExpand,
                     FlagStrings.DisableBeep,
@@ -333,6 +345,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                     FlagStrings.AddOffset,
                     FlagStrings.BEOpcode,
                     FlagStrings.C2Opcode,
+                    FlagStrings.C2OpcodeNew,
                     FlagStrings.D8Opcode,
                     FlagStrings.DatExpand,
                     FlagStrings.DisableBeep,
@@ -594,6 +607,22 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                 }
             }
 
+            // C2 Opcode New
+            if (IsFlagSupported(FlagStrings.C2OpcodeNew))
+            {
+                if (this[FlagStrings.C2OpcodeNew] == true)
+                {
+                    parameters.Append($"{FlagStrings.C2OpcodeNew} ");
+                    if (C2OpcodeValue[0] != null)
+                    {
+                        if (C2OpcodeValue[0] > 0)
+                            parameters.Append($"{C2OpcodeValue[0]} ");
+                        else
+                            return null;
+                    }
+                }
+            }
+
             // Copyright Management Information
             if (IsFlagSupported(FlagStrings.CopyrightManagementInformation))
             {
@@ -653,6 +682,19 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                 }
             }
 
+            // Force Descramble Sector
+            if (IsFlagSupported(FlagStrings.ForceDescrambleSector))
+            {
+                if (this[FlagStrings.ForceDescrambleSector] == true)
+                {
+                    parameters.Append($"{FlagStrings.ForceDescrambleSector} ");
+                    if (ForceDescrambleSectorValue != null)
+                        parameters.Append($"{ForceDescrambleSectorValue} ");
+                    else
+                        return null;
+                }
+            }
+
             // Force Unit Access
             if (IsFlagSupported(FlagStrings.ForceUnitAccess))
             {
@@ -974,6 +1016,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
             C2OpcodeValue = new int?[6];
             DVDRereadValue = null;
             FixValue = null;
+            ForceDescrambleSectorValue = null;
             ForceUnitAccessValue = null;
             NoSkipSecuritySectorValue = null;
             ScanFileProtectValue = null;
@@ -1531,6 +1574,25 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                         }
                     }
 
+                    // C2 Opcode New
+                    if (parts[i] == FlagStrings.C2OpcodeNew && IsFlagSupported(FlagStrings.C2OpcodeNew))
+                    {
+                        this[FlagStrings.C2OpcodeNew] = true;
+                        if (!DoesExist(parts, i + 1))
+                        {
+                            return false;
+                        }
+                        else if (!IsValidInt32(parts[i + 1], lowerBound: 0))
+                        {
+                            return false;
+                        }
+                        else
+                        {
+                            C2OpcodeValue[0] = int.Parse(parts[i + 1]);
+                            i++;
+                        }
+                    }
+
                     // Copyright Management Information
                     ProcessFlagParameter(parts, FlagStrings.CopyrightManagementInformation, ref i);
 
@@ -1556,6 +1618,63 @@ namespace MPF.ExecutionContexts.DiscImageCreator
                     if (intValue != null && intValue != int.MinValue)
                         FixValue = intValue;
 
+                    // Force Descramble Sector
+                    stringValue = ProcessStringParameter(parts, FlagStrings.ForceDescrambleSector, ref i);
+                    if (!string.IsNullOrEmpty(stringValue))
+                    {
+                        if (string.Equals(stringValue, "sync"))
+                        {
+                            if (DoesExist(parts, i + 1))
+                            {
+                                if (parts[i + 1] == "edc")
+                                {
+                                    ForceDescrambleSectorValue = "sync edc";
+                                    i++;
+                                }
+                                else if (parts[i + 1] == "ecc")
+                                {
+                                    ForceDescrambleSectorValue = "sync ecc";
+                                    i++;
+                                }
+                                else
+                                {
+                                    ForceDescrambleSectorValue = "sync";
+                                }
+                            }
+                            else
+                            {
+                                ForceDescrambleSectorValue = "sync";
+                            }
+                        }
+                        else if (string.Equals(stringValue, "edc"))
+                        {
+                            if (DoesExist(parts, i + 1))
+                            {
+                                if (parts[i + 1] == "ecc")
+                                {
+                                    ForceDescrambleSectorValue = "edc ecc";
+                                    i++;
+                                }
+                                else
+                                {
+                                    ForceDescrambleSectorValue = "edc";
+                                }
+                            }
+                            else
+                            {
+                                ForceDescrambleSectorValue = "edc";
+                            }
+                        }
+                        else if (string.Equals(stringValue, "ecc"))
+                        {
+                            ForceDescrambleSectorValue = "ecc";
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+
                     // Force Unit Access
                     intValue = ProcessInt32Parameter(parts, FlagStrings.ForceUnitAccess, ref i, missingAllowed: true);
                     if (intValue != null && intValue != int.MinValue && intValue >= 0)

MPF.ExecutionContexts/DiscImageCreator/FlagStrings.cs

@@ -10,6 +10,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         public const string AtariJaguar = "/aj";
         public const string BEOpcode = "/be";
         public const string C2Opcode = "/c2";
+        public const string C2OpcodeNew = "/c2new";
         public const string CopyrightManagementInformation = "/c";
         public const string D8Opcode = "/d8";
         public const string DatExpand = "/d";
@@ -17,6 +18,7 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         public const string DVDReread = "/rr";
         public const string ExtractMicroSoftCabFile = "/mscf";
         public const string Fix = "/fix";
+        public const string ForceDescrambleSector = "/fdesc";
         public const string ForceUnitAccess = "/f";
         public const string FullToc = "/fulltoc";
         public const string MultiSectorRead = "/mr";

MPF.ExecutionContexts/MPF.ExecutionContexts.csproj

@@ -11,7 +11,7 @@
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
         <WarningsNotAsErrors>NU5104</WarningsNotAsErrors>
 
         <!-- Package Properties -->
@@ -32,7 +32,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
     </ItemGroup>
 
 </Project>

MPF.ExecutionContexts/Redumper/CommandStrings.cs

@@ -6,16 +6,11 @@ namespace MPF.ExecutionContexts.Redumper
     public static class CommandStrings
     {
         public const string NONE = "";
-        public const string CD = "cd";
-        public const string DVD = "dvd"; // Synonym for CD
-        public const string BluRay = "bd"; // Synonym for CD
-        public const string SACD = "sacd"; // Synonym for CD
-        public const string New = "new"; // Synonym for CD; Temporary command, to be removed later
+        public const string Disc = "disc";
         public const string Rings = "rings";
         public const string Dump = "dump";
-        public const string DumpNew = "dumpnew"; // Temporary command, to be removed later
+        public const string DumpExtra = "dump::extra";
         public const string Refine = "refine";
-        public const string RefineNew = "refinenew"; // Temporary command, to be removed later
         public const string Verify = "verify";
         public const string DVDKey = "dvdkey";
         public const string Eject = "eject";
@@ -25,7 +20,11 @@ namespace MPF.ExecutionContexts.Redumper
         public const string Hash = "hash";
         public const string Info = "info";
         public const string Skeleton = "skeleton";
+        public const string FlashMT1339 = "flash::mt1339";
+        public const string Subchannel = "subchannel";
         public const string Debug = "debug";
         public const string FixMSF = "fixmsf";
+        public const string DebugFlip = "debug::flip";
+        public const string DriveTest = "drive::test";
     }
 }

MPF.ExecutionContexts/Redumper/Enumerations.cs

@@ -9,7 +9,7 @@ namespace MPF.ExecutionContexts.Redumper
 
         BE,
         D8,
-        BE_CDDA,
+        BE_CDDA, // Currently an alias for BE
     }
 
     /// <summary>

MPF.ExecutionContexts/Redumper/ExecutionContext.cs

@@ -32,7 +32,16 @@ namespace MPF.ExecutionContexts.Redumper
             }
             set
             {
-                (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(value);
+                if (value != null && value > 0)
+                {
+                    this[FlagStrings.Speed] = true;
+                    (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(value);
+                }
+                else
+                {
+                    this[FlagStrings.Speed] = false;
+                    (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(null);
+                }
             }
         }
 
@@ -41,9 +50,9 @@ namespace MPF.ExecutionContexts.Redumper
         #region Flag Values
 
         /// <summary>
-        /// List of all modes being run
+        /// Mode being run
         /// </summary>
-        public List<string>? ModeValues { get; set; }
+        public string? ModeValue { get; set; }
 
         /// <summary>
         /// Set of all command flags
@@ -54,8 +63,11 @@ namespace MPF.ExecutionContexts.Redumper
             [FlagStrings.HelpLong] = new FlagInput(FlagStrings.HelpShort, FlagStrings.HelpLong),
             [FlagStrings.Version] = new FlagInput(FlagStrings.Version),
             [FlagStrings.Verbose] = new FlagInput(FlagStrings.Verbose),
+            [FlagStrings.Continue] = new StringInput(FlagStrings.Continue),
             [FlagStrings.AutoEject] = new FlagInput(FlagStrings.AutoEject),
+            [FlagStrings.Skeleton] = new FlagInput(FlagStrings.Skeleton),
             [FlagStrings.Debug] = new FlagInput(FlagStrings.Debug),
+            [FlagStrings.DiscType] = new StringInput(FlagStrings.DiscType),
             [FlagStrings.Drive] = new StringInput(FlagStrings.Drive),
             [FlagStrings.Speed] = new Int32Input(FlagStrings.Speed),
             [FlagStrings.Retries] = new Int32Input(FlagStrings.Retries),
@@ -75,7 +87,9 @@ namespace MPF.ExecutionContexts.Redumper
             // Drive Specific
             [FlagStrings.PlextorSkipLeadin] = new FlagInput(FlagStrings.PlextorSkipLeadin),
             [FlagStrings.PlextorLeadinRetries] = new Int32Input(FlagStrings.PlextorLeadinRetries),
+            [FlagStrings.PlextorLeadinForceStore] = new FlagInput(FlagStrings.PlextorLeadinForceStore),
             [FlagStrings.AsusSkipLeadout] = new FlagInput(FlagStrings.AsusSkipLeadout),
+            [FlagStrings.AsusLeadoutRetries] = new Int32Input(FlagStrings.AsusLeadoutRetries),
 
             // Offset
             [FlagStrings.ForceOffset] = new Int32Input(FlagStrings.ForceOffset),
@@ -99,8 +113,13 @@ namespace MPF.ExecutionContexts.Redumper
             [FlagStrings.DumpReadSize] = new Int32Input(FlagStrings.DumpReadSize),
             [FlagStrings.OverreadLeadout] = new FlagInput(FlagStrings.OverreadLeadout),
             [FlagStrings.ForceUnscrambled] = new FlagInput(FlagStrings.ForceUnscrambled),
+            [FlagStrings.ForceRefine] = new FlagInput(FlagStrings.ForceRefine),
             [FlagStrings.LegacySubs] = new FlagInput(FlagStrings.LegacySubs),
             [FlagStrings.DisableCDText] = new FlagInput(FlagStrings.DisableCDText),
+            [FlagStrings.SkipSubcodeDesync] = new FlagInput(FlagStrings.SkipSubcodeDesync),
+            [FlagStrings.DriveTestSkipPlextorLeadin] = new FlagInput(FlagStrings.DriveTestSkipPlextorLeadin),
+            [FlagStrings.DriveTestSkipCacheRead] = new FlagInput(FlagStrings.DriveTestSkipCacheRead),
+            //[FlagStrings.Firmware] = new StringInput(FlagStrings.Firmware) { Quotes = true },
         };
 
         #endregion
@@ -134,8 +153,11 @@ namespace MPF.ExecutionContexts.Redumper
                     FlagStrings.HelpShort,
                     FlagStrings.Version,
                     FlagStrings.Verbose,
+                    FlagStrings.Continue,
                     FlagStrings.AutoEject,
+                    FlagStrings.Skeleton,
                     FlagStrings.Debug,
+                    FlagStrings.DiscType,
                     FlagStrings.Drive,
                     FlagStrings.Speed,
                     FlagStrings.Retries,
@@ -154,7 +176,9 @@ namespace MPF.ExecutionContexts.Redumper
                     // Drive Specific
                     FlagStrings.PlextorSkipLeadin,
                     FlagStrings.PlextorLeadinRetries,
+                    FlagStrings.PlextorLeadinForceStore,
                     FlagStrings.AsusSkipLeadout,
+                    FlagStrings.AsusLeadoutRetries,
 
                     // Offset
                     FlagStrings.ForceOffset,
@@ -178,8 +202,13 @@ namespace MPF.ExecutionContexts.Redumper
                     FlagStrings.DumpReadSize,
                     FlagStrings.OverreadLeadout,
                     FlagStrings.ForceUnscrambled,
+                    FlagStrings.ForceRefine,
                     FlagStrings.LegacySubs,
                     FlagStrings.DisableCDText,
+                    FlagStrings.SkipSubcodeDesync,
+                    FlagStrings.DriveTestSkipPlextorLeadin,
+                    FlagStrings.DriveTestSkipCacheRead,
+                    //FlagStrings.Firmware,
                 ],
             };
         }
@@ -194,12 +223,10 @@ namespace MPF.ExecutionContexts.Redumper
         {
             var parameters = new StringBuilder();
 
-            ModeValues ??= [CommandStrings.NONE];
-
-            // Modes
-            string modes = string.Join(" ", [.. ModeValues]);
-            if (modes.Length > 0)
-                parameters.Append($"{modes} ");
+            // Command Mode
+            ModeValue ??= CommandStrings.NONE;
+            if (ModeValue != CommandStrings.NONE)
+                parameters.Append($"{ModeValue} ");
 
             // Loop though and append all existing
             foreach (var kvp in _inputs)
@@ -225,13 +252,9 @@ namespace MPF.ExecutionContexts.Redumper
         /// <inheritdoc/>
         public override bool IsDumpingCommand()
         {
-            return ModeValues?.Contains(CommandStrings.CD) == true
-                || ModeValues?.Contains(CommandStrings.DVD) == true
-                || ModeValues?.Contains(CommandStrings.BluRay) == true
-                || ModeValues?.Contains(CommandStrings.SACD) == true
-                || ModeValues?.Contains(CommandStrings.New) == true
-                || ModeValues?.Contains(CommandStrings.Dump) == true
-                || ModeValues?.Contains(CommandStrings.DumpNew) == true;
+            // `dump` command does not provide hashes so will error out after dump if run via MPF
+            return ModeValue == CommandStrings.NONE
+                || ModeValue == CommandStrings.Disc;
         }
 
         /// <inheritdoc/>
@@ -255,23 +278,13 @@ namespace MPF.ExecutionContexts.Redumper
             switch (MediaType)
             {
                 case SabreTools.RedumpLib.Data.MediaType.CDROM:
-                    ModeValues = RedumpSystem switch
-                    {
-                        SabreTools.RedumpLib.Data.RedumpSystem.SuperAudioCD => [CommandStrings.SACD],
-                        _ => [CommandStrings.CD, CommandStrings.Skeleton],
-                    };
-                    break;
                 case SabreTools.RedumpLib.Data.MediaType.DVD:
                 case SabreTools.RedumpLib.Data.MediaType.NintendoGameCubeGameDisc:
                 case SabreTools.RedumpLib.Data.MediaType.NintendoWiiOpticalDisc:
-                    ModeValues = [CommandStrings.DVD];
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.HDDVD: // TODO: Keep in sync if another command string shows up
-                    ModeValues = [CommandStrings.DVD];
-                    break;
+                case SabreTools.RedumpLib.Data.MediaType.HDDVD:
                 case SabreTools.RedumpLib.Data.MediaType.BluRay:
                 case SabreTools.RedumpLib.Data.MediaType.NintendoWiiUOpticalDisc:
-                    ModeValues = [CommandStrings.BluRay];
+                    ModeValue = CommandStrings.Disc;
                     break;
                 default:
                     BaseCommand = null;
@@ -281,8 +294,16 @@ namespace MPF.ExecutionContexts.Redumper
             this[FlagStrings.Drive] = true;
             (_inputs[FlagStrings.Drive] as StringInput)?.SetValue(drivePath ?? string.Empty);
 
-            this[FlagStrings.Speed] = true;
-            (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(driveSpeed);
+            if (driveSpeed != null && driveSpeed > 0)
+            {
+                this[FlagStrings.Speed] = true;
+                (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(driveSpeed);
+            }
+            else
+            {
+                this[FlagStrings.Speed] = false;
+                (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(null);
+            }
 
             // Set user-defined options
             if (GetBooleanSetting(options, SettingConstants.EnableVerbose, SettingConstants.EnableVerboseDefault))
@@ -290,6 +311,26 @@ namespace MPF.ExecutionContexts.Redumper
                 this[FlagStrings.Verbose] = true;
                 (_inputs[FlagStrings.Verbose] as FlagInput)?.SetValue(true);
             }
+            if (GetBooleanSetting(options, SettingConstants.EnableSkeleton, SettingConstants.EnableSkeletonDefault))
+            {
+                // Enable skeleton for CD dumps only by default
+                switch (MediaType)
+                {
+                    case SabreTools.RedumpLib.Data.MediaType.CDROM:
+                        switch (RedumpSystem)
+                        {
+                            case SabreTools.RedumpLib.Data.RedumpSystem.SuperAudioCD:
+                                break;
+                            default:
+                                this[FlagStrings.Skeleton] = true;
+                                (_inputs[FlagStrings.Skeleton] as FlagInput)?.SetValue(true);
+                                break;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
             if (GetBooleanSetting(options, SettingConstants.EnableDebug, SettingConstants.EnableDebugDefault))
             {
                 this[FlagStrings.Debug] = true;
@@ -341,7 +382,7 @@ namespace MPF.ExecutionContexts.Redumper
             if (GetBooleanSetting(options, SettingConstants.EnableLeadinRetry, SettingConstants.EnableLeadinRetryDefault))
             {
                 this[FlagStrings.PlextorLeadinRetries] = true;
-                (_inputs[FlagStrings.Speed] as Int32Input)?.SetValue(GetInt32Setting(options, SettingConstants.LeadinRetryCount, SettingConstants.LeadinRetryCountDefault));
+                (_inputs[FlagStrings.PlextorLeadinRetries] as Int32Input)?.SetValue(GetInt32Setting(options, SettingConstants.LeadinRetryCount, SettingConstants.LeadinRetryCountDefault));
             }
         }
 
@@ -358,7 +399,7 @@ namespace MPF.ExecutionContexts.Redumper
             string[] parts = SplitParameterString(parameters!);
 
             // Setup the modes
-            ModeValues = [];
+            ModeValue = null;
 
             // All modes should be cached separately
             int index = 0;
@@ -370,16 +411,11 @@ namespace MPF.ExecutionContexts.Redumper
                 string part = parts[index];
                 switch (part)
                 {
-                    case CommandStrings.CD:
-                    case CommandStrings.DVD:
-                    case CommandStrings.BluRay:
-                    case CommandStrings.SACD:
-                    case CommandStrings.New: // Temporary command, to be removed later
+                    case CommandStrings.Disc:
                     case CommandStrings.Rings:
                     case CommandStrings.Dump:
-                    case CommandStrings.DumpNew: // Temporary command, to be removed later
+                    case CommandStrings.DumpExtra:
                     case CommandStrings.Refine:
-                    case CommandStrings.RefineNew: // Temporary command, to be removed later
                     case CommandStrings.Verify:
                     case CommandStrings.DVDKey:
                     case CommandStrings.Eject:
@@ -389,9 +425,17 @@ namespace MPF.ExecutionContexts.Redumper
                     case CommandStrings.Hash:
                     case CommandStrings.Info:
                     case CommandStrings.Skeleton:
+                    case CommandStrings.FlashMT1339:
+                    case CommandStrings.Subchannel:
                     case CommandStrings.Debug:
-                        //case CommandStrings.FixMSF:
-                        ModeValues.Add(part);
+                    case CommandStrings.FixMSF:
+                    case CommandStrings.DebugFlip:
+                    case CommandStrings.DriveTest:
+                        // Only allow one mode per command
+                        if (ModeValue != null)
+                            continue;
+
+                        ModeValue = part;
                         break;
 
                     // Default is either a flag or an invalid mode

MPF.ExecutionContexts/Redumper/FlagStrings.cs

@@ -11,8 +11,11 @@ namespace MPF.ExecutionContexts.Redumper
         public const string HelpShort = "-h";
         public const string Version = "--version";
         public const string Verbose = "--verbose";
+        public const string Continue = "--continue";
         public const string AutoEject = "--auto-eject";
+        public const string Skeleton = "--skeleton";
         public const string Debug = "--debug";
+        public const string DiscType = "--disc-type";
         public const string Drive = "--drive";
         public const string Speed = "--speed";
         public const string Retries = "--retries";
@@ -37,7 +40,9 @@ namespace MPF.ExecutionContexts.Redumper
 
         public const string PlextorSkipLeadin = "--plextor-skip-leadin";
         public const string PlextorLeadinRetries = "--plextor-leadin-retries";
+        public const string PlextorLeadinForceStore = "--plextor-leadin-force-store";
         public const string AsusSkipLeadout = "--asus-skip-leadout";
+        public const string AsusLeadoutRetries = "--asus-leadout-retries";
 
         #endregion
 
@@ -70,8 +75,13 @@ namespace MPF.ExecutionContexts.Redumper
         public const string DumpReadSize = "--dump-read-size";
         public const string OverreadLeadout = "--overread-leadout";
         public const string ForceUnscrambled = "--force-unscrambled";
+        public const string ForceRefine = "--force-refine";
         public const string LegacySubs = "--legacy-subs";
         public const string DisableCDText = "--disable-cdtext";
+        public const string SkipSubcodeDesync = "--skip-subcode-desync";
+        public const string DriveTestSkipPlextorLeadin = "--drive-test-skip-plextor-leadin";
+        public const string DriveTestSkipCacheRead = "--drive-test-skip-cache-read";
+        public const string Firmware = "--firmware";
 
         #endregion
     }

MPF.ExecutionContexts/Redumper/SettingConstants.cs

@@ -8,6 +8,9 @@ namespace MPF.ExecutionContexts.Redumper
         public const string EnableLeadinRetry = "RedumperEnableLeadinRetry";
         public const bool EnableLeadinRetryDefault = false;
 
+        public const string EnableSkeleton = "RedumperEnableSkeleton";
+        public const bool EnableSkeletonDefault = true;
+
         public const string EnableVerbose = "RedumperEnableVerbose";
         public const bool EnableVerboseDefault = true;
 

MPF.Frontend.Test/DumpEnvironmentTests.cs

@@ -9,6 +9,7 @@ namespace MPF.Frontend.Test
         [InlineData(null, 'D', false, MediaType.NONE, false)]
         [InlineData("", 'D', false, MediaType.NONE, false)]
         [InlineData("cd F test.bin 8 /c2 20", 'F', false, MediaType.CDROM, true)]
+        [InlineData("cd F test.bin 8 /c2new 20", 'F', false, MediaType.CDROM, true)]
         [InlineData("fd A test.img", 'A', true, MediaType.FloppyDisk, true)]
         [InlineData("dvd X test.iso 8 /raw", 'X', false, MediaType.FloppyDisk, false)]
         [InlineData("stop D", 'D', false, MediaType.DVD, true)]

MPF.Frontend.Test/MPF.Frontend.Test.csproj

@@ -14,22 +14,22 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.18.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.assert" Version="2.9.3" />
+        <PackageReference Include="xunit.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.Frontend/DumpEnvironment.cs

@@ -743,43 +743,38 @@ namespace MPF.Frontend
 
             try
             {
-                // Serialize the JSON and get it writable
-                string json = JsonConvert.SerializeObject(info, Formatting.Indented);
-                byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
+                // Get the output path
+                var path = string.Empty;
+                if (string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
+                    path = "!submissionInfo.json";
+                else if (string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
+                    path = $"!submissionInfo_{filenameSuffix}.json";
+                else if (!string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
+                    path = Path.Combine(outputDirectory, "!submissionInfo.json");
+                else if (!string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
+                    path = Path.Combine(outputDirectory, $"!submissionInfo_{filenameSuffix}.json");
+
+                // Ensure the extension is correct for the output
+                if (includedArtifacts)
+                    path += ".gz";
+
+                // Create and open the output file
+                using var fs = File.Create(path);
+
+                // Create the JSON serializer
+                var serializer = new JsonSerializer { Formatting = Formatting.Indented };
 
                 // If we included artifacts, write to a GZip-compressed file
                 if (includedArtifacts)
                 {
-                    var path = string.Empty;
-                    if (string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
-                        path = "!submissionInfo.json.gz";
-                    else if (string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
-                        path = $"!submissionInfo_{filenameSuffix}.json.gz";
-                    else if (!string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
-                        path = Path.Combine(outputDirectory, "!submissionInfo.json.gz");
-                    else if (!string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
-                        path = Path.Combine(outputDirectory, $"!submissionInfo_{filenameSuffix}.json.gz");
-
-                    using var fs = File.Create(path);
                     using var gs = new GZipStream(fs, CompressionMode.Compress);
-                    gs.Write(jsonBytes, 0, jsonBytes.Length);
+                    using var sw = new StreamWriter(gs, Encoding.UTF8);
+                    serializer.Serialize(sw, info);
                 }
-
-                // Otherwise, write out to a normal JSON
                 else
                 {
-                    var path = string.Empty;
-                    if (string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
-                        path = "!submissionInfo.json";
-                    else if (string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
-                        path = $"!submissionInfo_{filenameSuffix}.json";
-                    else if (!string.IsNullOrEmpty(outputDirectory) && string.IsNullOrEmpty(filenameSuffix))
-                        path = Path.Combine(outputDirectory, "!submissionInfo.json");
-                    else if (!string.IsNullOrEmpty(outputDirectory) && !string.IsNullOrEmpty(filenameSuffix))
-                        path = Path.Combine(outputDirectory, $"!submissionInfo_{filenameSuffix}.json");
-
-                    using var fs = File.Create(path);
-                    fs.Write(jsonBytes, 0, jsonBytes.Length);
+                    using var sw = new StreamWriter(fs, Encoding.UTF8);
+                    serializer.Serialize(sw, info);
                 }
             }
             catch

MPF.Frontend/InterfaceConstants.cs

@@ -11,7 +11,7 @@ namespace MPF.Frontend
         /// <summary>
         /// Set of all accepted speed values
         /// </summary>
-        private static readonly List<int> _speedValues = [1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72];
+        private static readonly List<int> _speedValues = [0, 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72];
 
         /// <summary>
         /// Set of accepted speeds for CD and GD media
@@ -36,7 +36,7 @@ namespace MPF.Frontend
         /// <summary>
         /// Set of accepted speeds for all other media
         /// </summary>
-        public static List<int> Unknown => _speedValues.FindAll(s => s <= 1);
+        public static List<int> Unknown => [1];
 
         /// <summary>
         /// Get list of all drive speeds for a given MediaType

MPF.Frontend/MPF.Frontend.csproj

@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
@@ -30,20 +30,14 @@
         <ProjectReference Include="..\MPF.Processors\MPF.Processors.csproj" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net452`))">
-        <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
-    </ItemGroup>
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
-        <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="BinaryObjectScanner" Version="3.3.4" />
         <PackageReference Include="LibIRD" Version="0.9.3" />
+        <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" Condition="$(TargetFramework.StartsWith(`net452`))" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

MPF.Frontend/Options.cs

@@ -86,6 +86,7 @@ namespace MPF.Frontend
         /// <summary>
         /// Enable purple mode for UI elements
         /// </summary>
+        /// <remarks>This is a hidden setting</remarks>
         public bool EnablePurpMode
         {
             get { return GetBooleanSetting(Settings, "EnablePurpMode", false); }
@@ -95,6 +96,7 @@ namespace MPF.Frontend
         /// <summary>
         /// Custom color setting
         /// </summary>
+        /// <remarks>This is a hidden setting</remarks>
         public string? CustomBackgroundColor
         {
             get { return GetStringSetting(Settings, "CustomBackgroundColor", null); }
@@ -104,6 +106,7 @@ namespace MPF.Frontend
         /// <summary>
         /// Custom color setting
         /// </summary>
+        /// <remarks>This is a hidden setting</remarks>
         public string? CustomTextColor
         {
             get { return GetStringSetting(Settings, "CustomTextColor", null); }
@@ -155,7 +158,7 @@ namespace MPF.Frontend
         }
 
         /// <summary>
-        /// Default output path for dumps
+        /// Show the debug menu item
         /// </summary>
         /// <remarks>This is a hidden setting</remarks>
         public bool ShowDebugViewMenuItem
@@ -347,6 +350,16 @@ namespace MPF.Frontend
             set { Settings[RedumperSettings.EnableLeadinRetry] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Enable skeleton output while dumping by default
+        /// </summary>
+        /// <remarks>This is a hidden setting</remarks>
+        public bool RedumperEnableSkeleton
+        {
+            get { return GetBooleanSetting(Settings, RedumperSettings.EnableSkeleton, RedumperSettings.EnableSkeletonDefault); }
+            set { Settings[RedumperSettings.EnableSkeleton] = value.ToString(); }
+        }
+
         /// <summary>
         /// Enable verbose output while dumping by default
         /// </summary>

MPF.Frontend/Tools/OptionsLoader.cs

@@ -123,32 +123,14 @@ namespace MPF.Frontend.Tools
             return true;
         }
 
-        /// <summary>
-        /// List all programs with their short usable names
-        /// </summary>
-        private static List<string> ListPrograms()
-        {
-            var programs = new List<string>();
-
-            foreach (var val in Enum.GetValues(typeof(InternalProgram)))
-            {
-                if (((InternalProgram)val!) == InternalProgram.NONE)
-                    continue;
-
-                programs.Add($"{((InternalProgram?)val).ShortName()} - {((InternalProgram?)val).LongName()}");
-            }
-
-            return programs;
-        }
-
         /// <summary>
         /// Get the MediaType enum value for a given string
         /// </summary>
         /// <param name="type">String value to convert</param>
         /// <returns>MediaType represented by the string, if possible</returns>
-        private static MediaType ToMediaType(string type)
+        public static MediaType ToMediaType(string? type)
         {
-            return (type.ToLowerInvariant()) switch
+            return (type?.ToLowerInvariant()) switch
             {
                 #region Punched Media
 
@@ -284,6 +266,24 @@ namespace MPF.Frontend.Tools
             };
         }
 
+        /// <summary>
+        /// List all programs with their short usable names
+        /// </summary>
+        private static List<string> ListPrograms()
+        {
+            var programs = new List<string>();
+
+            foreach (var val in Enum.GetValues(typeof(InternalProgram)))
+            {
+                if (((InternalProgram)val!) == InternalProgram.NONE)
+                    continue;
+
+                programs.Add($"{((InternalProgram?)val).ShortName()} - {((InternalProgram?)val).LongName()}");
+            }
+
+            return programs;
+        }
+
         #endregion
 
         #region Configuration
@@ -315,29 +315,26 @@ namespace MPF.Frontend.Tools
         /// <summary>
         /// Save the current set of options to the application configuration
         /// </summary>
-        public static void SaveToConfig(Options options, bool saveDefault = false)
+        public static void SaveToConfig(Options options)
         {
             // If no options path can be found
             if (string.IsNullOrEmpty(ConfigurationPath))
                 return;
 
-            // If default values should be saved as well
-            if (saveDefault)
+            // Ensure default values are included
+            PropertyInfo[] properties = typeof(Options).GetProperties();
+            foreach (var property in properties)
             {
-                PropertyInfo[] properties = typeof(Options).GetProperties();
-                foreach (var property in properties)
-                {
-                    // Skip dictionary properties
-                    if (property.Name == "Item")
-                        continue;
+                // Skip dictionary properties
+                if (property.Name == "Item")
+                    continue;
 
-                    // Skip non-option properties
-                    if (property.Name == "Settings" || property.Name == "HasRedumpLogin")
-                        continue;
+                // Skip non-option properties
+                if (property.Name == "Settings" || property.Name == "HasRedumpLogin")
+                    continue;
 
-                    var val = property.GetValue(options, null);
-                    property.SetValue(options, val, null);
-                }
+                var val = property.GetValue(options, null);
+                property.SetValue(options, val, null);
             }
 
             // Handle a very strange edge case
@@ -368,7 +365,7 @@ namespace MPF.Frontend.Tools
 
             // Local folder
 #if NET20 || NET35 || NET40 || NET452
-            string runtimeDir =  Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string runtimeDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 #else
             string runtimeDir = AppContext.BaseDirectory;
 #endif

MPF.Frontend/Tools/PhysicalTool.cs

@@ -549,7 +549,7 @@ namespace MPF.Frontend.Tools
                     var appPkgHeader = appPkgHeaderDeserializer.Deserialize(fileStream);
 
                     if (appPkgHeader != null)
-                        pkgInfo += $"{appPkgHeader.ContentID}";
+                        pkgInfo += $"{appPkgHeader.ContentID}" + Environment.NewLine;
                 }
 
                 if (pkgInfo == "")
@@ -700,7 +700,7 @@ namespace MPF.Frontend.Tools
                     var appPkgHeader = appPkgHeaderDeserializer.Deserialize(fileStream);
 
                     if (appPkgHeader != null)
-                        pkgInfo += $"{appPkgHeader.ContentID}";
+                        pkgInfo += $"{appPkgHeader.ContentID}" + Environment.NewLine;
                 }
 
                 if (pkgInfo == "")

MPF.Frontend/Tools/SubmissionGenerator.cs

@@ -199,14 +199,34 @@ namespace MPF.Frontend.Tools
                 }
 
                 // If the line ends in a known extra track names, skip them for checking
-                if (hashData.Contains("(Track 0).bin")
+                // TODO: Smarter method to ignore all tracks that start with 0. 00. A. or AA.
+                if (hashData.Contains(".dmi")
+                    || hashData.Contains(".pfi")
+                    || hashData.Contains(".ss")
+                    || hashData.Contains("(Track 0).bin")
+                    || hashData.Contains("(Track 0.1).bin")
                     || hashData.Contains("(Track 0.2).bin")
+                    || hashData.Contains("(Track 0.3).bin")
+                    || hashData.Contains("(Track 0.4).bin")
+                    || hashData.Contains("(Track 0.5).bin")
                     || hashData.Contains("(Track 00).bin")
+                    || hashData.Contains("(Track 00.1).bin")
                     || hashData.Contains("(Track 00.2).bin")
+                    || hashData.Contains("(Track 00.3).bin")
+                    || hashData.Contains("(Track 00.4).bin")
+                    || hashData.Contains("(Track 00.5).bin")
                     || hashData.Contains("(Track A).bin")
+                    || hashData.Contains("(Track A.1).bin")
                     || hashData.Contains("(Track A.2).bin")
+                    || hashData.Contains("(Track A.3).bin")
+                    || hashData.Contains("(Track A.4).bin")
+                    || hashData.Contains("(Track A.5).bin")
                     || hashData.Contains("(Track AA).bin")
-                    || hashData.Contains("(Track AA.2).bin"))
+                    || hashData.Contains("(Track AA.1).bin")
+                    || hashData.Contains("(Track AA.2).bin")
+                    || hashData.Contains("(Track AA.3).bin")
+                    || hashData.Contains("(Track AA.4).bin")
+                    || hashData.Contains("(Track AA.5).bin"))
                 {
                     trackCount--;
                     resultProgress?.Report(ResultEventArgs.Success("Extra track found, skipping!"));

MPF.Frontend/ViewModels/CheckDumpViewModel.cs

@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
+using BinaryObjectScanner;
 using MPF.Frontend.ComboBoxItems;
 using MPF.Frontend.Tools;
 using SabreTools.RedumpLib.Data;
@@ -162,6 +164,39 @@ namespace MPF.Frontend.ViewModels
         }
         private bool _dumpingProgramComboBoxEnabled;
 
+        /// <summary>
+        /// Currently displayed status
+        /// </summary>
+        public string Status
+        {
+            get => _status;
+            set
+            {
+                _status = value;
+                TriggerPropertyChanged(nameof(Status));
+                TriggerPropertyChanged(nameof(StatusFirstLine));
+            }
+        }
+        private string _status;
+
+        /// <summary>
+        /// Currently displayed status trimmed to one line
+        /// </summary>
+        public string StatusFirstLine
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Status))
+                    return string.Empty;
+
+                var statusLines = Status.Split('\n');
+                if (statusLines.Length > 1)
+                    return statusLines[0] + " (...)";
+
+                return statusLines[0];
+            }
+        }
+
         /// <summary>
         /// Indicates the status of the check dump button
         /// </summary>
@@ -247,6 +282,7 @@ namespace MPF.Frontend.ViewModels
             _internalPrograms = [];
             _inputPath = string.Empty;
             _systems = [];
+            _status = string.Empty;
 
             SystemTypeComboBoxEnabled = true;
             InputPathTextBoxEnabled = true;
@@ -455,6 +491,12 @@ namespace MPF.Frontend.ViewModels
             bool cachedCanExecuteSelectionChanged = CanExecuteSelectionChanged;
             DisableEventHandlers();
 
+            // Get progress indicators
+            var resultProgress = new Progress<ResultEventArgs>();
+            resultProgress.ProgressChanged += ProgressUpdated;
+            var protectionProgress = new Progress<ProtectionProgress>();
+            protectionProgress.ProgressChanged += ProgressUpdated;
+
             // Populate an environment
             var env = new DumpEnvironment(Options,
                 Path.GetFullPath(InputPath.Trim('"')),
@@ -465,7 +507,10 @@ namespace MPF.Frontend.ViewModels
                 parameters: null);
 
             // Finally, attempt to do the output dance
-            var result = await env.VerifyAndSaveDumpOutput(processUserInfo: processUserInfo);
+            var result = await env.VerifyAndSaveDumpOutput(
+                resultProgress: resultProgress,
+                protectionProgress: protectionProgress,
+                processUserInfo: processUserInfo);
 
             // Reenable UI and event handlers, if necessary
             EnableUIElements();
@@ -475,6 +520,23 @@ namespace MPF.Frontend.ViewModels
             return result.Message;
         }
 
+        /// <summary>
+        /// Handler for Result ProgressChanged event
+        /// </summary>
+        private void ProgressUpdated(object? sender, ResultEventArgs value)
+        {
+            Status = value?.Message ?? string.Empty;
+        }
+
+        /// <summary>
+        /// Handler for ProtectionProgress ProgressChanged event
+        /// </summary>
+        private void ProgressUpdated(object? sender, ProtectionProgress value)
+        {
+            string message = $"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}";
+            Status = message;
+        }
+
         #endregion
     }
 }

MPF.Frontend/ViewModels/MainViewModel.cs

@@ -74,6 +74,20 @@ namespace MPF.Frontend.ViewModels
 
         #region Properties
 
+        /// <summary>
+        /// Indicates the status of the check dump menu item
+        /// </summary>
+        public bool AskBeforeQuit
+        {
+            get => _askBeforeQuit;
+            set
+            {
+                _askBeforeQuit = value;
+                TriggerPropertyChanged(nameof(AskBeforeQuit));
+            }
+        }
+        private bool _askBeforeQuit;
+
         /// <summary>
         /// Indicates the status of the check dump menu item
         /// </summary>
@@ -554,6 +568,7 @@ namespace MPF.Frontend.ViewModels
             _status = string.Empty;
             _systems = [];
 
+            AskBeforeQuit = false;
             OptionsMenuItemEnabled = true;
             CheckDumpMenuItemEnabled = true;
             CreateIRDMenuItemEnabled = true;
@@ -2146,6 +2161,9 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         public async void StartDumping()
         {
+            // Ask user to confirm before exiting application during a dump
+            AskBeforeQuit = true;
+            
             // One last check to determine environment, just in case
             _environment = DetermineEnvironment();
 
@@ -2155,24 +2173,29 @@ namespace MPF.Frontend.ViewModels
             // If still in custom parameter mode, check that users meant to continue or not
             if (ParametersCheckBoxEnabled == false && _displayUserMessage != null)
             {
-                bool? result = _displayUserMessage("Custom Changes", "It looks like you have custom parameters that have not been saved. Would you like to apply those changes before starting to dump?", 3, true);
+                bool? result = _displayUserMessage("Custom Changes", "It looks like you have custom parameters that have not been saved. Would you like to dump with these custom parameters?", 2, true);
                 if (result == true)
                 {
                     ParametersCheckBoxEnabled = true;
                     ProcessCustomParameters();
                 }
-                else if (result == null)
+                else
                 {
+                    // Re-allow quick exiting
+                    AskBeforeQuit = false;
                     return;
                 }
-                // If false, then we continue with the current known environment
             }
 
             try
             {
                 // Run pre-dumping validation checks
                 if (!ValidateBeforeDumping())
+                {
+                    // Re-allow quick exiting
+                    AskBeforeQuit = false;
                     return;
+                }
 
                 // Disable all UI elements apart from dumping button
                 DisableAllUIElements();
@@ -2201,6 +2224,9 @@ namespace MPF.Frontend.ViewModels
                     LogLn("No dumping command was run, submission information will not be gathered.");
                     Status = "Execution complete!";
 
+                    // Re-allow quick exiting
+                    AskBeforeQuit = false;
+
                     // Reset all UI elements
                     EnableAllUIElements();
                     return;
@@ -2227,6 +2253,9 @@ namespace MPF.Frontend.ViewModels
             }
             finally
             {
+                // Re-allow quick exiting
+                AskBeforeQuit = false;
+
                 // Reset all UI elements
                 EnableAllUIElements();
             }

MPF.Processors.Test/AaruTests.cs

@@ -127,6 +127,16 @@ namespace MPF.Processors.Test
             Assert.True(actual);
         }
 
+        [Fact]
+        public void FoundAnyFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM-zip");
+            string outputFilename = "test.aaruf";
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
+            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            Assert.True(actual);
+        }
+
         #endregion
 
         #region GenerateArtifacts

MPF.Processors.Test/BaseProcessorTests.cs

@@ -140,6 +140,76 @@ namespace MPF.Processors.Test
 
         #endregion
 
+        #region IsAudio
+
+        [Fact]
+        public void IsAudio_Null_False()
+        {
+            string? cue = null;
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsAudio_Empty_False()
+        {
+            string? cue = string.Empty;
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsAudio_Invalid_False()
+        {
+            string? cue = @"INVALID";
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsAudio_NoAudio_False()
+        {
+            string? cue = @"FILE ""track (Track 1).bin"" BINARY
+  TRACK 01 MODE1/2352
+    INDEX 01 00:00:00
+FILE ""track (Track 2).bin"" BINARY
+  TRACK 02 MODE1/2352
+    INDEX 01 00:00:00";
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsAudio_MixedTracks_False()
+        {
+            string? cue = @"FILE ""track (Track 1).bin"" BINARY
+  TRACK 01 MODE1/2352
+    INDEX 01 00:00:00
+FILE ""track (Track 2).bin"" BINARY
+  TRACK 02 AUDIO
+    INDEX 00 00:00:00
+    INDEX 01 00:02:00";
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.False(actual);
+        }
+
+        [Fact]
+        public void IsAudio_AllAudio_True()
+        {
+            string? cue = @"FILE ""track (Track 1).bin"" BINARY
+  TRACK 01 AUDIO
+    INDEX 00 00:00:00
+    INDEX 01 00:02:00
+FILE ""track (Track 2).bin"" BINARY
+  TRACK 02 AUDIO
+    INDEX 00 00:00:00
+    INDEX 01 00:02:00";
+            bool actual = BaseProcessor.IsAudio(cue);
+            Assert.True(actual);
+        }
+
+        #endregion
+
         #region SplitString
 
         [Fact]

MPF.Processors.Test/CleanRipTests.cs

@@ -112,6 +112,16 @@ namespace MPF.Processors.Test
             Assert.True(actual);
         }
 
+        [Fact]
+        public void FoundAnyFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD-zip");
+            string outputFilename = "test.iso";
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
+            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            Assert.True(actual);
+        }
+
         #endregion
 
         #region GenerateArtifacts

MPF.Processors.Test/DiscImageCreatorTests.cs

@@ -181,6 +181,16 @@ namespace MPF.Processors.Test
             Assert.True(actual);
         }
 
+        [Fact]
+        public void FoundAnyFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM-zip");
+            string outputFilename = "test.cue";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
+            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            Assert.True(actual);
+        }
+
         #endregion
 
         #region GenerateArtifacts

MPF.Processors.Test/MPF.Processors.Test.csproj

@@ -24,22 +24,22 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.18.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.assert" Version="2.9.3" />
+        <PackageReference Include="xunit.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.Processors.Test/PS3CFWTests.cs

@@ -91,6 +91,16 @@ namespace MPF.Processors.Test
             Assert.True(actual);
         }
 
+        [Fact]
+        public void FoundAnyFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay-zip");
+            string outputFilename = "test.iso";
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
+            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            Assert.True(actual);
+        }
+
         #endregion
 
         #region GenerateArtifacts

MPF.Processors.Test/ProcessingToolTests.cs

@@ -426,6 +426,46 @@ namespace MPF.Processors.Test
 
         #endregion
 
+        #region NormalizeShiftJIS
+
+        [Fact]
+        public void NormalizeShiftJIS_Null_Empty()
+        {
+            byte[]? contents = null;
+            string? actual = ProcessingTool.NormalizeShiftJIS(contents);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void NormalizeShiftJIS_Empty_Empty()
+        {
+            byte[]? contents = [];
+            string? actual = ProcessingTool.NormalizeShiftJIS(contents);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void NormalizeShiftJIS_NoShiftJIS_Valid()
+        {
+            string? expected = "ABCDE";
+            byte[]? contents = [0x41, 0x42, 0x43, 0x44, 0x45];
+            string? actual = ProcessingTool.NormalizeShiftJIS(contents);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void NormalizeShiftJIS_ShiftJIS_Valid()
+        {
+            string? expected = "ABCDE ひらがな";
+            byte[]? contents = [0x41, 0x42, 0x43, 0x44, 0x45, 0x20, 0x82, 0xD0, 0x82, 0xE7, 0x82, 0xAA, 0x82, 0xC8];
+            string? actual = ProcessingTool.NormalizeShiftJIS(contents);
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
+
         #region GetUMDCategory
 
         [Theory]

MPF.Processors.Test/RedumperTests.cs

@@ -29,7 +29,7 @@ namespace MPF.Processors.Test
             var processor = new Redumper(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
 
             var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Equal(14, actual.Count);
+            Assert.Equal(16, actual.Count);
         }
 
         [Fact]
@@ -40,7 +40,7 @@ namespace MPF.Processors.Test
             var processor = new Redumper(RedumpSystem.IBMPCcompatible, MediaType.DVD);
 
             var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Equal(16, actual.Count);
+            Assert.Equal(17, actual.Count);
         }
 
         [Fact]
@@ -100,6 +100,16 @@ namespace MPF.Processors.Test
             Assert.Empty(actual);
         }
 
+        [Fact]
+        public void FoundAllFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Redumper", "CDROM-zip");
+            string outputFilename = "test.cue";
+            var processor = new Redumper(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
+            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
         #endregion
 
         #region FoundAnyFiles
@@ -145,7 +155,7 @@ namespace MPF.Processors.Test
             string outputFilename = "test.cue";
             var processor = new Redumper(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
             var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
-            Assert.Equal(9, actual.Count);
+            Assert.Equal(10, actual.Count);
         }
 
         #endregion
@@ -193,7 +203,7 @@ namespace MPF.Processors.Test
             string outputFilename = "test.cue";
             var processor = new Redumper(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
             var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
-            Assert.Equal(9, actual.Count);
+            Assert.Equal(10, actual.Count);
         }
 
         #endregion
@@ -997,7 +1007,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GetSCSIErrorCount_Valid_Filled()
         {
-            long expected = 12345;
+            long expected = 23456;
             string log = Path.Combine(Environment.CurrentDirectory, "TestData", "Redumper", "CDROM", "test.log");
             long actual = Redumper.GetSCSIErrorCount(log);
             Assert.Equal(expected, actual);
@@ -1170,7 +1180,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GetVersion_Valid_Filled()
         {
-            string? expected = "v1980.01.01 build_00";
+            string? expected = "v1980.01.01 build_000";
             string log = Path.Combine(Environment.CurrentDirectory, "TestData", "Redumper", "CDROM", "test.log");
             string? actual = Redumper.GetVersion(log);
             Assert.Equal(expected, actual);
@@ -1236,7 +1246,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GetWriteOffset_Valid_Filled()
         {
-            string? expected = "offset";
+            string? expected = "+0";
             string log = Path.Combine(Environment.CurrentDirectory, "TestData", "Redumper", "CDROM", "test.log");
             string? actual = Redumper.GetWriteOffset(log);
             Assert.Equal(expected, actual);

MPF.Processors.Test/TestData/Aaru/CDROM-zip/test.aaruf

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/CleanRip/DVD-zip/test.iso

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test.bin

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test.cue

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test.img

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test.scm

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/DiscImageCreator/CDROM-zip/test_CSSKey.txt

@@ -0,0 +1,3 @@
+<< GetDVDProtection >>
+DecryptedDiscKey[020]: No Key
+LBA: 0, Filename: FILE, No TitleKey

MPF.Processors.Test/TestData/PS3CFW/BluRay-zip/test.iso

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/Redumper/CDROM-zip/test.cue

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/Redumper/CDROM-zip/test.scram

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/Redumper/CDROM/test.cache

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/Redumper/CDROM/test.flip

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/Redumper/CDROM/test.log

@@ -1,5 +1,5 @@
 DUMPING DATE (DateTime.Now)
-redumper v1980.01.01 build_00 [Jan 01 1980, 00:00:00]
+redumper v1980.01.01 build_000
 << GetVersion (above) >>
 
 << GetParameters >>
@@ -31,6 +31,8 @@ REDUMP.ORG errors: 12345
 C2: 1
 REDUMP.ORG errors: 2
 
+C2: 12 samples
+
 << GetGDROMHeader >>
 DC [
     build date: date
@@ -127,8 +129,8 @@ SS [
         00F0 TEST DATA
 
 << GetSCSIErrorCount >>
-SCSI: 23456 samples
-SCSI: 12345
+SCSI: 23456
+SCSI: 12345 samples
 
 << GetSecuROMData >>
 SecuROM [
@@ -162,4 +164,4 @@ Universal Hash (SHA-1): da39a3ee5e6b4b0d3255bfef95601890afd80709
 volume identifier: label
 
 << GetWriteOffset >>
-disc write offset: offset
+disc write offset: +0

MPF.Processors.Test/TestData/UmdImageCreator/UMD-zip/test.iso

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/TestData/XboxBackupCreator/DVD-zip/test.iso

@@ -0,0 +1 @@
+TEST DATA

MPF.Processors.Test/UmdImageCreatorTests.cs

@@ -67,6 +67,16 @@ namespace MPF.Processors.Test
             Assert.Empty(actual);
         }
 
+        [Fact]
+        public void FoundAllFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "UmdImageCreator", "UMD-zip");
+            string outputFilename = "test.iso";
+            var processor = new UmdImageCreator(RedumpSystem.SonyPlayStationPortable, MediaType.UMD);
+            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
         #endregion
 
         #region FoundAnyFiles

MPF.Processors.Test/XboxBackupCreatorTests.cs

@@ -67,6 +67,16 @@ namespace MPF.Processors.Test
             Assert.Empty(actual);
         }
 
+        [Fact]
+        public void FoundAllFiles_ValidZip_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "XboxBackupCreator", "DVD-zip");
+            string outputFilename = "test.iso";
+            var processor = new XboxBackupCreator(RedumpSystem.MicrosoftXbox, MediaType.DVD);
+            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
         #endregion
 
         #region FoundAnyFiles

MPF.Processors/BaseProcessor.cs

@@ -239,6 +239,11 @@ namespace MPF.Processors
 #endif
             }
 
+#if NET452_OR_GREATER || NETCOREAPP
+            // Close the log archive, if it exists
+            logArchive?.Dispose();
+#endif
+
             return missingFiles;
         }
 
@@ -605,6 +610,36 @@ namespace MPF.Processors
             }
         }
 
+        /// <summary>
+        /// Returns true if a Cuesheet consists of only Audio tracks, false otherwise 
+        /// </summary>
+        internal static bool IsAudio(string? cue)
+        {
+            // Ignore invalid inputs
+            if (string.IsNullOrEmpty(cue))
+                return false;
+
+            bool tracksExist = false;
+            foreach (string cueLine in cue!.Split(["\r\n", "\n", "\r"], StringSplitOptions.None))
+            {
+                string line = cueLine.Trim();
+                if (line.Length == 0)
+                    continue;
+
+                string[] tokens = line.Split([" ", "\t"], StringSplitOptions.RemoveEmptyEntries);
+
+                if (tokens.Length < 3 || !tokens[0].Equals("TRACK", StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                tracksExist = true;
+                string trackType = tokens[2].ToUpperInvariant();
+                if (trackType != "AUDIO" && trackType != "CDG")
+                    return false;
+            }
+
+            return tracksExist;
+        }
+
         /// <summary>
         /// Split a string with newlines every <paramref name="count"/> characters
         /// </summary>

MPF.Processors/MPF.Processors.csproj

@@ -12,7 +12,7 @@
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
         <WarningsNotAsErrors>NU5104</WarningsNotAsErrors>
 
         <!-- Package Properties -->
@@ -32,19 +32,14 @@
         <None Include="README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`))">
-        <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    </ItemGroup>
-    <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
-        <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
-    </ItemGroup>
-
     <ItemGroup>
-        <PackageReference Include="SabreTools.Hashing" Version="1.4.1" />
+        <PackageReference Include="SabreTools.Hashing" Version="1.4.2" />
         <PackageReference Include="SabreTools.Models" Version="1.5.8" />
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
         <PackageReference Include="SabreTools.Serialization" Version="1.8.6" />
+        <PackageReference Include="System.IO.Compression" Version="4.3.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`))" />
+        <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.4" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

MPF.Processors/PS3CFW.cs

@@ -58,9 +58,19 @@ namespace MPF.Processors
             // Try to determine the name of the GetKey file
             string getKeyPath = string.Empty;
             if (File.Exists($"{basePath}.getkey.log"))
+            {
                 getKeyPath = $"{basePath}.getkey.log";
+            }
             else if (File.Exists(Path.Combine(baseDir, "getkey.log")))
+            {
                 getKeyPath = Path.Combine(baseDir, "getkey.log");
+            }
+            else
+            {
+                string[] getKeyFiles = Directory.GetFiles(baseDir, "*.getkey.log");
+                if (getKeyFiles.Length > 0)
+                    getKeyPath = getKeyFiles[0];
+            }
 
             // Get dumping date from GetKey log date
             if (!string.IsNullOrEmpty(getKeyPath))
@@ -68,9 +78,19 @@ namespace MPF.Processors
 
             // TODO: Put info about abnormal PIC info beyond 132 bytes in comments?
             if (File.Exists($"{basePath}.disc.pic"))
+            {
                 info.Extras!.PIC = GetPIC($"{basePath}.disc.pic", 264);
+            }
             else if (File.Exists(Path.Combine(baseDir, "disc.pic")))
+            {
                 info.Extras!.PIC = GetPIC(Path.Combine(baseDir, "disc.pic"), 264);
+            }
+            else
+            {
+                string[] discPicFiles = Directory.GetFiles(baseDir, "*.disc.pic");
+                if (discPicFiles.Length > 0)
+                    info.Extras!.PIC = GetPIC(discPicFiles[0], 264);
+            }
 
             // Parse Disc Key, Disc ID, and PIC from the getkey.log file
             if (ProcessingTool.ParseGetKeyLog(getKeyPath, out string? key, out string? id, out string? pic))
@@ -96,11 +116,11 @@ namespace MPF.Processors
                     return [
                         new([$"{outputFilename}.iso", $"{outputFilename}.ISO"], OutputFileFlags.Required),
                         new([$"{outputFilename}.cue", $"{outputFilename}.CUE"], OutputFileFlags.Zippable),
-                        new([$"{outputFilename}.getkey.log", "getkey.log"], OutputFileFlags.Required
+                        new RegexOutputFile($"getkey\\.log$", OutputFileFlags.Required
                             | OutputFileFlags.Artifact
                             | OutputFileFlags.Zippable,
                             "getkey_log"),
-                        new([$"{outputFilename}.disc.pic", "disc.pic"], OutputFileFlags.Required
+                        new RegexOutputFile($"disc\\.pic$", OutputFileFlags.Required
                             | OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "disc_pic"),

MPF.Processors/ProcessingTool.cs

@@ -22,6 +22,15 @@ namespace MPF.Processors
     /// </summary>
     public static class ProcessingTool
     {
+        #region Constants
+
+        /// <summary>
+        /// Shift-JIS encoding for detection and conversion
+        /// </summary>
+        private static readonly Encoding ShiftJIS = Encoding.GetEncoding(932);
+
+        #endregion
+
         #region Information Extraction
 
         /// <summary>
@@ -163,14 +172,15 @@ namespace MPF.Processors
             if (!File.Exists(filename))
                 return null;
 
+            // Read the entire file as bytes
+            byte[] bytes = File.ReadAllBytes(filename);
+
             // If we're reading as binary
             if (binary)
-            {
-                byte[] bytes = File.ReadAllBytes(filename);
                 return BitConverter.ToString(bytes).Replace("-", string.Empty);
-            }
 
-            return File.ReadAllText(filename);
+            // If we're reading as text
+            return NormalizeShiftJIS(bytes);
         }
 
         /// <summary>
@@ -292,6 +302,66 @@ namespace MPF.Processors
             return di.Units[0]?.Body?.DiscTypeIdentifier;
         }
 
+        /// <summary>
+        /// Normalize a byte array that may contain Shift-JIS characters
+        /// </summary>
+        /// <param name="contents">String as a byte array to normalize</param>
+        /// <returns>Normalized version of a string</returns>
+        public static string NormalizeShiftJIS(byte[]? contents)
+        {
+            // Invalid arrays are passed as-is
+            if (contents == null || contents.Length == 0)
+                return string.Empty;
+
+#if NET462_OR_GREATER || NETCOREAPP
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+#endif
+
+            // If the line contains Shift-JIS characters
+            if (BytesContainsShiftJIS(contents))
+                return ShiftJIS.GetString(contents);
+
+            return Encoding.UTF8.GetString(contents);
+        }
+
+        /// <summary>
+        /// Determine if a byte array contains Shift-JIS encoded characters
+        /// </summary>
+        /// <param name="line">Byte array to check for Shift-JIS encoding</param>
+        /// <returns>True if the byte array contains Shift-JIS characters, false otherwise</returns>
+        /// <see href="https://www.lemoda.net/c/detect-shift-jis/"/> 
+        internal static bool BytesContainsShiftJIS(byte[] bytes)
+        {
+            // Invalid arrays do not count
+            if (bytes == null || bytes.Length == 0)
+                return false;
+
+            // Loop through and check each pair of bytes
+            for (int i = 0; i < bytes.Length - 1; i++)
+            {
+                byte first = bytes[i];
+                byte second = bytes[i + 1];
+
+                if ((first >= 0x81 && first <= 0x84) ||
+                    (first >= 0x87 && first <= 0x9F))
+                {
+                    if (second >= 0x40 && second <= 0x9E)
+                        return true;
+                    else if (second >= 0x9F && second <= 0xFC)
+                        return true;
+                }
+                else if (first >= 0xE0 && first <= 0xEF)
+                {
+                    if (second >= 0x40 && second <= 0x9E)
+                        return true;
+                    else if (second >= 0x9F && second <= 0xFC)
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
         #endregion
 
         #region Category Extraction
@@ -969,6 +1039,52 @@ namespace MPF.Processors
             }
         }
 
+        /// <summary>
+        /// Determine if a given SS.bin is valid (Known XGD type and SSv2 if XGD3)
+        /// </summary>
+        /// <param name="ssPath">Path to the SS file to check</param>
+        /// <returns>True if valid, false otherwise</returns>
+        public static bool IsValidSS(string ssPath)
+        {
+            if (!File.Exists(ssPath))
+                return false;
+
+            byte[] ss = File.ReadAllBytes(ssPath);
+            if (ss.Length != 2048)
+                return false;
+
+            return IsValidSS(ss);
+        }
+
+        /// <summary>
+        /// Determine if a given SS is valid (2048 bytes, known XGD type, and SSv2 if XGD3)
+        /// </summary>
+        /// <param name="ss">Byte array of SS sector</param>
+        /// <returns>True if SS is valid, false otherwise</returns>
+        public static bool IsValidSS(byte[] ss)
+        {
+            // Check 1 sector long
+            if (ss.Length != 2048)
+                return false;
+
+            // Must be a valid XGD type
+            if (!GetXGDType(ss, out int xgdType))
+                return false;
+
+            // Only continue to check SSv2 for XGD3
+            if (xgdType != 3)
+                return true;
+            
+            // Determine if XGD3 SS.bin is SSv1 (Original Kreon) or SSv2 (0800 / Repaired Kreon)
+#if NET20
+            var checkArr = new byte[72];
+            Array.Copy(ss, 32, checkArr, 0, 72);
+            return Array.Exists(checkArr, x => x != 0);
+#else
+            return ss.Skip(32).Take(72).Any(x => x != 0);
+#endif
+        }
+
         /// <summary>
         /// Determine if a given SS has already been cleaned
         /// </summary>
@@ -1108,6 +1224,19 @@ namespace MPF.Processors
             // Determine XGD type
             if (!GetXGDType(ss, out int xgdType))
                 return false;
+            
+            // Determine if XGD3 SS.bin is SSv1 (Original Kreon) or SSv2 (0800 / Repaired Kreon)
+#if NET20
+            var checkArr = new byte[72];
+            Array.Copy(ss, 32, checkArr, 0, 72);
+            bool ssv2 = Array.Exists(checkArr, x => x != 0);
+#else
+            bool ssv2 = ss.Skip(32).Take(72).Any(x => x != 0);
+#endif
+
+            // Do not produce an SS hash for bad SS (SSv1 XGD3 / Unrepaired Kreon SS)
+            if(xgdType == 3 && !ssv2)
+                return false;
 
             switch (xgdType)
             {
@@ -1139,15 +1268,6 @@ namespace MPF.Processors
                     return true;
 
                 case 3:
-                    // Determine if XGD3 SS.bin is SSv1 (Kreon) or SSv2 (0800)
-#if NET20
-                    var checkArr = new byte[72];
-                    Array.Copy(ss, 32, checkArr, 0, 72);
-                    bool ssv2 = Array.Exists(checkArr, x => x != 0);
-#else
-                    bool ssv2 = ss.Skip(32).Take(72).Any(x => x != 0);
-#endif
-
                     if (ssv2)
                     {
                         ss[72] = 1;   // 0x01

MPF.Processors/Redumper.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+#if NET452_OR_GREATER || NETCOREAPP
+using System.IO.Compression;
+#endif
+using System.Text;
 using System.Text.RegularExpressions;
 using SabreTools.Hashing;
 using SabreTools.RedumpLib;
@@ -66,24 +70,21 @@ namespace MPF.Processors
                     }
 
                     // Attempt to get multisession data
-                    string cdMultiSessionInfo = GetMultisessionInformation($"{basePath}.log") ?? string.Empty;
+                    string? cdMultiSessionInfo = GetMultisessionInformation($"{basePath}.log");
                     if (!string.IsNullOrEmpty(cdMultiSessionInfo))
-                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.Multisession] = cdMultiSessionInfo;
+                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.Multisession] = cdMultiSessionInfo!;
 
-                    // Attempt to get the universal hash, if it's an audio disc
-                    if (System.IsAudio())
+                    // Attempt to get extra metadata if it's an audio disc
+                    if (IsAudio(info.TracksAndWriteOffsets.Cuesheet))
                     {
                         string universalHash = GetUniversalHash($"{basePath}.log") ?? string.Empty;
                         info.CommonDiscInfo.CommentsSpecialFields![SiteCode.UniversalHash] = universalHash;
-                    }
 
-                    // Attempt to get the non-zero data start, if it's an audio disc
-                    if (System.IsAudio())
-                    {
                         string ringNonZeroDataStart = GetRingNonZeroDataStart($"{basePath}.log") ?? string.Empty;
-                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.RingNonZeroDataStart] = ringNonZeroDataStart;
+                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.RingNonZeroDataStart] = ringNonZeroDataStart!;
+
                         string ringPerfectAudioOffset = GetRingPerfectAudioOffset($"{basePath}.log") ?? string.Empty;
-                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.RingPerfectAudioOffset] = ringPerfectAudioOffset;
+                        info.CommonDiscInfo.CommentsSpecialFields![SiteCode.RingPerfectAudioOffset] = ringPerfectAudioOffset!;
                     }
 
                     break;
@@ -91,6 +92,9 @@ namespace MPF.Processors
                 case MediaType.DVD:
                 case MediaType.HDDVD:
                 case MediaType.BluRay:
+                case MediaType.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                case MediaType.NintendoWiiUOpticalDisc:
                     info.Extras!.PVD = GetPVD($"{basePath}.log") ?? "Disc has no PVD";
                     info.TracksAndWriteOffsets!.ClrMameProData = GetDatfile($"{basePath}.log");
 
@@ -113,10 +117,10 @@ namespace MPF.Processors
 
                     // Attempt to get the error count
                     long scsiErrors = GetSCSIErrorCount($"{basePath}.log");
-                    info.CommonDiscInfo!.ErrorsCount = (scsiErrors == -1 ? "Error retrieving error count" : scsiErrors.ToString());;
+                    info.CommonDiscInfo!.ErrorsCount = (scsiErrors == -1 ? "Error retrieving error count" : scsiErrors.ToString());
 
                     // Bluray-specific options
-                    if (Type == MediaType.BluRay)
+                    if (Type == MediaType.BluRay || Type == MediaType.NintendoWiiUOpticalDisc)
                     {
                         int trimLength = -1;
                         switch (System)
@@ -183,9 +187,9 @@ namespace MPF.Processors
                 case RedumpSystem.MicrosoftXbox:
                     // If .dmi / .pfi / .ss don't already exist, create them
                     if (!File.Exists($"{basePath}.dmi"))
-                        RemoveHeader($"{basePath}.manufacturer", $"{basePath}.dmi");
+                        RemoveHeaderAndTrim($"{basePath}.manufacturer", $"{basePath}.dmi");
                     if (!File.Exists($"{basePath}.pfi"))
-                        RemoveHeader($"{basePath}.physical", $"{basePath}.pfi");
+                        RemoveHeaderAndTrim($"{basePath}.physical", $"{basePath}.pfi");
                     if (!File.Exists($"{basePath}.ss"))
                         ProcessingTool.CleanSS($"{basePath}.security", $"{basePath}.ss");
 
@@ -208,9 +212,12 @@ namespace MPF.Processors
                     string? pfi1Crc = HashTool.GetFileHash($"{basePath}.pfi", HashType.CRC32);
                     if (pfi1Crc != null)
                         info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.PFIHash] = pfi1Crc.ToUpperInvariant();
-                    string? ss1Crc = HashTool.GetFileHash($"{basePath}.ss", HashType.CRC32);
-                    if (ss1Crc != null)
-                        info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.SSHash] = ss1Crc.ToUpperInvariant();
+                    if (ProcessingTool.IsValidSS($"{basePath}.ss"))
+                    {
+                        string? ss1Crc = HashTool.GetFileHash($"{basePath}.ss", HashType.CRC32);
+                        if (ss1Crc != null)
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.SSHash] = ss1Crc.ToUpperInvariant();
+                    }
 
                     string? ranges1 = ProcessingTool.GetSSRanges($"{basePath}.ss");
                     if (!string.IsNullOrEmpty(ranges1))
@@ -221,9 +228,9 @@ namespace MPF.Processors
                 case RedumpSystem.MicrosoftXbox360:
                     // If .dmi / .pfi / .ss don't already exist, create them
                     if (!File.Exists($"{basePath}.dmi"))
-                        RemoveHeader($"{basePath}.manufacturer", $"{basePath}.dmi");
+                        RemoveHeaderAndTrim($"{basePath}.manufacturer", $"{basePath}.dmi");
                     if (!File.Exists($"{basePath}.pfi"))
-                        RemoveHeader($"{basePath}.physical", $"{basePath}.pfi");
+                        RemoveHeaderAndTrim($"{basePath}.physical", $"{basePath}.pfi");
                     if (!File.Exists($"{basePath}.ss"))
                         ProcessingTool.CleanSS($"{basePath}.security", $"{basePath}.ss");
 
@@ -245,9 +252,12 @@ namespace MPF.Processors
                     string? pfi23Crc = HashTool.GetFileHash($"{basePath}.pfi", HashType.CRC32);
                     if (pfi23Crc != null)
                         info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.PFIHash] = pfi23Crc.ToUpperInvariant();
-                    string? ss23Crc = HashTool.GetFileHash($"{basePath}.ss", HashType.CRC32);
-                    if (ss23Crc != null)
-                        info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.SSHash] = ss23Crc.ToUpperInvariant();
+                    if (ProcessingTool.IsValidSS($"{basePath}.ss"))
+                    {
+                        string? ss23Crc = HashTool.GetFileHash($"{basePath}.ss", HashType.CRC32);
+                        if (ss23Crc != null)
+                            info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.SSHash] = ss23Crc.ToUpperInvariant();
+                    }
 
                     string? ranges23 = ProcessingTool.GetSSRanges($"{basePath}.ss");
                     if (!string.IsNullOrEmpty(ranges23))
@@ -373,7 +383,7 @@ namespace MPF.Processors
                     string? ps2Protection = GetPlayStation2Protection($"{basePath}.log");
                     if (ps2Protection != null)
                         info.CommonDiscInfo!.Comments = $"<b>Protection</b>: {ps2Protection}" + Environment.NewLine;
-                    
+
                     break;
 
                 case RedumpSystem.SonyPlayStation3:
@@ -423,16 +433,21 @@ namespace MPF.Processors
                 case MediaType.CDROM:
                 case MediaType.GDROM:
                     List<OutputFile> cdrom = [
+                        // .asus is obsolete: newer redumper produces .cache instead
                         new($"{outputFilename}.asus", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "asus"),
                         new($"{outputFilename}.atip", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "atip"),
+                        new($"{outputFilename}.cache", OutputFileFlags.Binary
+                            | OutputFileFlags.Zippable,
+                            "cache"),
                         new($"{outputFilename}.cdtext", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "cdtext"),
                         new($"{outputFilename}.cue", OutputFileFlags.Required),
+                        new($"{outputFilename}.flip", OutputFileFlags.None),
                         new($"{outputFilename}.fulltoc", OutputFileFlags.Required
                             | OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
@@ -511,9 +526,13 @@ namespace MPF.Processors
                 case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     return [
+                        // .asus is obsolete: newer redumper produces .cache instead
                         new($"{outputFilename}.asus", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "asus"),
+                        new($"{outputFilename}.cache", OutputFileFlags.Binary
+                            | OutputFileFlags.Zippable,
+                            "cache"),
                         new($"{outputFilename}.dmi", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "dmi"),
@@ -616,15 +635,54 @@ namespace MPF.Processors
         /// </summary>
         /// <param name="log">Log file location</param>
         private static bool DatfileExists(string log)
-            => GetDatfile(log) != null;
+        {
+            // Uncompressed outputs
+            if (GetDatfile(log) != null)
+                return true;
+
+            // Check for the log file
+            string outputFilename = Path.GetFileName(log);
+            string? outputDirectory = Path.GetDirectoryName(log);
+            string basePath = Path.GetFileNameWithoutExtension(outputFilename);
+            if (!string.IsNullOrEmpty(outputDirectory))
+                basePath = Path.Combine(outputDirectory, basePath);
+
+#if NET20 || NET35 || NET40
+            // Assume the zipfile has the file in it
+            return File.Exists($"{basePath}_logs.zip");
+#else
+            // If the zipfile doesn't exist
+            if (!File.Exists($"{basePath}_logs.zip"))
+                return false;
+
+            try
+            {
+                // Try to open the archive
+                using ZipArchive archive = ZipFile.OpenRead($"{basePath}_logs.zip");
+
+                // Get the log entry and check it, if possible
+                var entry = archive.GetEntry(outputFilename);
+                if (entry == null)
+                    return false;
+
+                using var sr = new StreamReader(entry.Open());
+                return GetDatfile(sr) != null;
+            }
+            catch
+            {
+                return false;
+            }
+#endif
+        }
 
         /// <summary>
-        /// Copies a file with the header removed
+        /// Copies a file with the header removed and filesize trimmed
         /// </summary>
         /// <param name="inputFilename">Filename of file to copy from</param>
         /// <param name="outputFilename">Filename of file to copy to</param>
         /// <param name="headerLength">Length of header to remove</param>
-        private static bool RemoveHeader(string inputFilename, string outputFilename, int headerLength = 4)
+        /// <param name="headerLength">Length of file to trim to</param>
+        private static bool RemoveHeaderAndTrim(string inputFilename, string outputFilename, int headerLength = 4, int trimLength = 2048)
         {
             // If the file doesn't exist, we can't copy
             if (!File.Exists(inputFilename))
@@ -647,13 +705,9 @@ namespace MPF.Processors
                 // Skip the header
                 inputStream.Seek(headerLength, SeekOrigin.Begin);
 
-                // inputStream.CopyTo(outputStream);
-                byte[] buffer = new byte[4096];
-                int count;
-                while ((count = inputStream.Read(buffer, 0, buffer.Length)) != 0)
-                {
-                    outputStream.Write(buffer, 0, count);
-                }
+                byte[] buffer = new byte[trimLength];
+                int count = inputStream.Read(buffer, 0, buffer.Length);
+                outputStream.Write(buffer, 0, count);
 
                 return true;
             }
@@ -728,14 +782,16 @@ namespace MPF.Processors
                     return null;
 
                 // Now that we're at the relevant entries, read each line in and concatenate
-                string? cueString = string.Empty, line = sr.ReadLine()?.Trim();
+                var sb = new StringBuilder();
+                string? line = sr.ReadLine()?.Trim();
                 while (!string.IsNullOrEmpty(line))
                 {
-                    cueString += line + "\n";
+                    // TODO: Figure out how to use NormalizeShiftJIS here
+                    sb.AppendLine(line);
                     line = sr.ReadLine()?.Trim();
                 }
 
-                return cueString.TrimEnd('\n');
+                return sb.ToString().TrimEnd('\n');
             }
             catch
             {
@@ -758,6 +814,24 @@ namespace MPF.Processors
             try
             {
                 using var sr = File.OpenText(log);
+                return GetDatfile(sr);
+            }
+            catch
+            {
+                // We don't care what the exception is right now
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get the datfile from the input file, if possible
+        /// </summary>
+        /// <param name="sr">StreamReader representing the input file</param>
+        /// <returns>Newline-delimited datfile if possible, null on error</returns>
+        internal static string? GetDatfile(StreamReader sr)
+        {
+            try
+            {
                 string? datString = null;
 
                 // Find all occurrences of the hash information 
@@ -966,28 +1040,69 @@ namespace MPF.Processors
                         break;
 
                     // C2: <error count>
+                    // C2: <error count> samples
                     if (line.StartsWith("C2:"))
                     {
+                        // Ensure there are the correct number of parts
                         string[] parts = line.Split(' ');
-                        if (long.TryParse(parts[1], out long c2TrackErrors))
-                            c2Errors += c2TrackErrors;
-                        else
+                        if (parts.Length < 2)
+                        {
                             c2Errors = -1;
+                            break;
+                        }
+
+                        // If there is a parsing error, return
+                        if (!long.TryParse(parts[1], out long c2TrackErrors))
+                        {
+                            c2Errors = -1;
+                            break;
+                        }
+
+                        // Standard error counts always add sectors
+                        if (parts.Length == 2)
+                        {
+                            c2Errors += c2TrackErrors;
+                        }
+                        // Correction counts are ignored for now
+                        else if (parts.Length > 2)
+                        {
+                            // No-op
+                        }
                     }
 
                     // REDUMP.ORG errors: <error count>
                     else if (line.StartsWith("REDUMP.ORG errors:"))
                     {
+                        // Ensure there are the correct number of parts
                         string[] parts = line!.Split(' ');
-                        if (long.TryParse(parts[2], out long redumpTrackErrors))
-                            redumpErrors += redumpTrackErrors;
-                        else
+                        if (parts.Length < 3)
+                        {
                             redumpErrors = -1;
+                            break;
+                        }
+
+                        // If there is a parsing error, return
+                        if (!long.TryParse(parts[2], out long redumpTrackErrors))
+                        {
+                            redumpErrors = -1;
+                            break;
+                        }
+
+                        // Always add Redump errors
+                        redumpErrors += redumpTrackErrors;
                     }
 
-                    // If either value is -1, exit the loop
-                    if (c2Errors == -1 || redumpErrors == -1)
-                        break;
+                    // Reset C2 errors when a media errors section is found
+                    else if (line.StartsWith("media errors:"))
+                    {
+                        c2Errors = 0;
+                    }
+
+                    // Reset Redump errors when an INFO block is found
+                    else if (line.StartsWith("*** INFO"))
+                    {
+                        redumpErrors = 0;
+                    }
                 }
 
                 // If either error count is -1, then an issue occurred
@@ -1624,12 +1739,22 @@ namespace MPF.Processors
             try
             {
                 // If we have a perfect audio offset, return
+                bool perfectAudioOffsetApplied = false;
                 using var sr = File.OpenText(log);
                 while (!sr.EndOfStream)
                 {
                     string? line = sr.ReadLine()?.TrimStart();
                     if (line?.StartsWith("Perfect Audio Offset applied") == true)
-                        return "+0";
+                    {
+                        perfectAudioOffsetApplied = true;
+                    }
+                    else if (line?.StartsWith("disc write offset: +0") == true)
+                    {
+                        if (perfectAudioOffsetApplied)
+                            return "+0";
+                        else
+                            return null;
+                    }
                 }
 
                 // We couldn't detect it then
@@ -1777,6 +1902,7 @@ namespace MPF.Processors
 
             try
             {
+                long errorCount = 0;
                 using var sr = File.OpenText(log);
 
                 // Find the error counts
@@ -1787,16 +1913,45 @@ namespace MPF.Processors
                         break;
 
                     // SCSI: <error count>
-                    if (line.StartsWith("SCSI: ") && !line.EndsWith("samples"))
+                    // SCSI: <error count> samples
+                    if (line.StartsWith("SCSI: "))
                     {
+                        // Ensure there are the correct number of parts
                         string[] parts = line.Split(' ');
-                        if (long.TryParse(parts[1], out long scsiErrors))
-                            return scsiErrors;
+                        if (parts.Length < 2)
+                        {
+                            errorCount = -1;
+                            break;
+                        }
+
+                        // If there is a parsing error, return
+                        if (!long.TryParse(parts[1], out long scsiErrors))
+                        {
+                            errorCount = -1;
+                            break;
+                        }
+
+                        // Standard error counts always add sectors
+                        if (parts.Length == 2)
+                        {
+                            errorCount += scsiErrors;
+                        }
+                        // Correction counts are ignored for now
+                        else if (parts.Length > 2)
+                        {
+                            // No-op
+                        }
+                    }
+
+                    // Reset SCSI errors when a media errors section is found
+                    else if (line.StartsWith("media errors:"))
+                    {
+                        errorCount = 0;
                     }
                 }
 
-                // We couldn't detect it then
-                return -1;
+                // Return error count, default -1 if no SCSI error count found
+                return errorCount;
             }
             catch
             {
@@ -1987,6 +2142,7 @@ namespace MPF.Processors
             // Samples:
             // redumper v2022.10.28 [Oct 28 2022, 05:41:43] (print usage: --help,-h)
             // redumper v2022.12.22 build_87 [Dec 22 2022, 01:56:26]
+            // redumper v2025.03.29 build_481
 
             try
             {
@@ -2001,7 +2157,7 @@ namespace MPF.Processors
 
                 // Generate regex
                 // Permissive
-                var regex = new Regex(@"^redumper (v.+) \[.+\]", RegexOptions.Compiled);
+                var regex = new Regex(@"^redumper (v.+)", RegexOptions.Compiled);
                 // Strict
                 //var regex = new Regex(@"^redumper (v\d{4}\.\d{2}\.\d{2}(| build_\d+)) \[.+\]", RegexOptions.Compiled);
 

MPF.Processors/XboxBackupCreator.cs

@@ -165,7 +165,7 @@ namespace MPF.Processors
                             | OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "dmi"),
-                        new RegexOutputFile("[lL]og.txt", OutputFileFlags.Required
+                        new RegexOutputFile("[lL]og\\.txt", OutputFileFlags.Required
                             | OutputFileFlags.Artifact
                             | OutputFileFlags.Zippable,
                             "log"),

MPF.UI/MPF.UI.csproj

@@ -18,7 +18,7 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <UseWindowsForms>true</UseWindowsForms>
         <UseWPF>true</UseWPF>
-        <VersionPrefix>3.3.0</VersionPrefix>
+        <VersionPrefix>3.3.1</VersionPrefix>
 
         <!-- Package Properties -->
         <AssemblyName>MPF</AssemblyName>
@@ -70,7 +70,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
     </ItemGroup>
 
     <ItemGroup>

MPF.UI/Windows/CheckDumpWindow.xaml

@@ -110,6 +110,32 @@
                 </Grid>
             </GroupBox>
 
+            <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" Header="Status">
+                <UniformGrid Margin="5,5,5,5" Grid.ColumnSpan="2">
+                    <TextBlock x:Name="StatusLabel" VerticalAlignment="Center" HorizontalAlignment="Center"
+                               ToolTipService.ToolTip="{Binding Status, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                               Text="{Binding StatusFirstLine}" />
+                </UniformGrid>
+            </GroupBox>
+
+            <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <GroupBox.Template>
+                    <ControlTemplate TargetType="GroupBox">
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5">
+                            <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}" />
+                        </Border>
+                    </ControlTemplate>
+                </GroupBox.Template>
+                <Label>
+                    <Label.Content>
+                        <TextBlock TextWrapping="Wrap">
+                            <Run FontWeight="Bold" Foreground="Red" Text="WARNING:" />
+                            <Run Text="Check will overwrite both any existing submission information files as well as any log archives. Please make backups of those if you need to before running Check." />
+                        </TextBlock>
+                    </Label.Content>
+                </Label>
+            </GroupBox>
+
             <!-- Check Dump / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <GroupBox.Template>

MPF.UI/Windows/CheckDumpWindow.xaml.cs

@@ -166,6 +166,8 @@ namespace MPF.UI.Windows
                 bool? checkAgain = DisplayUserMessage("Check Complete", "The dump has been processed successfully! Would you like to check another dump?", 2, false);
                 if (checkAgain == false)
                     Close();
+                else
+                    CheckDumpViewModel.Status = string.Empty;
             }
             else
             {

MPF.UI/Windows/DiscInformationWindow.xaml.cs

@@ -232,7 +232,7 @@ namespace MPF.UI.Windows
                 AntiModchip!.Visibility = Visibility.Collapsed;
             if (submissionInfo.TracksAndWriteOffsets?.OtherWriteOffsets == null)
                 DiscOffset!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.DMIHash) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.DMIHash))
                 DMIHash!.Visibility = Visibility.Collapsed;
             if (submissionInfo.EDC?.EDC == null)
                 EDC!.Visibility = Visibility.Collapsed;
@@ -240,45 +240,45 @@ namespace MPF.UI.Windows
                 ErrorsCount!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.CommonDiscInfo?.EXEDateBuildDate))
                 EXEDateBuildDate!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.Filename) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.Filename))
                 Filename!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.Extras?.Header))
                 Header!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.InternalName) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.InternalName))
                 InternalName!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.InternalSerialName) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.InternalSerialName))
                 InternalSerialName!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.Multisession) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.Multisession))
                 Multisession!.Visibility = Visibility.Collapsed;
             if (submissionInfo.CopyProtection?.LibCrypt == null)
                 LibCrypt!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.CopyProtection?.LibCryptData))
                 LibCryptData!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.PFIHash) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.PFIHash))
                 PFIHash!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.Extras?.PIC))
                 PIC!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.Extras?.PVD))
                 PVD!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.RingNonZeroDataStart) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.RingNonZeroDataStart))
                 RingNonZeroDataStart!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.RingPerfectAudioOffset) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.RingPerfectAudioOffset))
                 RingPerfectAudioOffset!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.CopyProtection?.SecuROMData))
                 SecuROMData!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.SSHash) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.SSHash))
                 SSHash!.Visibility = Visibility.Collapsed;
             if (string.IsNullOrEmpty(submissionInfo.Extras?.SecuritySectorRanges))
                 SecuritySectorRanges!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.SSVersion) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.SSVersion))
                 SSVersion!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.UniversalHash) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.UniversalHash))
                 UniversalHash!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.VolumeLabel) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.VolumeLabel))
                 VolumeLabel!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.XeMID) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.XeMID))
                 XeMID!.Visibility = Visibility.Collapsed;
-            if (submissionInfo.CommonDiscInfo?.CommentsSpecialFields?.ContainsKey(SiteCode.XMID) != true)
+            if (ShouldCollapseComment(submissionInfo, SiteCode.XMID))
                 XMID!.Visibility = Visibility.Collapsed;
         }
 
@@ -306,7 +306,7 @@ namespace MPF.UI.Windows
                     L1Info!.Header = "Label Side";
                     L1MasteringRing!.Label = "Mastering Ring";
                     L1MasteringSID!.Label = "Mastering SID";
-                    L1Toolstamp!.Label = "Mastering SID";
+                    L1Toolstamp!.Label = "Toolstamp/Mastering Code";
                     L1MouldSID!.Label = "Mould SID";
                     L1AdditionalMould!.Label = "Additional Mould";
                     break;
@@ -455,6 +455,23 @@ namespace MPF.UI.Windows
             }
         }
 
+        /// <summary>
+        /// Determine if a comment field should be collapsed in read-only view
+        /// </summary>
+        private static bool ShouldCollapseComment(SubmissionInfo? submissionInfo, SiteCode siteCode)
+        {
+            // If the special fields don't exist
+            if (submissionInfo?.CommonDiscInfo?.CommentsSpecialFields == null)
+                return true;
+
+            // If the key doesn't exist
+            if (!submissionInfo.CommonDiscInfo.CommentsSpecialFields.TryGetValue(siteCode, out string? value))
+                return true;
+
+            // Collapse if the value doesn't exist
+            return string.IsNullOrEmpty(value);
+        }
+
         #endregion
 
         #region Event Handlers

MPF.UI/Windows/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 #if NET40
 using System.Threading.Tasks;
@@ -74,6 +75,7 @@ namespace MPF.UI.Windows
         {
 #if NET40_OR_GREATER || NETCOREAPP
             InitializeComponent();
+            this.Closing += MainWindowClosing;
 #endif
 
 #if NET452_OR_GREATER || NETCOREAPP
@@ -210,6 +212,19 @@ namespace MPF.UI.Windows
                 CustomMessageBox.Show(this, message, "Version Update Check", MessageBoxButton.OK, different ? MessageBoxImage.Exclamation : MessageBoxImage.Information);
         }
 
+        /// <summary>
+        /// Ask to confirm quitting, when an operation is running
+        /// </summary>
+        public void MainWindowClosing(object? sender, CancelEventArgs e)
+        {
+            if (MainViewModel.AskBeforeQuit)
+            {
+                MessageBoxResult result = CustomMessageBox.Show(this, "A dump is still being processed, are you sure you want to quit?", "Quit", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+                if (result == MessageBoxResult.No)
+                    e.Cancel = true;
+            }
+        }
+
         /// <summary>
         /// Build a dummy SubmissionInfo and display it for testing
         /// </summary>

MPF.UI/Windows/OptionsWindow.xaml

@@ -297,28 +297,28 @@
                                 </Grid.RowDefinitions>
 
                                 <Label Grid.Row="0" Grid.Column="0" Content="CD" />
-                                <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="0" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForCDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedCD}" />
                                 <TextBox x:Name="DumpSpeedCDTextBox" Grid.Row="0" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" VerticalAlignment="Center"
                                     Text="{Binding ElementName=DumpSpeedCDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
                                 <Label Grid.Row="1" Grid.Column="0" Content="DVD" />
-                                <Slider x:Name="DumpSpeedDVDSlider" Grid.Row="1" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                <Slider x:Name="DumpSpeedDVDSlider" Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForDVDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedDVD}"  />
                                 <TextBox x:Name="DumpSpeedDVDTextBox" Grid.Row="1" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" VerticalAlignment="Center"
                                    Text="{Binding ElementName=DumpSpeedDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
                                 <Label Grid.Row="2" Grid.Column="0" Content="HD-DVD" />
-                                <Slider x:Name="DumpSpeedHDDVDSlider" Grid.Row="2" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                <Slider x:Name="DumpSpeedHDDVDSlider" Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForHDDVDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedHDDVD}"  />
                                 <TextBox x:Name="DumpSpeedHDDVDTextBox" Grid.Row="2" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" VerticalAlignment="Center"
                                    Text="{Binding ElementName=DumpSpeedHDDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
                                 <Label Grid.Row="3" Grid.Column="0" Content="BD" />
-                                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="3" Grid.Column="1" Minimum="1" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="3" Grid.Column="1" Minimum="0" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForBDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedBD}"  />
                                 <TextBox x:Name="DumpSpeedBDTextBox" Grid.Row="3" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" VerticalAlignment="Center"

MPF.UI/Windows/WindowBase.cs

@@ -56,7 +56,6 @@ namespace MPF.UI.Windows
             {
                 1 => MessageBoxButton.OK,
                 2 => MessageBoxButton.YesNo,
-                3 => MessageBoxButton.YesNoCancel,
 
                 // This should not happen, but default to "OK"
                 _ => MessageBoxButton.OK,

README.md

@@ -54,6 +54,10 @@ The main CLI has some known limitations that are documented in code and in some
 
 MPF.Check is a commandline-only program that allows users to generate submission information from their personal rips. This program supports the outputs from Redumper, Aaru, DiscImageCreator, Cleanrip, and UmdImageCreator. Running this program without any parameters will display the help text, including all supported parameters.
 
+**WARNING:** Both the standalone Check executable and the Check functionality in the UI will overwrite both any existing submission information files as well as any log archives. Please make backups of those if you need to before running Check.
+
+**WARNING:** Both the standalone Check executable and the Check functionality in the UI assume that the output files are what were output by the original dumping program. If you need to reparse any outputs that have already been processed by MPF, you will need to unzip all files as if it were the original folder layout.
+
 ## System Requirements
 
 MPF.UI, MPF.CLI, and MPF.Check have the same system requirements for running, with the exception that MPF.UI is Windows-only.

publish-nix.sh

@@ -74,6 +74,140 @@ VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0")
 VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0")
 VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64")
 
+# Download programs step
+function download_programs() {
+    # Define download constants
+    DL_PREFIXES=("Aaru" "Creator" "Redumper")
+    declare -A DL_MAP
+
+    # Aaru - Skipped for now
+    DL_MAP["Aaru_linux-arm64"]="" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_linux_arm64.tar.gz"
+    DL_MAP["Aaru_linux-x64"]=""   #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_linux_amd64.tar.gz"
+    DL_MAP["Aaru_osx-arm64"]=""   #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_macos.zip"
+    DL_MAP["Aaru_osx-x64"]=""     #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_macos.zip"
+    DL_MAP["Aaru_win-arm64"]=""   #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_aarch64.zip"
+    DL_MAP["Aaru_win-x86"]=""     #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x86.zip"
+    DL_MAP["Aaru_win-x64"]=""     #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip"
+
+    # DiscImageCreator
+    DL_MAP["Creator_linux-arm64"]=""
+    DL_MAP["Creator_linux-x64"]="https://github.com/user-attachments/files/20000183/DiscImageCreator_20250501.tar.gz"
+    DL_MAP["Creator_osx-arm64"]="https://github.com/user-attachments/files/20000184/DiscImageCreator_20250501.zip"
+    DL_MAP["Creator_osx-x64"]="https://github.com/user-attachments/files/20000184/DiscImageCreator_20250501.zip"
+    DL_MAP["Creator_win-arm64"]=""
+    DL_MAP["Creator_win-x86"]="https://github.com/user-attachments/files/20000181/DiscImageCreator_20250501.zip"
+    DL_MAP["Creator_win-x64"]="https://github.com/user-attachments/files/20000181/DiscImageCreator_20250501.zip"
+
+    # Redumper
+    DL_MAP["Redumper_linux-arm64"]=""
+    DL_MAP["Redumper_linux-x64"]="https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Linux64.zip"
+    DL_MAP["Redumper_osx-arm64"]="https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Darwin64.zip"
+    DL_MAP["Redumper_osx-x64"]="https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Darwin64.zip"
+    DL_MAP["Redumper_win-arm64"]=""
+    DL_MAP["Redumper_win-x86"]="https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Windows32.zip"
+    DL_MAP["Redumper_win-x64"]="https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Windows64.zip"
+
+    # Download and extract files
+    echo "===== Downloading Required Programs ====="
+    for PREFIX in "${DL_PREFIXES[@]}"; do
+        for RUNTIME in "${CHECK_RUNTIMES[@]}"; do
+            # Check for a valid URL
+            DL_KEY=$PREFIX"_"$RUNTIME
+            URL=${DL_MAP[$DL_KEY]}
+            if [ -z "$URL" ]; then
+                continue
+            fi
+
+            # Download the file to a predictable local file
+            EXT=${URL##*.}
+            OUTNAME=$PREFIX"_"$RUNTIME.$EXT
+            wget $URL -O $OUTNAME
+
+            TEMPDIR=$PREFIX"_"$RUNTIME-temp
+            OUTDIR=$PREFIX"_"$RUNTIME-dir
+
+            # Handle gzipped files separately
+            if [[ $URL =~ \.tar\.gz$ ]]; then
+                mkdir $TEMPDIR
+                tar -xvf $OUTNAME -C $TEMPDIR
+            else
+                unzip -u $OUTNAME -d $TEMPDIR
+            fi
+
+            # Create the proper structure
+            mkdir $OUTDIR
+            mv $TEMPDIR/*/** $OUTDIR/
+            mv $TEMPDIR/** $OUTDIR/
+            rm -rf $TEMPDIR
+
+            if [ -d "$OUTDIR/bin" ]; then
+                mv $OUTDIR/bin/* $OUTDIR/
+            fi
+
+            # Remove empty subdirectories
+            find . -empty -type d -delete
+        done
+    done
+
+    # Create UI directories and copy data
+    for FRAMEWORK in "${UI_FRAMEWORKS[@]}"; do
+        for RUNTIME in "${UI_RUNTIMES[@]}"; do
+            for PREFIX in "${DL_PREFIXES[@]}"; do
+                OUTDIR=$PREFIX"_"$RUNTIME-dir
+                if [ ! -d "$OUTDIR" ]; then
+                    continue
+                fi
+
+                if [ $INCLUDE_DEBUG = true ]; then
+                    mkdir -p MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}
+                    cp -rfp $OUTDIR/* MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}/
+                fi
+
+                mkdir -p MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}
+                cp -rfp $OUTDIR/* MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}/
+            done
+        done
+    done
+
+    # Create CLI directories and copy data
+    for FRAMEWORK in "${CHECK_FRAMEWORKS[@]}"; do
+        for RUNTIME in "${CHECK_RUNTIMES[@]}"; do
+            for PREFIX in "${DL_PREFIXES[@]}"; do
+                OUTDIR=$PREFIX"_"$RUNTIME-dir
+                if [ ! -d "$OUTDIR" ]; then
+                    continue
+                fi
+
+                if [ $INCLUDE_DEBUG = true ]; then
+                    mkdir -p MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}
+                    cp -rfp $OUTDIR/* MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}/
+                fi
+
+                mkdir -p MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}
+                cp -rfp $OUTDIR/* MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/${PREFIX}/
+            done
+        done
+    done
+
+    # Clean up the downloaded files and directories
+    for PREFIX in "${DL_PREFIXES[@]}"; do
+        for RUNTIME in "${CHECK_RUNTIMES[@]}"; do
+            DL_KEY=$PREFIX"_"$RUNTIME
+            URL=${DL_MAP[$DL_KEY]}
+            if [ -z "$URL" ]; then
+                continue
+            fi
+
+            EXT=${URL##*.}
+            OUTNAME=$PREFIX"_"$RUNTIME.$EXT
+            OUTDIR=$PREFIX"_"$RUNTIME-dir
+
+            rm $OUTNAME
+            rm -rf $OUTDIR
+        done
+    done
+}
+
 # Only build if requested
 if [ $NO_BUILD = false ]; then
     # Restore Nuget packages for all builds
@@ -206,43 +340,7 @@ fi
 if [ $NO_ARCHIVE = false ]; then
     # Download and extract, if needed
     if [ $INCLUDE_PROGRAMS = true ]; then
-        echo "===== Downloading Required Programs ====="
-
-        # Aaru
-        # --- Skipped for now ---
-
-        # DiscImageCreator
-        wget https://github.com/user-attachments/files/18287520/DiscImageCreator_20250101.zip
-        unzip -u DiscImageCreator_20250101.zip
-
-        # Redumper
-        wget https://github.com/superg/redumper/releases/download/build_438/redumper-2024.11.03_build438-win64.zip
-        unzip redumper-2024.11.03_build438-win64.zip
-
-        # Create directories and copy data
-        for FRAMEWORK in "${UI_FRAMEWORKS[@]}"; do
-            for RUNTIME in "${UI_RUNTIMES[@]}"; do
-                if [ $INCLUDE_DEBUG = true ]; then
-                    mkdir -p MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator
-                    cp -rfp Release_ANSI/* MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator/
-
-                    mkdir -p MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper
-                    cp -rfp redumper-2024.11.03_build438-win64/bin/redumper.exe MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper/
-                fi
-
-                mkdir -p MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator
-                cp -rfp Release_ANSI/* MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator/
-
-                mkdir -p MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper
-                cp -rfp redumper-2024.11.03_build438-win64/bin/redumper.exe MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper/
-            done
-        done
-
-        # Clean up the downloaded files and directories
-        rm DiscImageCreator_20250101.zip
-        rm -r Release_ANSI
-        rm redumper-2024.11.03_build438-win64.zip
-        rm -r redumper-2024.11.03_build438-win64
+        download_programs
     fi
 
     # Create UI archives
@@ -310,10 +408,18 @@ if [ $NO_ARCHIVE = false ]; then
             # Only include Debug if set
             if [ $INCLUDE_DEBUG = true ]; then
                 cd $BUILD_FOLDER/MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/
-                zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip .
+                if [ $INCLUDE_PROGRAMS = true ]; then
+                    zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip .
+                else
+                    zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip . -x 'Programs/*'
+                fi
             fi
             cd $BUILD_FOLDER/MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/
-            zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip .
+            if [ $INCLUDE_PROGRAMS = true ]; then
+                zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip .
+            else
+                zip -r $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip . -x 'Programs/*'
+            fi
         done
     done
 

publish-win.ps1

@@ -64,6 +64,142 @@ $VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0')
 $VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0')
 $VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64')
 
+# Download programs step
+function Download-Programs {
+    # Define download constants
+    $DL_PREFIXES = ("Aaru", "Creator", "Redumper")
+    $DL_MAP = @{
+        # Aaru - Skipped for now
+        "Aaru_linux-arm64"     = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_linux_arm64.tar.gz"
+        "Aaru_linux-x64"       = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_linux_amd64.tar.gz"
+        "Aaru_osx-arm64"       = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_macos.zip"
+        "Aaru_osx-x64"         = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_macos.zip"
+        "Aaru_win-arm64"       = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_aarch64.zip"
+        "Aaru_win-x86"         = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x86.zip"
+        "Aaru_win-x64"         = "" #"https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip"
+
+        # DiscImageCreator
+        "Creator_linux-arm64"  = ""
+        "Creator_linux-x64"    = "https://github.com/user-attachments/files/20000183/DiscImageCreator_20250501.tar.gz"
+        "Creator_osx-arm64"    = "https://github.com/user-attachments/files/20000184/DiscImageCreator_20250501.zip"
+        "Creator_osx-x64"      = "https://github.com/user-attachments/files/20000184/DiscImageCreator_20250501.zip"
+        "Creator_win-arm64"    = ""
+        "Creator_win-x86"      = "https://github.com/user-attachments/files/20000181/DiscImageCreator_20250501.zip"
+        "Creator_win-x64"      = "https://github.com/user-attachments/files/20000181/DiscImageCreator_20250501.zip"
+
+        # Redumper
+        "Redumper_linux-arm64" = ""
+        "Redumper_linux-x64"   = "https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Linux64.zip"
+        "Redumper_osx-arm64"   = "https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Darwin64.zip"
+        "Redumper_osx-x64"     = "https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Darwin64.zip"
+        "Redumper_win-arm64"   = ""
+        "Redumper_win-x86"     = "https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Windows32.zip"
+        "Redumper_win-x64"     = "https://github.com/superg/redumper/releases/download/build_585/redumper-2025.05.21_build585-Windows64.zip"
+    }
+
+    # Download and extract files
+    Write-Host "===== Downloading Required Programs ====="
+    foreach ($PREFIX in $DL_PREFIXES) {
+        foreach ($RUNTIME in $CHECK_RUNTIMES) {
+            # Check for a valid URL
+            $DL_KEY = $PREFIX + "_" + $RUNTIME
+            $URL = $DL_MAP[$DL_KEY]
+            if ( [string]::IsNullOrEmpty($URL) ) {
+                continue
+            }
+
+            # Download the file to a predictable local file
+            $EXT = [System.IO.Path]::GetExtension($URL)
+            $OUTNAME = $PREFIX + "_" + $RUNTIME + $EXT
+            Invoke-WebRequest -Uri $URL -OutFile $OUTNAME
+
+            $TEMPDIR = $PREFIX + "_" + $RUNTIME + "-temp"
+            $OUTDIR = $PREFIX + "_" + $RUNTIME + "-dir"
+
+            # Handle gzipped files separately
+            if ($EXT -eq ".gz") {
+                mkdir $TEMPDIR
+                tar -xvf $OUTNAME -C $TEMPDIR
+            }
+            else {
+                Expand-Archive -LiteralPath $OUTNAME -DestinationPath "$TEMPDIR"
+            }
+
+            # Create the proper structure
+            Move-Item -Path "$BUILD_FOLDER/$TEMPDIR/*" -Destination "$BUILD_FOLDER/$OUTDIR"
+            Remove-Item -Path "$TEMPDIR" -Recurse -Force
+
+            if ([System.IO.Directory]::Exists("$OUTDIR/bin")) {
+                Move-Item -Path "$BUILD_FOLDER/$OUTDIR/bin/*" -Destination "$BUILD_FOLDER/$OUTDIR"
+            }
+
+            # Remove empty subdirectories
+            $EMPTY = Get-ChildItem $OUTDIR -directory -recurse | Where-Object { (Get-ChildItem $_.fullName).count -eq 0 } | Select-Object -expandproperty FullName
+            $EMPTY | Foreach-Object { Remove-Item $_ }
+        }
+    }
+
+    # Create UI directories and copy data
+    foreach ($FRAMEWORK in $UI_FRAMEWORKS) {
+        foreach ($RUNTIME in $UI_RUNTIMES) {
+            foreach ($PREFIX in $DL_PREFIXES) {
+                $OUTDIR = $BUILD_FOLDER + "/" + $PREFIX + "_" + $RUNTIME + "-dir"
+                if (![System.IO.Directory]::Exists($PREFIX + "_" + $RUNTIME + "-dir")) {
+                    continue
+                }
+
+                if ($INCLUDE_DEBUG.IsPresent) {
+                    New-Item -Name "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX" -Type Directory -ErrorAction SilentlyContinue
+                    Copy-Item -Path "$OUTDIR/*" -Destination "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX/" -Recurse -Force
+                }
+
+                New-Item -Name "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX" -Type Directory -ErrorAction SilentlyContinue
+                Copy-Item -Path "$OUTDIR/*" -Destination "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX/" -Recurse -Force
+
+            }
+        }
+    }
+
+    # Create CLI directories and copy data
+    foreach ($FRAMEWORK in $CHECK_FRAMEWORKS) {
+        foreach ($RUNTIME in $CHECK_RUNTIMES) {
+            foreach ($PREFIX in $DL_PREFIXES) {
+                $OUTDIR = $BUILD_FOLDER + "/" + $PREFIX + "_" + $RUNTIME + "-dir"
+                if (![System.IO.Directory]::Exists($OUTDIR)) {
+                    continue
+                }
+
+                if ($INCLUDE_DEBUG.IsPresent) {
+                    New-Item -Name "MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX" -Type Directory -ErrorAction SilentlyContinue
+                    Copy-Item -Path "$OUTDIR/*" -Destination "MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX/" -Recurse -Force
+                }
+
+                New-Item -Name "MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX" -Type Directory -ErrorAction SilentlyContinue
+                Copy-Item -Path "$OUTDIR/*" -Destination "MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/$PREFIX/" -Recurse -Force
+
+            }
+        }
+    }
+
+    # Clean up the downloaded files and directories
+    foreach ($PREFIX in $DL_PREFIXES) {
+        foreach ($RUNTIME in $CHECK_RUNTIMES) {
+            $DL_KEY = $PREFIX + "_" + $RUNTIME
+            $URL = $DL_MAP[$DL_KEY]
+            if ( [string]::IsNullOrEmpty($URL) ) {
+                continue
+            }
+
+            $EXT = [System.IO.Path]::GetExtension($URL)
+            $OUTNAME = $PREFIX + "_" + $RUNTIME + $EXT
+            $OUTDIR = $PREFIX + "_" + $RUNTIME + "-dir"
+
+            Remove-Item -Path $OUTNAME
+            Remove-Item -Path $OUTDIR -Recurse -Force
+        }
+    }
+}
+
 # Only build if requested
 if (!$NO_BUILD.IsPresent) {
     # Restore Nuget packages for all builds
@@ -187,43 +323,7 @@ if (!$NO_BUILD.IsPresent) {
 if (!$NO_ARCHIVE.IsPresent) {
     # Download and extract, if needed
     if ($INCLUDE_PROGRAMS.IsPresent) {
-        Write-Host "===== Downloading Required Programs ====="
-
-        # Aaru
-        # --- Skipped for now ---
-
-        # DiscImageCreator
-        Invoke-WebRequest -Uri https://github.com/user-attachments/files/18287520/DiscImageCreator_20250101.zip -OutFile DiscImageCreator_20250101.zip
-        Expand-Archive -LiteralPath "DiscImageCreator_20250101.zip" -DestinationPath "$BUILD_FOLDER/Creator"
-
-        # Redumper
-        Invoke-WebRequest -Uri https://github.com/superg/redumper/releases/download/build_438/redumper-2024.11.03_build438-win64.zip -OutFile redumper-2024.11.03_build438-win64.zip
-        Expand-Archive -LiteralPath "redumper-2024.11.03_build438-win64.zip" -DestinationPath "$BUILD_FOLDER/Redumper"
-
-        # Create directories and copy data
-        foreach ($FRAMEWORK in $UI_FRAMEWORKS) {
-            foreach ($RUNTIME in $UI_RUNTIMES) {
-                if ($INCLUDE_DEBUG.IsPresent) {
-                    New-Item -Name "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator" -Type Directory -ErrorAction SilentlyContinue
-                    Copy-Item -Path "Creator/Release_ANSI/*" -Destination "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator/" -Recurse -Force
-
-                    New-Item -Name "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper" -Type Directory -ErrorAction SilentlyContinue
-                    Copy-Item -Path "Redumper/redumper-2024.11.03_build438-win64/bin/redumper.exe" -Destination "MPF.UI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper/" -Force
-                }
-
-                New-Item -Name "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator" -Type Directory -ErrorAction SilentlyContinue
-                Copy-Item -Path "Creator/Release_ANSI/*" -Destination "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Creator/" -Recurse -Force
-
-                New-Item -Name "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper" -Type Directory -ErrorAction SilentlyContinue
-                Copy-Item -Path "Redumper/redumper-2024.11.03_build438-win64/bin/redumper.exe" -Destination "MPF.UI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/Programs/Redumper/" -Force
-            }
-        }
-
-        # Clean up the downloaded files and directories
-        Remove-Item -Path "DiscImageCreator_20250101.zip"
-        Remove-Item -Path "Creator" -Recurse
-        Remove-Item -Path "redumper-2024.11.03_build438-win64.zip"
-        Remove-Item -Path "Redumper" -Recurse
+        Download-Programs
     }
 
     # Create UI archives
@@ -286,10 +386,21 @@ if (!$NO_ARCHIVE.IsPresent) {
             # Only include Debug if set
             if ($INCLUDE_DEBUG.IsPresent) {
                 Set-Location -Path $BUILD_FOLDER/MPF.CLI/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/
-                7z a -tzip $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                if ($INCLUDE_PROGRAMS.IsPresent) {
+                    7z a -tzip $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                }
+                else {
+                    7z a -tzip -x!Programs/* $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                }
             }
+            
             Set-Location -Path $BUILD_FOLDER/MPF.CLI/bin/Release/${FRAMEWORK}/${RUNTIME}/publish/
-            7z a -tzip $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip *
+            if ($INCLUDE_PROGRAMS.IsPresent) {
+                7z a -tzip $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip *
+            }
+            else {
+                7z a -tzip -x!Programs/* $BUILD_FOLDER/MPF.CLI_${FRAMEWORK}_${RUNTIME}_release.zip *
+            }
         }
     }