Bump version

* Pregap start option

* Fix DriveType names

* Fix options window

* Update changelist

.github/ISSUE_TEMPLATE/issue-report.md

@@ -25,7 +25,7 @@ What version are you using?
 **Build**
 What runtime version are you using?
 
-- [ ] .NET 9.0 running on (Operating System)
+- [ ] .NET 10 running on (Operating System)
 
 **Describe the issue**
 A clear and concise description of what the bug is.

.github/workflows/build_and_test.yml

@@ -1,40 +1,59 @@
 name: Build and Test
 
 on:
-  push:
-    branches: [ "master" ]
+    push:
+        branches: ["master"]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    build:
+        runs-on: ubuntu-latest
 
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
-        
-    - name: Run tests
-      run: dotnet test
-      
-    - name: Run publish script
-      run: ./publish-nix.sh -dp
+        steps:
+            - name: Free Disk Space (Ubuntu)
+              uses: jlumbroso/free-disk-space@v1.3.1
+              with:
+                  dotnet: false
 
-    - name: Upload to rolling
-      uses: ncipollo/release-action@v1.14.0
-      with:
-        allowUpdates: True
-        artifacts: "*.nupkg,*.snupkg,*.zip"
-        body: 'Last built commit: ${{ github.sha }}'
-        name: 'Rolling Release'
-        prerelease: True
-        replacesArtifacts: True
-        tag: "rolling"
-        updateOnlyUnreleased: True
+            - uses: actions/checkout@v5
+              with:
+                  fetch-depth: 0
+
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v5
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      9.0.x
+                      10.0.x
+
+            - name: Run tests
+              run: dotnet test
+
+            - name: Run publish script
+              run: ./publish-nix.sh -dp
+
+            - name: Update rolling tag
+              run: |
+                  git config user.name "github-actions[bot]"
+                  git config user.email "github-actions[bot]@users.noreply.github.com"
+                  git tag -f rolling
+                  git push origin :refs/tags/rolling || true
+                  git push origin rolling --force
+
+            - name: Upload to rolling
+              uses: ncipollo/release-action@v1.20.0
+              with:
+                  allowUpdates: True
+                  artifacts: "*.nupkg,*.snupkg,*.zip"
+                  body: "Last built commit: ${{ github.sha }}
+
+                      ## UI Builds
+
+                      [Windows x64 UI Release](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net10.0-windows_win-x64_release.zip)
+
+                      [Windows x64 UI Debug](https://github.com/SabreTools/MPF/releases/download/rolling/MPF.UI_net10.0-windows_win-x64_debug.zip)"
+                  name: "Rolling Release"
+                  prerelease: True
+                  replacesArtifacts: True
+                  tag: "rolling"
+                  updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -3,24 +3,29 @@ name: Build PR
 on: [pull_request]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Free Disk Space (Ubuntu)
+              uses: jlumbroso/free-disk-space@v1.3.1
+              with:
+                  dotnet: false
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            6.0.x
-            8.0.x
-            9.0.x
+            - uses: actions/checkout@v5
 
-    - name: Restore dependencies
-      run: dotnet restore
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v5
+              with:
+                  dotnet-version: |
+                      8.0.x
+                      9.0.x
+                      10.0.x
 
-    - name: Build
-      run: dotnet build
+            - name: Restore dependencies
+              run: dotnet restore
 
-    - name: Test
-      run: dotnet test
+            - name: Build
+              run: dotnet build
+
+            - name: Test
+              run: dotnet test

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/MPF.Check/bin/Debug/net9.0/MPF.Check.dll",
+            "program": "${workspaceFolder}/MPF.Check/bin/Debug/net10.0/MPF.Check.dll",
             "args": [],
             "cwd": "${workspaceFolder}/MPF.Check",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -24,7 +24,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/MPF.CLI/bin/Debug/net9.0/MPF.CLI.dll",
+            "program": "${workspaceFolder}/MPF.CLI/bin/Debug/net10.0/MPF.CLI.dll",
             "args": [],
             "cwd": "${workspaceFolder}/MPF.CLI",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
@@ -32,6 +32,20 @@
             "stopAtEntry": false,
             "justMyCode": false
         },
+        {
+            "name": ".NET Core Launch (UI)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/MPF.UI/bin/Debug/net10.0-windows/MPF.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/MPF.UI",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "justMyCode": false
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

CHANGELIST.md

@@ -1,3 +1,248 @@
+### 3.6.0 (2025-11-28)
+
+- Add BCA to list of files to select in Check UI
+- Move Zstd compression helper to base processor
+- Add file merge method in CleanRip
+- Implement file merging in CleanRip
+- Support reparsing of MPF-processed outputs
+- Use WriteToFile extension for zip entries
+- Move output file implementations to separate namespace
+- Conditionally require state
+- Replace "We" comments
+- Parse XboxOne/SX Title IDs
+- Reduce chance of empty strings
+- Initial UI lang code
+- Move to enum-based model for UI language options
+- Slight cleanup to main window language handling
+- Clean up nullability
+- Clean up a bit of element work
+- Fill in some gaps
+- Add UI by default to launch
+- Continue UI translation work
+- Minor formatting cleanup
+- Ensure readers and writers dispose
+- Complete translation support
+- Add skeleton for 8 more languages
+- Add 8 more language menu items
+- Add basic translation for 8 more languages
+- Make Check flags toggle if config used
+- Add console print when Check loads from config
+- Add Ukrainian translation (superg)
+- Add list configuration commandline feature
+- Handle a provided log zip in Check operation
+- Allow files to be zipped but not deleted
+- Fix long translated strings
+- Allow placeholder files to be used in Check
+- Make .img not required for DIC outputs
+- Handle log zip path in information extraction
+- Redumper state file is not accessed
+- Fix tests broken by last commit
+- Regex outputs should not name based on pattern
+- Make log archive handling more user-apparent
+- Be selective on which systems to enable skeleton
+- Readme updates for accuracy
+- Separate out default program paths
+- Add per-OS executable names
+- Simplify first-run CLI experience
+- Change CLI first-run wording
+- Free disk space for runners
+- Possibly fix missing options string
+- Minor Spanish cleanup
+- Update RedumpLib to 1.8.0
+- Limit visibility of Compatible OS text box
+- Stop using long name for default system setting
+- Updated Polish translation
+- Fix rolling tag
+- Try to add UI links to rolling release
+- Slight tweak to automatic UI links
+- Add hidden language (NovaAurora)
+- Fix langs
+- Fix issues with path assembly
+- Clean up submission info use and log link text
+- Update Redumper to build 658
+- Pre-compress all skeletons for multi-track CDs
+- Add DVD-Video to list of copy protection scanning systems
+- Update Redumper to build 660
+- Use dated default output filenames
+- Update packages
+- Scan disc image if not multi-track
+- Scan multi-track images for protection
+- Move and rename new protection scan method
+- Path scan after image scan
+- Update Redumper to build 663
+- Name some type parameters
+- Ensure volume label is trimmed if used in filenames
+- Remove DPM identifier for StarForce Keyless
+- New Redumper Drive Pregap Start option
+- Clarify the unmounted device case
+- Add support for .NET 10
+- Update Redumper to build 665
+- Disable Zstd PKZIP outputs
+- Add commented fix for Zstd PKZIP
+- Reenable Zstd PKZIP outputs
+
+### 3.5.0 (2025-10-10)
+
+- Add failure if media type could not be determined
+- Tweaks to how failure cases are reported
+- Rename log zip on collision
+- Update packages
+- Use CommandLine library for CLI executables
+- Create interactive mode features
+- Minor cleanup around last added
+- Add placeholder command set creation
+- Reduce unnecessary shared code
+- Create and use main features for CLI and Check
+- Create and use base feature in Check
+- Create and use base feature in CLI
+- Assign inputs for interactive modes
+- Remove duplicate input declarations
+- Fix strange invocations of extension methods
+- Remove CommandOptions implementations
+- Exit early on parsing failures
+- Fix minor typo in verify inputs check
+- Allow but do not require config for Check
+- Update packages
+- More consistency in commandline programs
+- Use GC.SharpCompress as archive handling library
+- Start wiring through log compression changes
+- Fix minor issues with options loading
+- Finalize wire-through and clean up
+- Minor cleanup on interactive modes
+- Add more useful credentials inputs for Check
+- More gracefully handle "missing" media types
+- Use null or empty instead of just null
+- Guard against unzippable files
+- Fix incorrect flagging of a failed check
+- Use ZipWriterOptions instead of generic
+- Allow skeleton creation for all media types
+- Fix default value tests
+- Only allow skeleton creation for CD and DVD
+- Add preemptive new file support
+- Add preemptive helper for Zstd handling
+- Pre-compress skeleton files with Zstd
+- Fix broken file count tests
+- Pre-compress state files with Zstd
+- Use block-based reading instead of CopyTo
+- Enable skeleton output for all CLI runs
+- Fix test broken by last commit
+- Support detecting split Wii for CleanRip
+- Try to handle Windows-specific compression issue
+
+### 3.4.2 (2025-09-30)
+
+- Fix starting index for CLI
+- Fix missed package update
+- Require exact versions for build
+
+### 3.4.1 (2025-09-29)
+
+- Experiment with only showing media type box for DIC
+- Default media type box to hidden to avoid visual issues
+- Limit media type visibility further
+- Set media type visibility when options changed
+- Change label with media type visibility
+- Update media type visibility on system change
+- Return full result from dump checks
+- Fix logic from around Macrovision security driver filtering
+- Remove SkipMediaTypeDetection option, cleanup options window
+- Minor tweaks to frontend code
+- Default to CD speed range
+- Skip trying to set speeds if no drives
+- Fix tests
+- Make media type a named parameter for CLI
+- Reduction in media type use for dumping
+- Update BinaryObjectScanner to 3.4.3
+
+### 3.4.0 (2025-09-25)
+
+- Remove media type from Check Dump UI
+- Always trust the output files for processing
+- UI consistency when parameters are editable
+- Let the processor always deal with unsupported
+- Put a try/catch around GenerateArtifacts
+- Reduce preprocessing in DumpEnvironment
+- Update RedumpLib to 1.6.9
+- Treat all UMD as DL visually
+- Add CopyUpdateUrlToClipboard option
+- Fix inconsistency with newlines
+- Update Aaru to build 5.4.1
+- Fix for C2 error doubling issue (fuzz6001)
+- Update RedumpLib and LibIRD
+- Update LibIRD
+- Update redumper to build 653
+- Minor cleanup
+- Update test Nuget packages
+- Update RedumpLib to 1.7.1
+- Support multisession cache files
+- Update DIC to 20250901 (Windows/Linux only)
+- Fix UIC processing logic
+- Update RedumpLib, detect Playmaji Polymega system
+- Update redumper to b655
+- Support new versioning format in redumper (fuzz6001)
+- Add RedumperRefineSectorMode setting
+- Update BinaryObjectScanner to 3.4.0
+- Add context-sensitive protections helper method
+- Further flesh out framework
+- Add filters to handle Release Control output (Bestest)
+- Cleanup last commits, add tests
+- Update BinaryObjectScanner to 3.4.2
+- Update RedumpLib to 1.7.4
+
+### 3.3.3 (2025-07-18)
+
+- Handle layers for PS3CFW
+- Further clarify configuration requirements for CLI
+- Ignore volume labels with path separators
+- Reduce media-specific checks where unnecessary
+- Add DetermineMediaType scaffolding and tests
+- Fill out DetermineMediaType for Redumper
+- Fill out DetermineMediaType for Aaru
+- Fill out DetermineMediaType for DiscImageCreator
+- Enable Check to determine media type automatically
+- Fix missed test updates
+- Rename disc info to media info
+- Fix start index in Check
+- Use the correct base path for Check
+- Update redumper to build 611
+- IsAudio cleanup
+- IsAudio cleanup cleanup
+- Remove dead code in DIC processor
+- Set some default values for CLI
+- Address nullable default value
+- Better handling of Xbox/360, redumper build 613
+- Use reasonable default names for PlayStation systems
+- Swap PS1/2 back to original name handling
+- Only use serial for PS3/4/5 if no custom volume label
+- Fix unnecessary null assignment
+- Empty should be null (fuzz6001)
+- Remove legacy codes from info window
+- Net Yaroze only for PS1
+- Update RedumpLib to 1.6.8
+- Add new help and version flags for CLI and Check
+- Strip errant whitespace during path normalization
+- Simplify code from previous commit
+- Better handle mixed-separator paths
+- Slightly better IRD organization
+- Update redumper to build 631
+
+### 3.3.2 (2025-06-12)
+
+- Include Aaru in automatic builds
+- Update RedumpLib to 1.6.7
+- Update redumper, DriveType option, SS sanity check
+- Fix issues with last commit
+- Update tooltips/labels for controversial options
+- Add currently-hidden RetrieveMatchInformation option
+- Fix Redump default options
+- Fix tests from last commit
+- Remove unnecessary options property
+- Decouple retieval from login
+- Simplify Options naming where possible
+- Create multi-size icon
+- Fix size retrieval for Aaru
+- Update redumper to build 610
+
 ### 3.3.1 (2025-05-23)
 
 - Fix typo for L1Toolstamp!.Label (bikerspade)

MPF.CLI/Features/BaseFeature.cs

@@ -0,0 +1,276 @@
+
+using System;
+using System.IO;
+#if NET40
+using System.Threading.Tasks;
+#endif
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Web;
+using LogCompression = MPF.Processors.LogCompression;
+
+namespace MPF.CLI.Features
+{
+    internal abstract class BaseFeature : SabreTools.CommandLine.Feature
+    {
+        #region Properties
+
+        /// <summary>
+        /// User-defined options
+        /// </summary>
+        public Options Options { get; protected set; }
+
+        /// <summary>
+        /// Currently-selected system
+        /// </summary>
+        public RedumpSystem? System { get; protected set; }
+
+        /// <summary>
+        /// Media type to dump
+        /// </summary>
+        /// <remarks>Required for DIC and if custom parameters not set</remarks>
+        public MediaType? MediaType { get; protected set; }
+
+        /// <summary>
+        /// Path to the device to dump
+        /// </summary>
+        /// <remarks>Required if custom parameters are not set</remarks>
+        public string? DevicePath { get; protected set; }
+
+        /// <summary>
+        /// Path to the mounted filesystem to check
+        /// </summary>
+        /// <remarks>Should only be used when the device path is not readable</remarks>
+        public string? MountedPath { get; protected set; }
+
+        /// <summary>
+        /// Path to the output file
+        /// </summary>
+        /// <remarks>Required if custom parameters are not set</remarks>
+        public string? FilePath { get; protected set; }
+
+        /// <summary>
+        /// Override drive speed
+        /// </summary>
+        public int? DriveSpeed { get; protected set; }
+
+        /// <summary>
+        /// Custom parameters for dumping
+        /// </summary>
+        public string? CustomParams { get; protected set; }
+
+        #endregion
+
+        protected BaseFeature(string name, string[] flags, string description, string? detailed = null)
+            : base(name, flags, description, detailed)
+        {
+            Options = new Options()
+            {
+                // Internal Program
+                InternalProgram = InternalProgram.NONE,
+
+                // Extra Dumping Options
+                ScanForProtection = false,
+                AddPlaceholders = true,
+                PullAllInformation = false,
+                AddFilenameSuffix = false,
+                OutputSubmissionJSON = false,
+                IncludeArtifacts = false,
+                CompressLogFiles = false,
+                LogCompression = LogCompression.DeflateMaximum,
+                DeleteUnnecessaryFiles = false,
+                CreateIRDAfterDumping = false,
+
+                // Protection Scanning Options
+                ScanArchivesForProtection = true,
+                IncludeDebugProtectionInformation = false,
+                HideDriveLetters = false,
+
+                // Redump Login Information
+                RetrieveMatchInformation = true,
+                RedumpUsername = null,
+                RedumpPassword = null,
+            };
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            // Validate the supplied credentials
+            if (Options.RetrieveMatchInformation
+                && !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!",
+                };
+
+                Console.WriteLine(message);
+            }
+
+            // Validate the internal program
+            switch (Options.InternalProgram)
+            {
+                case InternalProgram.Aaru:
+                    if (!File.Exists(Options.AaruPath))
+                    {
+                        Console.Error.WriteLine("A path needs to be supplied in config.json for Aaru, exiting...");
+                        return false;
+                    }
+                    break;
+
+                case InternalProgram.DiscImageCreator:
+                    if (!File.Exists(Options.DiscImageCreatorPath))
+                    {
+                        Console.Error.WriteLine("A path needs to be supplied in config.json for DIC, exiting...");
+                        return false;
+                    }
+                    break;
+
+                case InternalProgram.Redumper:
+                    if (!File.Exists(Options.RedumperPath))
+                    {
+                        Console.Error.WriteLine("A path needs to be supplied in config.json for Redumper, exiting...");
+                        return false;
+                    }
+                    break;
+
+                default:
+                    Console.Error.WriteLine($"{Options.InternalProgram} is not a supported dumping program, exiting...");
+                    break;
+            }
+
+            // Ensure we have the values we need
+            if (CustomParams == null && DevicePath == null)
+            {
+                Console.Error.WriteLine("Either custom parameters or a device path need to be provided, exiting...");
+                return false;
+            }
+            if (Options.InternalProgram == InternalProgram.DiscImageCreator
+                && CustomParams == null
+                && (MediaType == null || MediaType == SabreTools.RedumpLib.Data.MediaType.NONE))
+            {
+                Console.Error.WriteLine("Media type is required for DiscImageCreator, exiting...");
+                return false;
+            }
+
+            // Normalize the file path
+            if (DevicePath != null && FilePath == null)
+            {
+                FilePath = $"track_{DateTime.Now:yyyyMMdd-HHmm}.bin";
+                if (Options.DefaultOutputPath != null)
+                    FilePath = Path.Combine(Options.DefaultOutputPath, FilePath);
+            }
+            if (FilePath != null)
+                FilePath = FrontendTool.NormalizeOutputPaths(FilePath, getFullPath: true);
+
+            // Get the speed from the options
+            int speed = DriveSpeed ?? FrontendTool.GetDefaultSpeedForMediaType(MediaType, Options);
+
+            // Populate an environment
+            var drive = Drive.Create(null, DevicePath ?? string.Empty);
+            var env = new DumpEnvironment(Options,
+                FilePath,
+                drive,
+                System,
+                Options.InternalProgram);
+            env.SetExecutionContext(MediaType, null);
+            env.SetProcessor();
+
+            // Process the parameters
+            string? paramStr = CustomParams ?? env.GetFullParameters(MediaType, speed);
+            if (string.IsNullOrEmpty(paramStr))
+            {
+                Console.Error.WriteLine("No valid environment could be created, exiting...");
+                return false;
+            }
+
+            env.SetExecutionContext(MediaType, paramStr);
+
+            // Invoke the dumping program
+            Console.WriteLine($"Invoking {Options.InternalProgram} using '{paramStr}'");
+            var dumpResult = env.Run(MediaType).GetAwaiter().GetResult();
+            Console.WriteLine(dumpResult.Message);
+            if (!dumpResult)
+                return false;
+
+            // If it was not a dumping command
+            if (!env.IsDumpingCommand())
+            {
+                Console.Error.WriteLine();
+                Console.WriteLine("Execution not recognized as dumping command, skipping processing...");
+                return true;
+            }
+
+            // If we have a mounted path, replace the environment
+            if (MountedPath != null && Directory.Exists(MountedPath))
+            {
+                drive = Drive.Create(null, MountedPath);
+                env = new DumpEnvironment(Options,
+                    FilePath,
+                    drive,
+                    System,
+                    internalProgram: null);
+                env.SetExecutionContext(MediaType, null);
+                env.SetProcessor();
+            }
+
+            // Finally, attempt to do the output dance
+            var verifyResult = env.VerifyAndSaveDumpOutput()
+                .ConfigureAwait(false).GetAwaiter().GetResult();
+            Console.WriteLine(verifyResult.Message);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Display help for MPF.CLI
+        /// </summary>
+        /// <param name="error">Error string to prefix the help text with</param>
+        public static void DisplayHelp()
+        {
+            Console.WriteLine("Usage:");
+            Console.WriteLine("MPF.CLI <system> [options]");
+            Console.WriteLine();
+            Console.WriteLine("Standalone Options:");
+            Console.WriteLine("?, h, help              Show this help text");
+            Console.WriteLine("version                 Print the program version");
+            Console.WriteLine("lc, listcodes           List supported comment/content site codes");
+            Console.WriteLine("lo, listconfig          List current configuration values");
+            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:");
+            Console.WriteLine("-u, --use <program>            Override configured dumping program name");
+            Console.WriteLine("-t, --mediatype <mediatype>    Set media type for dumping (Required for DIC)");
+            Console.WriteLine("-d, --device <devicepath>      Physical drive path (Required if no custom parameters set)");
+            Console.WriteLine("-m, --mounted <dirpath>        Mounted filesystem path for additional checks");
+            Console.WriteLine("-f, --file \"<filepath>\"        Output file path (Recommended, uses defaults otherwise)");
+            Console.WriteLine("-s, --speed <speed>            Override default dumping speed");
+            Console.WriteLine("-c, --custom \"<params>\"        Custom parameters to use");
+            Console.WriteLine();
+
+            Console.WriteLine("Dumping program paths and other settings can be found in the config.json file");
+            Console.WriteLine("generated next to the program by default. Ensure that all settings are to user");
+            Console.WriteLine("preference before running MPF.CLI.");
+            Console.WriteLine();
+
+            Console.WriteLine("Custom dumping parameters, if used, will fully replace the default parameters.");
+            Console.WriteLine("All dumping parameters need to be supplied if doing this.");
+            Console.WriteLine("Otherwise, a drive path is required.");
+            Console.WriteLine();
+
+            Console.WriteLine("Mounted filesystem path is only recommended on OSes that require block");
+            Console.WriteLine("device dumping, usually Linux and macOS.");
+            Console.WriteLine();
+        }
+    }
+}

MPF.CLI/Features/InteractiveFeature.cs

@@ -0,0 +1,190 @@
+
+using System;
+using System.IO;
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.CLI.Features
+{
+    internal sealed class InteractiveFeature : BaseFeature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "interactive";
+
+        private static readonly string[] _flags = ["i", "interactive"];
+
+        private const string _description = "Enable interactive mode";
+
+        #endregion
+
+        public InteractiveFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool ProcessArgs(string[] args, int index)
+        {
+            // Cache all args as inputs
+            for (int i = 1; i < args.Length; i++)
+            {
+                Inputs.Add(args[i]);
+            }
+
+            // Read the options from config, if possible
+            Options = OptionsLoader.LoadFromConfig();
+
+            // Create return values
+            MediaType = SabreTools.RedumpLib.Data.MediaType.NONE;
+            FilePath = Path.Combine(Options.DefaultOutputPath ?? "ISO", $"track_{DateTime.Now:yyyyMMdd-HHmm}.bin");
+            System = Options.DefaultSystem;
+
+            // Create state values
+            string? result;
+
+        root:
+            Console.Clear();
+            Console.WriteLine("MPF.CLI Interactive Mode - Main Menu");
+            Console.WriteLine("-------------------------");
+            Console.WriteLine();
+            Console.WriteLine($"1) Set system (Currently '{System}')");
+            Console.WriteLine($"2) Set dumping program (Currently '{Options.InternalProgram}')");
+            Console.WriteLine($"3) Set media type (Currently '{MediaType}')");
+            Console.WriteLine($"4) Set device path (Currently '{DevicePath}')");
+            Console.WriteLine($"5) Set mounted path (Currently '{MountedPath}')");
+            Console.WriteLine($"6) Set file path (Currently '{FilePath}')");
+            Console.WriteLine($"7) Set override speed (Currently '{DriveSpeed}')");
+            Console.WriteLine($"8) Set custom parameters (Currently '{CustomParams}')");
+            Console.WriteLine();
+            Console.WriteLine($"Q) Exit the program");
+            Console.WriteLine($"X) Start dumping");
+            Console.Write("> ");
+
+            result = Console.ReadLine();
+            switch (result)
+            {
+                case "1":
+                    goto system;
+                case "2":
+                    goto dumpingProgram;
+                case "3":
+                    goto mediaType;
+                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;
+            }
+
+        system:
+            Console.WriteLine();
+            Console.WriteLine("For possible inputs, use the List Systems commandline option");
+            Console.WriteLine();
+            Console.WriteLine("Input the system and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            System = result.ToRedumpSystem();
+            goto root;
+
+        dumpingProgram:
+            Console.WriteLine();
+            Console.WriteLine("Options:");
+            Console.WriteLine($"{InternalProgram.Redumper.ToString().ToLowerInvariant(),-15} => {InternalProgram.Redumper.LongName()}");
+            Console.WriteLine($"{InternalProgram.DiscImageCreator.ToString().ToLowerInvariant(),-15} => {InternalProgram.DiscImageCreator.LongName()}");
+            Console.WriteLine($"{InternalProgram.Aaru.ToString().ToLowerInvariant(),-15} => {InternalProgram.Aaru.LongName()}");
+            Console.WriteLine();
+            Console.WriteLine("Input the dumping program and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            Options.InternalProgram = result.ToInternalProgram();
+            goto root;
+
+        mediaType:
+            Console.WriteLine();
+            Console.WriteLine("For possible inputs, use the List Media commandline option");
+            Console.WriteLine();
+            Console.WriteLine("Input the media type and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            MediaType = OptionsLoader.ToMediaType(result);
+            goto root;
+
+        devicePath:
+            Console.WriteLine();
+            Console.WriteLine("Input the device path and press Enter:");
+            Console.Write("> ");
+            DevicePath = Console.ReadLine();
+            goto root;
+
+        mountedPath:
+            Console.WriteLine();
+            Console.WriteLine("Input the mounted path and press Enter:");
+            Console.Write("> ");
+            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!);
+
+            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;
+
+            DriveSpeed = speed;
+            goto root;
+
+        customParams:
+            Console.WriteLine();
+            Console.WriteLine("Input the custom parameters and press Enter:");
+            Console.Write("> ");
+            CustomParams = Console.ReadLine();
+            goto root;
+
+        exit:
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.CLI/Features/MainFeature.cs

@@ -0,0 +1,115 @@
+
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.CommandLine.Inputs;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.CLI.Features
+{
+    internal sealed class MainFeature : BaseFeature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "main";
+
+        /// <remarks>Flags are unused</remarks>
+        private static readonly string[] _flags = [];
+
+        /// <remarks>Description is unused</remarks>
+        private const string _description = "";
+
+        #endregion
+
+        #region Inputs
+
+        private const string _customName = "custom";
+        internal readonly StringInput CustomInput = new(_customName, ["-c", "--custom"], "Custom parameters to use");
+
+        private const string _deviceName = "device";
+        internal readonly StringInput DeviceInput = new(_deviceName, ["-d", "--device"], "Physical drive path (Required if no custom parameters set)");
+
+        private const string _fileName = "file";
+        internal readonly StringInput FileInput = new(_fileName, ["-f", "--file"], "Output file path (Required if no custom parameters set)");
+
+        private const string _mediaTypeName = "media-type";
+        internal readonly StringInput MediaTypeInput = new(_mediaTypeName, ["-t", "--mediatype"], "Set media type for dumping (Required for DIC)");
+
+        private const string _mountedName = "mounted";
+        internal readonly StringInput MountedInput = new(_mountedName, ["-m", "--mounted"], "Mounted filesystem path for additional checks");
+
+        private const string _speedName = "speed";
+        internal readonly Int32Input SpeedInput = new(_speedName, ["-s", "--speed"], "Override default dumping speed");
+
+        private const string _useName = "use";
+        internal readonly StringInput UseInput = new(_useName, ["-u", "--use"], "Override configured dumping program name");
+
+        #endregion
+
+        public MainFeature()
+            : base(DisplayName, _flags, _description)
+        {
+            Add(UseInput);
+            Add(MediaTypeInput);
+            Add(DeviceInput);
+            Add(MountedInput);
+            Add(FileInput);
+            Add(SpeedInput);
+            Add(CustomInput);
+        }
+
+        /// <inheritdoc/>
+        public override bool ProcessArgs(string[] args, int index)
+        {
+            // If we have no arguments, just return
+            if (args == null || args.Length == 0)
+                return true;
+
+            // Read the options from config, if possible
+            Options = OptionsLoader.LoadFromConfig();
+
+            // The first argument is the system type
+            System = args[0].Trim('"').ToRedumpSystem();
+
+            // Loop through the arguments and parse out values
+            for (index = 1; index < args.Length; index++)
+            {
+                // Use specific program
+                if (UseInput.ProcessInput(args, ref index))
+                    Options.InternalProgram = UseInput.Value.ToInternalProgram();
+
+                // Set a media type
+                else if (MediaTypeInput.ProcessInput(args, ref index))
+                    MediaType = OptionsLoader.ToMediaType(MediaTypeInput.Value?.Trim('"'));
+
+                // Use a device path
+                else if (DeviceInput.ProcessInput(args, ref index))
+                    DevicePath = DeviceInput.Value;
+
+                // Use a mounted path for physical checks
+                else if (MountedInput.ProcessInput(args, ref index))
+                    MountedPath = MountedInput.Value;
+
+                // Use a file path
+                else if (FileInput.ProcessInput(args, ref index))
+                    FilePath = FileInput.Value;
+
+                // Set an override speed
+                else if (SpeedInput.ProcessInput(args, ref index))
+                    DriveSpeed = SpeedInput.Value;
+
+                // Use a custom parameters
+                else if (CustomInput.ProcessInput(args, ref index))
+                    CustomParams = CustomInput.Value;
+
+                // Default, add to inputs
+                else
+                    Inputs.Add(args[index]);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.CLI/MPF.CLI.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -12,7 +12,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.1</VersionPrefix>
+        <VersionPrefix>3.6.0</VersionPrefix>
 
         <!-- Package Properties -->
         <Title>MPF CLI</Title>
@@ -31,11 +31,11 @@
     <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
     </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -43,7 +43,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
     </ItemGroup>
 
 </Project>

MPF.CLI/Program.cs

@@ -1,12 +1,13 @@
 using System;
-using System.IO;
+using System.Collections.Generic;
 #if NET40
 using System.Threading.Tasks;
 #endif
-using MPF.Frontend;
+using MPF.CLI.Features;
+using MPF.Frontend.Features;
 using MPF.Frontend.Tools;
-using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
 
 namespace MPF.CLI
 {
@@ -18,493 +19,123 @@ namespace MPF.CLI
             var options = OptionsLoader.LoadFromConfig();
             if (options.FirstRun)
             {
-                // Application paths
-                options.AaruPath = "FILL ME IN";
-                options.DiscImageCreatorPath = "FILL ME IN";
-                options.RedumperPath = "FILL ME IN";
-                options.InternalProgram = InternalProgram.NONE;
-
                 // Reset first run
                 options.FirstRun = false;
                 OptionsLoader.SaveToConfig(options);
 
                 // Display non-error message
-                DisplayHelp("First-run detected! Please fill out config.json and run again.");
+                Console.WriteLine("First-run detected! Please verify the generated config.json and run again.");
                 return;
             }
 
-            // Try processing the standalone arguments
-            bool? standaloneProcessed = OptionsLoader.ProcessStandaloneArguments(args);
-            if (standaloneProcessed != false)
-            {
-                if (standaloneProcessed == null)
-                    DisplayHelp();
-                return;
-            }
+            // Create the command set
+            var mainFeature = new MainFeature();
+            var commandSet = CreateCommands(mainFeature);
 
-            // Setup common outputs
-            CommandOptions opts;
-            MediaType mediaType;
-            RedumpSystem? knownSystem;
-
-            // Use interactive mode
-            if (args.Length > 0 && (args[0] == "-i" || args[0] == "--interactive"))
-            {
-                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;
-                }
-
-                // 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);
-            }
-
-            // Validate the internal program
-            switch (options.InternalProgram)
-            {
-                case InternalProgram.Aaru:
-                    if (!File.Exists(options.AaruPath))
-                    {
-                        DisplayHelp("A path needs to be supplied for Aaru, exiting...");
-                        return;
-                    }
-                    break;
-
-                case InternalProgram.DiscImageCreator:
-                    if (!File.Exists(options.DiscImageCreatorPath))
-                    {
-                        DisplayHelp("A path needs to be supplied for DIC, exiting...");
-                        return;
-                    }
-                    break;
-
-                case InternalProgram.Redumper:
-                    if (!File.Exists(options.RedumperPath))
-                    {
-                        DisplayHelp("A path needs to be supplied for Redumper, exiting...");
-                        return;
-                    }
-                    break;
-
-                default:
-                    DisplayHelp($"{options.InternalProgram} is not a supported dumping program, exiting...");
-                    break;
-            }
-
-            // Ensure we have the values we need
-            if (opts.CustomParams == null && (opts.DevicePath == null || opts.FilePath == null))
-            {
-                DisplayHelp("Both a device path and file path need to be supplied, exiting...");
-                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);
-
-            // Populate an environment
-            var drive = Drive.Create(null, opts.DevicePath ?? string.Empty);
-            var env = new DumpEnvironment(options,
-                opts.FilePath,
-                drive,
-                knownSystem,
-                mediaType,
-                options.InternalProgram,
-                parameters: null);
-
-            // Process the parameters
-            string? paramStr = opts.CustomParams ?? env.GetFullParameters(speed);
-            if (string.IsNullOrEmpty(paramStr))
-            {
-                DisplayHelp("No valid environment could be created, exiting...");
-                return;
-            }
-
-            env.SetExecutionContext(paramStr);
-
-            // Invoke the dumping program
-            Console.WriteLine($"Invoking {options.InternalProgram} using '{paramStr}'");
-            var dumpResult = env.Run().GetAwaiter().GetResult();
-            Console.WriteLine(dumpResult.Message);
-            if (!dumpResult)
-                return;
-
-            // If it was not a dumping command
-            if (!env.IsDumpingCommand())
-            {
-                Console.WriteLine("Execution not recognized as dumping command, skipping processing...");
-                return;
-            }
-
-            // If we have a mounted path, replace the environment
-            if (opts.MountedPath != null && Directory.Exists(opts.MountedPath))
-            {
-                drive = Drive.Create(null, opts.MountedPath);
-                env = new DumpEnvironment(options,
-                    opts.FilePath,
-                    drive,
-                    knownSystem,
-                    mediaType,
-                    internalProgram: null,
-                    parameters: null);
-            }
-
-            // Finally, attempt to do the output dance
-            var verifyResult = env.VerifyAndSaveDumpOutput()
-                .ConfigureAwait(false).GetAwaiter().GetResult();
-            Console.WriteLine(verifyResult.Message);
-        }
-
-        /// <summary>
-        /// Display help for MPF.CLI
-        /// </summary>
-        /// <param name="error">Error string to prefix the help text with</param>
-        private static void DisplayHelp(string? error = null)
-        {
-            if (error != null)
-                Console.WriteLine(error);
-
-            Console.WriteLine("Usage:");
-            Console.WriteLine("MPF.CLI <mediatype> <system> [options]");
-            Console.WriteLine();
-            Console.WriteLine("Standalone Options:");
-            Console.WriteLine("-h, -?                  Show this help text");
-            Console.WriteLine("-lc, --listcodes        List supported comment/content site codes");
-            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:");
-            Console.WriteLine("-u, --use <program>            Override default dumping program");
-            Console.WriteLine("-d, --device <devicepath>      Physical drive path (Required if no custom parameters set)");
-            Console.WriteLine("-m, --mounted <dirpath>        Mounted filesystem path for additional checks");
-            Console.WriteLine("-f, --file \"<filepath>\"        Output file path (Required if no custom parameters set)");
-            Console.WriteLine("-s, --speed <speed>            Override default dumping speed");
-            Console.WriteLine("-c, --custom \"<params>\"        Custom parameters to use");
-            Console.WriteLine();
-
-            Console.WriteLine("Custom dumping parameters, if used, will fully replace the default parameters.");
-            Console.WriteLine("All dumping parameters need to be supplied if doing this.");
-            Console.WriteLine("Otherwise, both a drive path and output file path are required.");
-            Console.WriteLine();
-
-            Console.WriteLine("Mounted filesystem path is only recommended on OSes that require block");
-            Console.WriteLine("device dumping, usually Linux and macOS.");
-            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>
-        private static CommandOptions LoadFromArguments(string[] args, Frontend.Options options, ref int startIndex)
-        {
-            // Create return values
-            var opts = new CommandOptions();
-
-            // If we have no arguments, just return
+            // If we have no args, show the help and quit
             if (args == null || args.Length == 0)
             {
-                startIndex = 0;
-                return opts;
+                BaseFeature.DisplayHelp();
+                return;
             }
 
-            // If we have an invalid start index, just return
-            if (startIndex < 0 || startIndex >= args.Length)
-                return opts;
+            // Get the first argument as a feature flag
+            string featureName = args[0];
 
-            // Loop through the arguments and parse out values
-            for (; startIndex < args.Length; startIndex++)
+            // Try processing the standalone arguments
+            var topLevel = commandSet.GetTopLevel(featureName);
+            switch (topLevel)
             {
-                // Use specific program
-                if (args[startIndex].StartsWith("-u=") || args[startIndex].StartsWith("--use="))
-                {
-                    string internalProgram = args[startIndex].Split('=')[1];
-                    options.InternalProgram = internalProgram.ToInternalProgram();
-                }
-                else if (args[startIndex] == "-u" || args[startIndex] == "--use")
-                {
-                    string internalProgram = args[startIndex + 1];
-                    options.InternalProgram = internalProgram.ToInternalProgram();
-                    startIndex++;
-                }
+                // Standalone Options
+                case Help: BaseFeature.DisplayHelp(); return;
+                case VersionFeature version: version.Execute(); return;
+                case ListCodesFeature lc: lc.Execute(); return;
+                case ListConfigFeature lc: lc.Execute(); return;
+                case ListMediaTypesFeature lm: lm.Execute(); return;
+                case ListProgramsFeature lp: lp.Execute(); return;
+                case ListSystemsFeature ls: ls.Execute(); return;
 
-                // Use a device path
-                else if (args[startIndex].StartsWith("-d=") || args[startIndex].StartsWith("--device="))
-                {
-                    opts.DevicePath = args[startIndex].Split('=')[1].Trim('"');
-                }
-                else if (args[startIndex] == "-d" || args[startIndex] == "--device")
-                {
-                    opts.DevicePath = args[startIndex + 1].Trim('"');
-                    startIndex++;
-                }
+                // Interactive Mode
+                case InteractiveFeature interactive:
+                    if (!interactive.ProcessArgs(args, 0))
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!interactive.Execute())
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
 
-                // Use a mounted path for physical checks
-                else if (args[startIndex].StartsWith("-m=") || args[startIndex].StartsWith("--mounted="))
-                {
-                    opts.MountedPath = args[startIndex].Split('=')[1];
-                }
-                else if (args[startIndex] == "-m" || args[startIndex] == "--mounted")
-                {
-                    opts.MountedPath = args[startIndex + 1];
-                    startIndex++;
-                }
-
-                // Use a file path
-                else if (args[startIndex].StartsWith("-f=") || args[startIndex].StartsWith("--file="))
-                {
-                    opts.FilePath = args[startIndex].Split('=')[1].Trim('"');
-                }
-                else if (args[startIndex] == "-f" || args[startIndex] == "--file")
-                {
-                    opts.FilePath = args[startIndex + 1].Trim('"');
-                    startIndex++;
-                }
-
-                // Set an override speed
-                else if (args[startIndex].StartsWith("-s=") || args[startIndex].StartsWith("--speed="))
-                {
-                    if (!int.TryParse(args[startIndex].Split('=')[1].Trim('"'), out int speed))
-                        speed = -1;
-
-                    opts.DriveSpeed = speed;
-                }
-                else if (args[startIndex] == "-s" || args[startIndex] == "--speed")
-                {
-                    if (!int.TryParse(args[startIndex + 1].Trim('"'), out int speed))
-                        speed = -1;
-
-                    opts.DriveSpeed = speed;
-                    startIndex++;
-                }
-
-                // Use a custom parameters
-                else if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--custom="))
-                {
-                    opts.CustomParams = args[startIndex].Split('=')[1].Trim('"');
-                }
-                else if (args[startIndex] == "-c" || args[startIndex] == "--custom")
-                {
-                    opts.CustomParams = args[startIndex + 1].Trim('"');
-                    startIndex++;
-                }
-
-                // Default, we fall out
-                else
-                {
                     break;
-                }
-            }
 
-            return opts;
+                // Default Behavior
+                default:
+                    if (!mainFeature.ProcessArgs(args, 0))
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!mainFeature.Execute())
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+
+                    break;
+            }
         }
 
         /// <summary>
-        /// Represents commandline options
+        /// Create the command set for the program
         /// </summary>
-        private class CommandOptions
+        private static CommandSet CreateCommands(MainFeature mainFeature)
         {
-            /// <summary>
-            /// Path to the device to dump
-            /// </summary>
-            /// <remarks>Required if custom parameters are not set</remarks>
-            public string? DevicePath { get; set; } = null;
+            List<string> header = [
+                "MPF.CLI [standalone|system] [options] <path> ...",
+                string.Empty,
+            ];
 
-            /// <summary>
-            /// Path to the mounted filesystem to check
-            /// </summary>
-            /// <remarks>Should only be used when the device path is not readable</remarks>
-            public string? MountedPath { get; set; } = null;
+            List<string> footer = [
+                string.Empty,
+                "Dumping program paths and other settings can be found in the config.json file",
+                "generated next to the program by default. Ensure that all settings are to user",
+                "preference before running MPF.CLI.",
+                string.Empty,
 
-            /// <summary>
-            /// Path to the output file
-            /// </summary>
-            /// <remarks>Required if custom parameters are not set</remarks>
-            public string? FilePath { get; set; } = null;
+                "Custom dumping parameters, if used, will fully replace the default parameters.",
+                "All dumping parameters need to be supplied if doing this.",
+                "Otherwise, both a drive path and output file path are required.",
+                string.Empty,
 
-            /// <summary>
-            /// Override drive speed
-            /// </summary>
-            public int? DriveSpeed { get; set; } = null;
+                "Mounted filesystem path is only recommended on OSes that require block",
+                "device dumping, usually Linux and macOS.",
+                string.Empty,
+            ];
 
-            /// <summary>
-            /// Custom parameters for dumping
-            /// </summary>
-            public string? CustomParams { get; set; } = null;
+            var commandSet = new CommandSet(header, footer);
+
+            // Standalone Options
+            commandSet.Add(new Help());
+            commandSet.Add(new VersionFeature());
+            commandSet.Add(new ListCodesFeature());
+            commandSet.Add(new ListConfigFeature());
+            commandSet.Add(new ListMediaTypesFeature());
+            commandSet.Add(new ListSystemsFeature());
+            commandSet.Add(new ListProgramsFeature());
+            commandSet.Add(new InteractiveFeature());
+
+            // CLI Options
+            commandSet.Add(mainFeature.UseInput);
+            commandSet.Add(mainFeature.MediaTypeInput);
+            commandSet.Add(mainFeature.DeviceInput);
+            commandSet.Add(mainFeature.MountedInput);
+            commandSet.Add(mainFeature.FileInput);
+            commandSet.Add(mainFeature.SpeedInput);
+            commandSet.Add(mainFeature.CustomInput);
+
+            return commandSet;
         }
     }
 }

MPF.Check/Features/BaseFeature.cs

@@ -0,0 +1,176 @@
+
+using System;
+using System.IO;
+#if NET40
+using System.Threading.Tasks;
+#endif
+using MPF.Frontend;
+using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Web;
+using LogCompression = MPF.Processors.LogCompression;
+
+namespace MPF.Check.Features
+{
+    internal abstract class BaseFeature : SabreTools.CommandLine.Feature
+    {
+        #region Properties
+
+        /// <summary>
+        /// User-defined options
+        /// </summary>
+        public Options Options { get; protected set; }
+
+        /// <summary>
+        /// Currently-selected system
+        /// </summary>
+        public RedumpSystem? System { get; protected set; }
+
+        /// <summary>
+        /// Seed submission info from an input file
+        /// </summary>
+        public SubmissionInfo? Seed { get; protected set; }
+
+        /// <summary>
+        /// Path to the device to scan
+        /// </summary>
+        public string? DevicePath { get; protected set; }
+
+        #endregion
+
+        protected BaseFeature(string name, string[] flags, string description, string? detailed = null)
+            : base(name, flags, description, detailed)
+        {
+            Options = new Options()
+            {
+                // Internal Program
+                InternalProgram = InternalProgram.NONE,
+
+                // Extra Dumping Options
+                ScanForProtection = false,
+                AddPlaceholders = true,
+                PullAllInformation = false,
+                AddFilenameSuffix = false,
+                OutputSubmissionJSON = false,
+                IncludeArtifacts = false,
+                CompressLogFiles = false,
+                LogCompression = LogCompression.DeflateMaximum,
+                DeleteUnnecessaryFiles = false,
+                CreateIRDAfterDumping = false,
+
+                // Protection Scanning Options
+                ScanArchivesForProtection = true,
+                IncludeDebugProtectionInformation = false,
+                HideDriveLetters = false,
+
+                // Redump Login Information
+                RetrieveMatchInformation = true,
+                RedumpUsername = null,
+                RedumpPassword = null,
+            };
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            if (Options.InternalProgram == InternalProgram.NONE)
+            {
+                Console.Error.WriteLine("A program name needs to be provided");
+                return false;
+            }
+
+            // Validate the supplied credentials
+            if (Options.RetrieveMatchInformation
+                && !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!",
+                };
+
+                Console.WriteLine(message);
+            }
+
+            // Loop through all the rest of the args
+            for (int i = 0; i < Inputs.Count; i++)
+            {
+                // Get the full file path
+                string filepath = Path.GetFullPath(Inputs[i].Trim('"'));
+
+                // Now populate an environment
+                Drive? drive = null;
+                if (!string.IsNullOrEmpty(DevicePath))
+                    drive = Drive.Create(null, DevicePath!);
+
+                var env = new DumpEnvironment(Options,
+                    filepath,
+                    drive,
+                    System,
+                    internalProgram: null);
+                env.SetProcessor();
+
+                // Finally, attempt to do the output dance
+                var result = env.VerifyAndSaveDumpOutput(seedInfo: Seed)
+                    .ConfigureAwait(false).GetAwaiter().GetResult();
+                Console.WriteLine(result.Message);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Display help for MPF.Check
+        /// </summary>
+        /// <param name="error">Error string to prefix the help text with</param>
+        public static void DisplayHelp()
+        {
+            Console.WriteLine("Usage:");
+            Console.WriteLine("MPF.Check <system> [options] </path/to/output.cue|iso|_logs.zip> ...");
+            Console.WriteLine();
+            Console.WriteLine("Standalone Options:");
+            Console.WriteLine("?, h, help              Show this help text");
+            Console.WriteLine("version                 Print the program version");
+            Console.WriteLine("lc, listcodes           List supported comment/content site codes");
+            Console.WriteLine("lo, listconfig          List current configuration values");
+            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:");
+            Console.WriteLine("-u, --use <program>            Dumping program output type [REQUIRED]");
+            Console.WriteLine("    --load-seed <path>         Load a seed submission JSON for user information");
+            Console.WriteLine("    --no-placeholders          Disable placeholder values in submission info");
+            Console.WriteLine("    --create-ird               Create IRD from output files (PS3 only)");
+            Console.WriteLine("    --no-retrieve              Disable retrieving match information from Redump");
+            Console.WriteLine("-c, --credentials <user> <pw>  Redump username and password (incompatible with --no-retrieve) [WILL BE REMOVED]");
+            Console.WriteLine("-U, --username <user>          Redump username (incompatible with --no-retrieve)");
+            Console.WriteLine("-P, --password <pw>            Redump password (incompatible with --no-retrieve)");
+            Console.WriteLine("    --pull-all                 Pull all information from Redump (requires --username and --password)");
+            Console.WriteLine("-p, --path <drivepath>         Physical drive path for additional checks");
+            Console.WriteLine("-s, --scan                     Enable copy protection scan (requires --path)");
+            Console.WriteLine("    --disable-archives         Disable scanning archives (requires --scan)");
+            Console.WriteLine("    --enable-debug             Enable debug protection information (requires --scan)");
+            Console.WriteLine("    --hide-drive-letters       Hide drive letters from scan output (requires --scan)");
+            Console.WriteLine("-x, --suffix                   Enable adding filename suffix");
+            Console.WriteLine("-j, --json                     Enable submission JSON output");
+            Console.WriteLine("    --include-artifacts        Include artifacts in JSON (requires --json)");
+            Console.WriteLine("-z, --zip                      Enable log file compression");
+            Console.WriteLine("    --log-compression          Set the log compression type (requires compression enabled)");
+            Console.WriteLine("-d, --delete                   Enable unnecessary file deletion");
+            Console.WriteLine();
+            Console.WriteLine("WARNING: If using a configuration file alongside any of the above options");
+            Console.WriteLine("then flag options will act as toggles instead of always enabling.");
+            Console.WriteLine("For example, if log compression is enabled in your configuration file, then");
+            Console.WriteLine("providing the --zip option would disable compression.");
+            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();
+        }
+    }
+}

MPF.Check/Features/InteractiveFeature.cs

@@ -0,0 +1,288 @@
+
+using System;
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.RedumpLib;
+using SabreTools.RedumpLib.Data;
+using LogCompression = MPF.Processors.LogCompression;
+
+namespace MPF.Check.Features
+{
+    internal sealed class InteractiveFeature : BaseFeature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "interactive";
+
+        private static readonly string[] _flags = ["i", "interactive"];
+
+        private const string _description = "Enable interactive mode";
+
+        #endregion
+
+        public InteractiveFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool ProcessArgs(string[] args, int index)
+        {
+            // Cache all args as inputs
+            for (int i = 1; i < args.Length; i++)
+            {
+                Inputs.Add(args[i]);
+            }
+
+            // Read the options from config, if possible
+            Options = OptionsLoader.LoadFromConfig();
+            if (Options.FirstRun)
+            {
+                Options = new Options()
+                {
+                    // Internal Program
+                    InternalProgram = InternalProgram.NONE,
+
+                    // Extra Dumping Options
+                    ScanForProtection = false,
+                    AddPlaceholders = true,
+                    PullAllInformation = false,
+                    AddFilenameSuffix = false,
+                    OutputSubmissionJSON = false,
+                    IncludeArtifacts = false,
+                    CompressLogFiles = false,
+                    LogCompression = LogCompression.DeflateMaximum,
+                    DeleteUnnecessaryFiles = false,
+                    CreateIRDAfterDumping = false,
+
+                    // Protection Scanning Options
+                    ScanArchivesForProtection = true,
+                    IncludeDebugProtectionInformation = false,
+                    HideDriveLetters = false,
+
+                    // Redump Login Information
+                    RetrieveMatchInformation = true,
+                    RedumpUsername = null,
+                    RedumpPassword = null,
+                };
+            }
+
+            // Create return values
+            System = null;
+
+            // These values require multiple parts to be active
+            bool scan = false,
+                enableArchives = true,
+                enableDebug = false,
+                hideDriveLetters = false;
+
+            // Create state values
+            string? result;
+
+        root:
+            Console.Clear();
+            Console.WriteLine("MPF.Check Interactive Mode - Main Menu");
+            Console.WriteLine("-------------------------");
+            Console.WriteLine();
+            Console.WriteLine($"1) Set system (Currently '{System}')");
+            Console.WriteLine($"2) Set dumping program (Currently '{Options.InternalProgram}')");
+            Console.WriteLine($"3) Set seed path (Currently '{Seed}')");
+            Console.WriteLine($"4) Add placeholders (Currently '{Options.AddPlaceholders}')");
+            Console.WriteLine($"5) Create IRD (Currently '{Options.CreateIRDAfterDumping}')");
+            Console.WriteLine($"6) Attempt Redump matches (Currently '{Options.RetrieveMatchInformation}')");
+            Console.WriteLine($"7) Redump credentials (Currently '{Options.RedumpUsername}')");
+            Console.WriteLine($"8) Pull all information (Currently '{Options.PullAllInformation}')");
+            Console.WriteLine($"9) Set device path (Currently '{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) Log compression (Currently '{Options.LogCompression.LongName()}')");
+            Console.WriteLine($"J) 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 system;
+                case "2":
+                    goto dumpingProgram;
+                case "3":
+                    goto seedPath;
+                case "4":
+                    Options.AddPlaceholders = !Options.AddPlaceholders;
+                    goto root;
+                case "5":
+                    Options.CreateIRDAfterDumping = !Options.CreateIRDAfterDumping;
+                    goto root;
+                case "6":
+                    Options.RetrieveMatchInformation = !Options.RetrieveMatchInformation;
+                    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":
+                    goto logCompression;
+                case "j":
+                case "J":
+                    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;
+            }
+
+        system:
+            Console.WriteLine();
+            Console.WriteLine("For possible inputs, use the List Systems commandline option");
+            Console.WriteLine();
+            Console.WriteLine("Input the system and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            System = result.ToRedumpSystem();
+            goto root;
+
+        dumpingProgram:
+            Console.WriteLine();
+            Console.WriteLine("Options:");
+            foreach (var program in (InternalProgram[])Enum.GetValues(typeof(InternalProgram)))
+            {
+                // Skip the placeholder values
+                if (program == InternalProgram.NONE)
+                    continue;
+
+                Console.WriteLine($"{program.ToString().ToLowerInvariant(),-15} => {program.LongName()}");
+            }
+
+            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();
+            Seed = Builder.CreateFromFile(result);
+            goto root;
+
+        redumpCredentials:
+            Console.WriteLine();
+            Console.WriteLine("Enter your Redump username and press Enter:");
+            Console.Write("> ");
+            Options.RedumpUsername = Console.ReadLine();
+
+            Console.WriteLine("Enter your Redump 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("> ");
+            DevicePath = Console.ReadLine();
+            goto root;
+
+        logCompression:
+            Console.WriteLine();
+            Console.WriteLine("Options:");
+            foreach (var compressionType in (LogCompression[])Enum.GetValues(typeof(LogCompression)))
+            {
+                Console.WriteLine($"{compressionType.ToString().ToLowerInvariant(),-15} => {compressionType.LongName()}");
+            }
+
+            Console.WriteLine();
+            Console.WriteLine("Input the log compression type and press Enter:");
+            Console.Write("> ");
+            result = Console.ReadLine();
+            Options.LogCompression = result.ToLogCompression();
+            goto root;
+
+        exit:
+            // Now deal with the complex options
+            Options.ScanForProtection = scan && !string.IsNullOrEmpty(DevicePath);
+            Options.ScanArchivesForProtection = enableArchives && scan && !string.IsNullOrEmpty(DevicePath);
+            Options.IncludeDebugProtectionInformation = enableDebug && scan && !string.IsNullOrEmpty(DevicePath);
+            Options.HideDriveLetters = hideDriveLetters && scan && !string.IsNullOrEmpty(DevicePath);
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => Inputs.Count > 0;
+    }
+}

MPF.Check/Features/MainFeature.cs

@@ -0,0 +1,272 @@
+using System;
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.CommandLine.Inputs;
+using SabreTools.RedumpLib;
+using SabreTools.RedumpLib.Data;
+using LogCompression = MPF.Processors.LogCompression;
+
+namespace MPF.Check.Features
+{
+    internal sealed class MainFeature : BaseFeature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "main";
+
+        /// <remarks>Flags are unused</remarks>
+        private static readonly string[] _flags = [];
+
+        /// <remarks>Description is unused</remarks>
+        private const string _description = "";
+
+        #endregion
+
+        #region Inputs
+
+        private const string _createIrdName = "create-ird";
+        internal readonly FlagInput CreateIrdInput = new(_createIrdName, "--create-ird", "Create IRD from output files (PS3 only)");
+
+        private const string _deleteName = "delete";
+        internal readonly FlagInput DeleteInput = new(_deleteName, ["-d", "--delete"], "Enable unnecessary file deletion");
+
+        private const string _disableArchivesName = "disable-archives";
+        internal readonly FlagInput DisableArchivesInput = new(_disableArchivesName, "--disable-archives", "Disable scanning archives (requires --scan)");
+
+        private const string _enableDebugName = "enable-debug";
+        internal readonly FlagInput EnableDebugInput = new(_enableDebugName, "--enable-debug", "Enable debug protection information (requires --scan)");
+
+        private const string _hideDriveLettersName = "hide-drive-letters";
+        internal readonly FlagInput HideDriveLettersInput = new(_hideDriveLettersName, "--hide-drive-letters", "Hide drive letters from scan output (requires --scan)");
+
+        private const string _includeArtifactsName = "include-artifacts";
+        internal readonly FlagInput IncludeArtifactsInput = new(_includeArtifactsName, "--include-artifacts", "Include artifacts in JSON (requires --json)");
+
+        private const string _jsonName = "json";
+        internal readonly FlagInput JsonInput = new(_jsonName, ["-j", "--json"], "Enable submission JSON output");
+
+        private const string _loadSeedName = "load-seed";
+        internal readonly StringInput LoadSeedInput = new(_loadSeedName, "--load-seed", "Load a seed submission JSON for user information");
+
+        private const string _logCompressionName = "log-compression";
+        internal readonly StringInput LogCompressionInput = new(_logCompressionName, "--log-compression", "Set the log compression type (requires compression enabled)");
+
+        private const string _noPlaceholdersName = "no-placeholders";
+        internal readonly FlagInput NoPlaceholdersInput = new(_noPlaceholdersName, "--no-placeholders", "Disable placeholder values in submission info");
+
+        private const string _noRetrieveName = "no-retrieve";
+        internal readonly FlagInput NoRetrieveInput = new(_noRetrieveName, "--no-retrieve", "Disable retrieving match information from Redump");
+
+        private const string _passwordName = "password";
+        internal readonly StringInput PasswordInput = new(_passwordName, ["-P", "--password"], "Redump password (incompatible with --no-retrieve)");
+
+        private const string _pathName = "path";
+        internal readonly StringInput PathInput = new(_pathName, ["-p", "--path"], "Physical drive path for additional checks");
+
+        private const string _pullAllName = "pull-all";
+        internal readonly FlagInput PullAllInput = new(_pullAllName, "--pull-all", "Pull all information from Redump (requires --username and --password)");
+
+        private const string _scanName = "scan";
+        internal readonly FlagInput ScanInput = new(_scanName, ["-s", "--scan"], "Enable copy protection scan (requires --path)");
+
+        private const string _suffixName = "suffix";
+        internal readonly FlagInput SuffixInput = new(_suffixName, ["-x", "--suffix"], "Enable adding filename suffix");
+
+        private const string _useName = "use";
+        internal readonly StringInput UseInput = new(_useName, ["-u", "--use"], "Override configured dumping program name");
+
+        private const string _usernameName = "username";
+        internal readonly StringInput UsernameInput = new(_usernameName, ["-U", "--username"], "Redump username (incompatible with --no-retrieve)");
+
+        private const string _zipName = "zip";
+        internal readonly FlagInput ZipInput = new(_zipName, ["-z", "--zip"], "Enable log file compression");
+
+        #endregion
+
+        public MainFeature()
+            : base(DisplayName, _flags, _description)
+        {
+            Add(UseInput);
+            Add(LoadSeedInput);
+            Add(NoPlaceholdersInput);
+            Add(CreateIrdInput);
+            Add(NoRetrieveInput);
+            // TODO: Figure out how to work with the credentials input
+            Add(PullAllInput);
+            Add(PathInput);
+            Add(ScanInput);
+            Add(DisableArchivesInput);
+            Add(EnableDebugInput);
+            Add(HideDriveLettersInput);
+            Add(SuffixInput);
+            Add(JsonInput);
+            Add(IncludeArtifactsInput);
+            Add(ZipInput);
+            Add(LogCompressionInput);
+            Add(DeleteInput);
+        }
+
+        /// <inheritdoc/>
+        public override bool ProcessArgs(string[] args, int index)
+        {
+            // These values require multiple parts to be active
+            bool scan = false,
+                enableArchives = true,
+                enableDebug = false,
+                hideDriveLetters = false;
+
+            // If we have no arguments, just return
+            if (args == null || args.Length == 0)
+                return true;
+
+            // Read the options from config, if possible
+            Options = OptionsLoader.LoadFromConfig();
+            if (Options.FirstRun)
+            {
+                Options = new Options()
+                {
+                    // Internal Program
+                    InternalProgram = InternalProgram.NONE,
+
+                    // Extra Dumping Options
+                    ScanForProtection = false,
+                    AddPlaceholders = true,
+                    PullAllInformation = false,
+                    AddFilenameSuffix = false,
+                    OutputSubmissionJSON = false,
+                    IncludeArtifacts = false,
+                    CompressLogFiles = false,
+                    LogCompression = LogCompression.DeflateMaximum,
+                    DeleteUnnecessaryFiles = false,
+                    CreateIRDAfterDumping = false,
+
+                    // Protection Scanning Options
+                    ScanArchivesForProtection = true,
+                    IncludeDebugProtectionInformation = false,
+                    HideDriveLetters = false,
+
+                    // Redump Login Information
+                    RetrieveMatchInformation = true,
+                    RedumpUsername = null,
+                    RedumpPassword = null,
+                };
+            }
+            else
+            {
+                Console.WriteLine("Options will be loaded from found configuration file!");
+            }
+
+            // The first argument is the system type
+            System = args[0].Trim('"').ToRedumpSystem();
+
+            // Loop through the arguments and parse out values
+            for (index = 1; index < args.Length; index++)
+            {
+                // Use specific program
+                if (UseInput.ProcessInput(args, ref index))
+                    Options.InternalProgram = UseInput.Value.ToInternalProgram();
+
+                // Include seed info file
+                else if (LoadSeedInput.ProcessInput(args, ref index))
+                    Seed = Builder.CreateFromFile(LoadSeedInput.Value);
+
+                // Disable placeholder values in submission info
+                else if (NoPlaceholdersInput.ProcessInput(args, ref index))
+                    Options.AddPlaceholders = !Options.AddPlaceholders;
+
+                // Create IRD from output files (PS3 only)
+                else if (CreateIrdInput.ProcessInput(args, ref index))
+                    Options.CreateIRDAfterDumping = !Options.CreateIRDAfterDumping;
+
+                // Set the log compression type (requires compression enabled)
+                else if (LogCompressionInput.ProcessInput(args, ref index))
+                    Options.LogCompression = LogCompressionInput.Value.ToLogCompression();
+
+                // Retrieve Redump match information
+                else if (NoRetrieveInput.ProcessInput(args, ref index))
+                    Options.RetrieveMatchInformation = !Options.RetrieveMatchInformation;
+
+                // Redump login
+                else if (args[index].StartsWith("-c=") || args[index].StartsWith("--credentials="))
+                {
+                    string[] credentials = args[index].Split('=')[1].Split(';');
+                    Options.RedumpUsername = credentials[0];
+                    Options.RedumpPassword = credentials[1];
+                }
+                else if (args[index] == "-c" || args[index] == "--credentials")
+                {
+                    Options.RedumpUsername = args[index + 1];
+                    Options.RedumpPassword = args[index + 2];
+                    index += 2;
+                }
+
+                // Redump username
+                else if (UsernameInput.ProcessInput(args, ref index))
+                    Options.RedumpUsername = UsernameInput.Value;
+
+                // Redump password
+                else if (PasswordInput.ProcessInput(args, ref index))
+                    Options.RedumpPassword = PasswordInput.Value;
+
+                // Pull all information (requires Redump login)
+                else if (PullAllInput.ProcessInput(args, ref index))
+                    Options.PullAllInformation = !Options.PullAllInformation;
+
+                // Use a device path for physical checks
+                else if (PathInput.ProcessInput(args, ref index))
+                    DevicePath = PathInput.Value;
+
+                // Scan for protection (requires device path)
+                else if (ScanInput.ProcessInput(args, ref index))
+                    scan = true;
+
+                // Disable scanning archives (requires --scan)
+                else if (ScanInput.ProcessInput(args, ref index))
+                    enableArchives = false;
+
+                // Enable debug protection information (requires --scan)
+                else if (EnableDebugInput.ProcessInput(args, ref index))
+                    enableDebug = true;
+
+                // Hide drive letters from scan output (requires --scan)
+                else if (HideDriveLettersInput.ProcessInput(args, ref index))
+                    hideDriveLetters = true;
+
+                // Add filename suffix
+                else if (SuffixInput.ProcessInput(args, ref index))
+                    Options.AddFilenameSuffix = !Options.AddFilenameSuffix;
+
+                // Output submission JSON
+                else if (JsonInput.ProcessInput(args, ref index))
+                    Options.OutputSubmissionJSON = !Options.OutputSubmissionJSON;
+
+                // Include JSON artifacts
+                else if (IncludeArtifactsInput.ProcessInput(args, ref index))
+                    Options.IncludeArtifacts = !Options.IncludeArtifacts;
+
+                // Compress log and extraneous files
+                else if (ZipInput.ProcessInput(args, ref index))
+                    Options.CompressLogFiles = !Options.CompressLogFiles;
+
+                // Delete unnecessary files
+                else if (DeleteInput.ProcessInput(args, ref index))
+                    Options.DeleteUnnecessaryFiles = !Options.DeleteUnnecessaryFiles;
+
+                // Default, add to inputs
+                else
+                    Inputs.Add(args[index]);
+            }
+
+            // Now deal with the complex options
+            Options.ScanForProtection = scan && !string.IsNullOrEmpty(DevicePath);
+            Options.ScanArchivesForProtection = enableArchives && scan && !string.IsNullOrEmpty(DevicePath);
+            Options.IncludeDebugProtectionInformation = enableDebug && scan && !string.IsNullOrEmpty(DevicePath);
+            Options.HideDriveLetters = hideDriveLetters && scan && !string.IsNullOrEmpty(DevicePath);
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => Inputs.Count > 0;
+    }
+}

MPF.Check/MPF.Check.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <OutputType>Exe</OutputType>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
@@ -12,7 +12,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.1</VersionPrefix>
+        <VersionPrefix>3.6.0</VersionPrefix>
 
         <!-- Package Properties -->
         <Title>MPF Check</Title>
@@ -31,11 +31,11 @@
     <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
     </PropertyGroup>
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`)) OR $(TargetFramework.StartsWith(`net10`))">
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
     <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
@@ -43,7 +43,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
     </ItemGroup>
 
 </Project>

MPF.Check/Program.cs

@@ -1,13 +1,12 @@
 using System;
-using System.IO;
+using System.Collections.Generic;
 #if NET40
 using System.Threading.Tasks;
 #endif
-using MPF.Frontend;
-using MPF.Frontend.Tools;
-using SabreTools.RedumpLib;
-using SabreTools.RedumpLib.Data;
-using SabreTools.RedumpLib.Web;
+using MPF.Check.Features;
+using MPF.Frontend.Features;
+using SabreTools.CommandLine;
+using SabreTools.CommandLine.Features;
 
 namespace MPF.Check
 {
@@ -15,541 +14,128 @@ namespace MPF.Check
     {
         public static void Main(string[] args)
         {
-            // Create a default options object
-            var options = new Frontend.Options()
-            {
-                // Internal Program
-                InternalProgram = InternalProgram.NONE,
+            // Create the command set
+            var mainFeature = new MainFeature();
+            var commandSet = CreateCommands(mainFeature);
 
-                // Extra Dumping Options
-                ScanForProtection = false,
-                AddPlaceholders = true,
-                PullAllInformation = false,
-                AddFilenameSuffix = false,
-                OutputSubmissionJSON = false,
-                IncludeArtifacts = false,
-                CompressLogFiles = false,
-                DeleteUnnecessaryFiles = false,
-                CreateIRDAfterDumping = false,
-
-                // Protection Scanning Options
-                ScanArchivesForProtection = true,
-                IncludeDebugProtectionInformation = false,
-                HideDriveLetters = false,
-
-                // Redump Login Information
-                RedumpUsername = null,
-                RedumpPassword = null,
-            };
-
-            // Try processing the standalone arguments
-            bool? standaloneProcessed = OptionsLoader.ProcessStandaloneArguments(args);
-            if (standaloneProcessed != false)
-            {
-                if (standaloneProcessed == null)
-                    DisplayHelp();
-                return;
-            }
-
-            // Setup common outputs
-            CommandOptions opts;
-            MediaType mediaType;
-            RedumpSystem? knownSystem;
-            int startIndex;
-
-            // Use interactive mode
-            if (args.Length > 0 && (args[0] == "-i" || args[0] == "--interactive"))
-            {
-                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);
-            }
-
-            if (options.InternalProgram == InternalProgram.NONE)
-            {
-                DisplayHelp("A program name needs to be provided");
-                return;
-            }
-
-            // 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);
-            }
-
-            // Loop through all the rest of the args
-            for (int i = startIndex; i < args.Length; i++)
-            {
-                // Check for a file
-                if (!File.Exists(args[i].Trim('"')))
-                {
-                    DisplayHelp($"{args[i].Trim('"')} does not exist");
-                    return;
-                }
-
-                // Get the full file path
-                string filepath = Path.GetFullPath(args[i].Trim('"'));
-
-                // Now populate an environment
-                Drive? drive = null;
-                if (!string.IsNullOrEmpty(opts.DevicePath))
-                    drive = Drive.Create(null, opts.DevicePath!);
-
-                var env = new DumpEnvironment(options, filepath, drive, knownSystem, mediaType, internalProgram: null, parameters: null);
-
-                // Finally, attempt to do the output dance
-                var result = env.VerifyAndSaveDumpOutput(seedInfo: opts.Seed)
-                    .ConfigureAwait(false).GetAwaiter().GetResult();
-                Console.WriteLine(result.Message);
-            }
-        }
-
-        /// <summary>
-        /// Display help for MPF.Check
-        /// </summary>
-        /// <param name="error">Error string to prefix the help text with</param>
-        private static void DisplayHelp(string? error = null)
-        {
-            if (error != null)
-                Console.WriteLine(error);
-
-            Console.WriteLine("Usage:");
-            Console.WriteLine("MPF.Check <mediatype> <system> [options] </path/to/output.cue/iso> ...");
-            Console.WriteLine();
-            Console.WriteLine("Standalone Options:");
-            Console.WriteLine("-h, -?                  Show this help text");
-            Console.WriteLine("-lc, --listcodes        List supported comment/content site codes");
-            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:");
-            Console.WriteLine("-u, --use <program>            Dumping program output type [REQUIRED]");
-            Console.WriteLine("    --load-seed <path>         Load a seed submission JSON for user information");
-            Console.WriteLine("    --no-placeholders          Disable placeholder values in submission info");
-            Console.WriteLine("    --create-ird               Create IRD from output files (PS3 only)");
-            Console.WriteLine("-c, --credentials <user> <pw>  Redump username and password");
-            Console.WriteLine("    --pull-all                 Pull all information from Redump (requires --credentials)");
-            Console.WriteLine("-p, --path <drivepath>         Physical drive path for additional checks");
-            Console.WriteLine("-s, --scan                     Enable copy protection scan (requires --path)");
-            Console.WriteLine("    --disable-archives         Disable scanning archives (requires --scan)");
-            Console.WriteLine("    --enable-debug             Enable debug protection information (requires --scan)");
-            Console.WriteLine("    --hide-drive-letters       Hide drive letters from scan output (requires --scan)");
-            Console.WriteLine("-x, --suffix                   Enable adding filename suffix");
-            Console.WriteLine("-j, --json                     Enable submission JSON output");
-            Console.WriteLine("    --include-artifacts        Include artifacts in JSON (requires --json)");
-            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>
-        /// Load the current set of options from application arguments
-        /// </summary>
-        private static CommandOptions LoadFromArguments(string[] args, Frontend.Options options, ref int startIndex)
-        {
-            // Create return values
-            var opts = new CommandOptions();
-
-            // These values require multiple parts to be active
-            bool scan = false,
-                enableArchives = true,
-                enableDebug = false,
-                hideDriveLetters = false;
-
-            // If we have no arguments, just return
+            // If we have no args, show the help and quit
             if (args == null || args.Length == 0)
             {
-                startIndex = 0;
-                return opts;
+                BaseFeature.DisplayHelp();
+                return;
             }
 
-            // If we have an invalid start index, just return
-            if (startIndex < 0 || startIndex >= args.Length)
-                return opts;
+            // Get the first argument as a feature flag
+            string featureName = args[0];
 
-            // Loop through the arguments and parse out values
-            for (; startIndex < args.Length; startIndex++)
+            // Try processing the standalone arguments
+            var topLevel = commandSet.GetTopLevel(featureName);
+            switch (topLevel)
             {
-                // Use specific program
-                if (args[startIndex].StartsWith("-u=") || args[startIndex].StartsWith("--use="))
-                {
-                    string internalProgram = args[startIndex].Split('=')[1];
-                    options.InternalProgram = internalProgram.ToInternalProgram();
-                }
-                else if (args[startIndex] == "-u" || args[startIndex] == "--use")
-                {
-                    string internalProgram = args[startIndex + 1];
-                    options.InternalProgram = internalProgram.ToInternalProgram();
-                    startIndex++;
-                }
+                // Standalone Options
+                case Help: BaseFeature.DisplayHelp(); return;
+                case VersionFeature version: version.Execute(); return;
+                case ListCodesFeature lc: lc.Execute(); return;
+                case ListConfigFeature lc: lc.Execute(); return;
+                case ListMediaTypesFeature lm: lm.Execute(); return;
+                case ListProgramsFeature lp: lp.Execute(); return;
+                case ListSystemsFeature ls: ls.Execute(); return;
 
-                // Include seed info file
-                else if (args[startIndex].StartsWith("--load-seed="))
-                {
-                    string seedInfo = args[startIndex].Split('=')[1];
-                    opts.Seed = Builder.CreateFromFile(seedInfo);
-                }
-                else if (args[startIndex] == "--load-seed")
-                {
-                    string seedInfo = args[startIndex + 1];
-                    opts.Seed = Builder.CreateFromFile(seedInfo);
-                    startIndex++;
-                }
+                // Interactive Mode
+                case InteractiveFeature interactive:
+                    if (!interactive.ProcessArgs(args, 0))
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!interactive.VerifyInputs())
+                    {
+                        Console.Error.WriteLine("At least one input is required");
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!interactive.Execute())
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+
+                    break;
+
+                // Default Behavior
+                default:
+                    if (!mainFeature.ProcessArgs(args, 0))
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!mainFeature.VerifyInputs())
+                    {
+                        Console.Error.WriteLine("At least one input is required");
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
+                    if (!mainFeature.Execute())
+                    {
+                        BaseFeature.DisplayHelp();
+                        return;
+                    }
 
-                // Disable placeholder values in submission info
-                else if (args[startIndex].Equals("--no-placeholders"))
-                {
-                    options.AddPlaceholders = false;
-                }
-
-                // Create IRD from output files (PS3 only)
-                else if (args[startIndex].Equals("--create-ird"))
-                {
-                    options.CreateIRDAfterDumping = true;
-                }
-
-                // Redump login
-                else if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
-                {
-                    string[] credentials = args[startIndex].Split('=')[1].Split(';');
-                    options.RedumpUsername = credentials[0];
-                    options.RedumpPassword = credentials[1];
-                }
-                else if (args[startIndex] == "-c" || args[startIndex] == "--credentials")
-                {
-                    options.RedumpUsername = args[startIndex + 1];
-                    options.RedumpPassword = args[startIndex + 2];
-                    startIndex += 2;
-                }
-
-                // Pull all information (requires Redump login)
-                else if (args[startIndex].Equals("--pull-all"))
-                {
-                    options.PullAllInformation = true;
-                }
-
-                // Use a device path for physical checks
-                else if (args[startIndex].StartsWith("-p=") || args[startIndex].StartsWith("--path="))
-                {
-                    opts.DevicePath = args[startIndex].Split('=')[1];
-                }
-                else if (args[startIndex] == "-p" || args[startIndex] == "--path")
-                {
-                    opts.DevicePath = args[startIndex + 1];
-                    startIndex++;
-                }
-
-                // Scan for protection (requires device path)
-                else if (args[startIndex].Equals("-s") || args[startIndex].Equals("--scan"))
-                {
-                    scan = true;
-                }
-
-                // Disable scanning archives (requires --scan)
-                else if (args[startIndex].Equals("--disable-archives"))
-                {
-                    enableArchives = false;
-                }
-
-                // Enable debug protection information (requires --scan)
-                else if (args[startIndex].Equals("--enable-debug"))
-                {
-                    enableDebug = true;
-                }
-
-                // Hide drive letters from scan output (requires --scan)
-                else if (args[startIndex].Equals("--hide-drive-letters"))
-                {
-                    hideDriveLetters = true;
-                }
-
-                // Add filename suffix
-                else if (args[startIndex].Equals("-x") || args[startIndex].Equals("--suffix"))
-                {
-                    options.AddFilenameSuffix = true;
-                }
-
-                // Output submission JSON
-                else if (args[startIndex].Equals("-j") || args[startIndex].Equals("--json"))
-                {
-                    options.OutputSubmissionJSON = true;
-                }
-
-                // Include JSON artifacts
-                else if (args[startIndex].Equals("--include-artifacts"))
-                {
-                    options.IncludeArtifacts = true;
-                }
-
-                // Compress log and extraneous files
-                else if (args[startIndex].Equals("-z") || args[startIndex].Equals("--zip"))
-                {
-                    options.CompressLogFiles = true;
-                }
-
-                // Delete unnecessary files
-                else if (args[startIndex].Equals("-d") || args[startIndex].Equals("--delete"))
-                {
-                    options.DeleteUnnecessaryFiles = true;
-                }
-
-                // Default, we fall out
-                else
-                {
                     break;
-                }
             }
-
-            // 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>
-        /// Represents commandline options
+        /// Create the command set for the program
         /// </summary>
-        private class CommandOptions
+        private static CommandSet CreateCommands(MainFeature mainFeature)
         {
-            /// <summary>
-            /// Seed submission info from an input file
-            /// </summary>
-            public SubmissionInfo? Seed { get; set; } = null;
+            List<string> header = [
+                "MPF.CLI [standalone|system] [options] <path> ...",
+                string.Empty,
+            ];
 
-            /// <summary>
-            /// Path to the device to scan
-            /// </summary>
-            public string? DevicePath { get; set; } = null;
+            List<string> footer = [
+                string.Empty,
+                "WARNING: 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.",
+                string.Empty,
+            ];
+
+            var commandSet = new CommandSet(header, footer);
+
+            // Standalone Options
+            commandSet.Add(new Help());
+            commandSet.Add(new VersionFeature());
+            commandSet.Add(new ListCodesFeature());
+            commandSet.Add(new ListConfigFeature());
+            commandSet.Add(new ListMediaTypesFeature());
+            commandSet.Add(new ListSystemsFeature());
+            commandSet.Add(new ListProgramsFeature());
+            commandSet.Add(new InteractiveFeature());
+
+            // Check Options
+            commandSet.Add(mainFeature.UseInput);
+            commandSet.Add(mainFeature.LoadSeedInput);
+            commandSet.Add(mainFeature.NoPlaceholdersInput);
+            commandSet.Add(mainFeature.CreateIrdInput);
+            commandSet.Add(mainFeature.NoRetrieveInput);
+            commandSet.Add(mainFeature.UsernameInput);
+            commandSet.Add(mainFeature.PasswordInput);
+            commandSet.Add(mainFeature.PullAllInput);
+            commandSet.Add(mainFeature.PathInput);
+            commandSet.Add(mainFeature.ScanInput);
+            commandSet.Add(mainFeature.DisableArchivesInput);
+            commandSet.Add(mainFeature.EnableDebugInput);
+            commandSet.Add(mainFeature.HideDriveLettersInput);
+            commandSet.Add(mainFeature.SuffixInput);
+            commandSet.Add(mainFeature.JsonInput);
+            commandSet.Add(mainFeature.IncludeArtifactsInput);
+            commandSet.Add(mainFeature.ZipInput);
+            commandSet.Add(mainFeature.LogCompressionInput);
+            commandSet.Add(mainFeature.DeleteInput);
+
+            return commandSet;
         }
     }
 }

MPF.ExecutionContexts.Test/AaruTests.cs

@@ -29,7 +29,7 @@ namespace MPF.ExecutionContexts.Test
 
         #region Default Values
 
-        private static Dictionary<string, string?> AllOptions = new()
+        private static readonly Dictionary<string, string?> AllOptions = new()
         {
             [SettingConstants.EnableDebug] = "true",
             [SettingConstants.EnableVerbose] = "true",
@@ -40,15 +40,15 @@ namespace MPF.ExecutionContexts.Test
 
         [Theory]
         [InlineData(null, null, null, "filename.bin", null, null)]
-        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.CDROM, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.CDROM, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
         [InlineData(RedumpSystem.IBMPCcompatible, MediaType.DVD, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
-        [InlineData(RedumpSystem.SegaDreamcast, MediaType.GDROM, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.SegaDreamcast, MediaType.GDROM, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
         [InlineData(RedumpSystem.HDDVDVideo, MediaType.HDDVD, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
         [InlineData(RedumpSystem.BDVideo, MediaType.BluRay, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
-        [InlineData(RedumpSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
-        [InlineData(RedumpSystem.NintendoWii, MediaType.NintendoWiiOpticalDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
-        [InlineData(RedumpSystem.NintendoWiiU, MediaType.NintendoWiiUOpticalDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
-        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.FloppyDisk, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.NintendoWii, MediaType.NintendoWiiOpticalDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.NintendoWiiU, MediaType.NintendoWiiUOpticalDisc, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
+        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.FloppyDisk, "/dev/sr0", "filename.bin", 2, "--debug True --verbose True media dump --force True --private True --store-encrypted True --title-keys False --trim True --speed 2 --retry-passes 1000 /dev/sr0 \"filename.bin\"")]
         public void DefaultValueTest(RedumpSystem? system,
             MediaType? type,
             string? drivePath,
@@ -514,4 +514,4 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts.Test/BaseExecutionContextTests.cs

@@ -461,4 +461,4 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts.Test/DiscImageCreatorTests.cs

@@ -42,7 +42,7 @@ namespace MPF.ExecutionContexts.Test
 
         #region Default Values
 
-        private static Dictionary<string, string?> AllOptions = new()
+        private static readonly Dictionary<string, string?> AllOptions = new()
         {
             [SettingConstants.DVDRereadCount] = "1000",
             [SettingConstants.MultiSectorRead] = "true",

MPF.ExecutionContexts.Test/InputTests.cs

@@ -20,7 +20,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", new string[] { "flag" }, 0, true, true)]
         public void FlagInputTest(string name, string[] parts, int index, bool success, bool expected)
         {
-            FlagInput input = new FlagInput(name);
+            var input = new FlagInput(name);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -55,7 +55,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=false" }, 0, true, false)]
         public void BooleanInputTest(string name, bool required, string[] parts, int index, bool success, bool? expected)
         {
-            BooleanInput input = new BooleanInput(name, required);
+            var input = new BooleanInput(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -90,7 +90,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=-1" }, 0, true, (sbyte)-1)]
         public void Int8InputTest(string name, bool required, string[] parts, int index, bool success, sbyte? expected)
         {
-            Int8Input input = new Int8Input(name, required);
+            var input = new Int8Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -123,7 +123,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=1" }, 0, true, (byte)1)]
         public void UInt8InputTest(string name, bool required, string[] parts, int index, bool success, byte? expected)
         {
-            UInt8Input input = new UInt8Input(name, required);
+            var input = new UInt8Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -158,7 +158,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=-1" }, 0, true, (short)-1)]
         public void Int16InputTest(string name, bool required, string[] parts, int index, bool success, short? expected)
         {
-            Int16Input input = new Int16Input(name, required);
+            var input = new Int16Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -191,7 +191,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=1" }, 0, true, (ushort)1)]
         public void UInt16InputTest(string name, bool required, string[] parts, int index, bool success, ushort? expected)
         {
-            UInt16Input input = new UInt16Input(name, required);
+            var input = new UInt16Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -226,7 +226,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=-1" }, 0, true, (int)-1)]
         public void Int32InputTest(string name, bool required, string[] parts, int index, bool success, int? expected)
         {
-            Int32Input input = new Int32Input(name, required);
+            var input = new Int32Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -259,7 +259,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=1" }, 0, true, (uint)1)]
         public void UInt32InputTest(string name, bool required, string[] parts, int index, bool success, uint? expected)
         {
-            UInt32Input input = new UInt32Input(name, required);
+            var input = new UInt32Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -294,7 +294,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=-1" }, 0, true, (long)-1)]
         public void Int64InputTest(string name, bool required, string[] parts, int index, bool success, long? expected)
         {
-            Int64Input input = new Int64Input(name, required);
+            var input = new Int64Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -327,7 +327,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=1" }, 0, true, (ulong)1)]
         public void UInt64InputTest(string name, bool required, string[] parts, int index, bool success, ulong? expected)
         {
-            UInt64Input input = new UInt64Input(name, required);
+            var input = new UInt64Input(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -355,7 +355,7 @@ namespace MPF.ExecutionContexts.Test
         [InlineData("flag", true, new string[] { "flag=value" }, 0, true, "value")]
         public void StringInputTest(string name, bool required, string[] parts, int index, bool success, string? expected)
         {
-            StringInput input = new StringInput(name, required);
+            var input = new StringInput(name, required);
             bool actual = input.Process(parts, ref index);
 
             Assert.Equal(success, actual);
@@ -407,4 +407,4 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
     }
-}
+}

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -14,13 +14,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <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.6" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.25.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" />
@@ -29,7 +29,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.ExecutionContexts.Test/RedumperTests.cs

@@ -27,30 +27,28 @@ namespace MPF.ExecutionContexts.Test
         }
 
         #endregion
-    
+
         #region Default Values
 
-        private static Dictionary<string, string?> AllOptions = new()
+        private static readonly Dictionary<string, string?> AllOptions = new()
         {
-            [SettingConstants.EnableDebug] = "true",
-            [SettingConstants.EnableLeadinRetry] = "true",
             [SettingConstants.EnableVerbose] = "true",
             [SettingConstants.LeadinRetryCount] = "1000",
             [SettingConstants.ReadMethod] = "BE",
             [SettingConstants.RereadCount] = "1000",
             [SettingConstants.SectorOrder] = "DATA_C2_SUB",
-            [SettingConstants.UseGenericDriveType] = "true",
+            [SettingConstants.DriveType] = "GENERIC",
         };
 
         [Theory]
-        [InlineData(null, null, null, "filename.bin", null, "")]
-        [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")]
+        [InlineData(null, null, null, "filename.bin", null, "disc --verbose --skeleton --retries=1000 --image-name=\"filename\" --drive-type=GENERIC --drive-read-method=BE --drive-sector-order=DATA_C2_SUB --plextor-leadin-retries=1000")]
+        [InlineData(RedumpSystem.IBMPCcompatible, MediaType.CDROM, "/dev/sr0", "path/filename.bin", 2, "disc --verbose --skeleton --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 --skeleton --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 --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 --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 --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 --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 --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,
@@ -68,11 +66,11 @@ namespace MPF.ExecutionContexts.Test
         #region Disc
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DiscTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -95,11 +93,11 @@ namespace MPF.ExecutionContexts.Test
         #region Rings
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void RingsTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -111,11 +109,11 @@ namespace MPF.ExecutionContexts.Test
         #region Dump
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DumpTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -127,11 +125,11 @@ namespace MPF.ExecutionContexts.Test
         #region DumpExtra
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DumpExtraTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -143,11 +141,11 @@ namespace MPF.ExecutionContexts.Test
         #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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -159,11 +157,11 @@ namespace MPF.ExecutionContexts.Test
         #region Verify
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void VerifyTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -175,11 +173,11 @@ namespace MPF.ExecutionContexts.Test
         #region DVDKey
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DVDKeyTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -191,11 +189,11 @@ namespace MPF.ExecutionContexts.Test
         #region Eject
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void EjectTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -207,11 +205,11 @@ namespace MPF.ExecutionContexts.Test
         #region DVDIsoKey
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DVDIsoKeyTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -223,11 +221,11 @@ namespace MPF.ExecutionContexts.Test
         #region Protection
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --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 --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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -239,11 +237,11 @@ namespace MPF.ExecutionContexts.Test
         #region Split
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void SplitTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -255,11 +253,11 @@ namespace MPF.ExecutionContexts.Test
         #region Hash
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void HashTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -271,11 +269,11 @@ namespace MPF.ExecutionContexts.Test
         #region Info
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void InfoTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -287,11 +285,11 @@ namespace MPF.ExecutionContexts.Test
         #region Skeleton
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void SkeletonTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -303,11 +301,11 @@ namespace MPF.ExecutionContexts.Test
         #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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -319,11 +317,11 @@ namespace MPF.ExecutionContexts.Test
         #region Debug
 
         [Theory]
-        [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         public void DebugTest(string parameters)
         {
-            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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -335,11 +333,11 @@ namespace MPF.ExecutionContexts.Test
         #region FixMSF
 
         [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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -350,11 +348,11 @@ namespace MPF.ExecutionContexts.Test
         #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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -365,11 +363,11 @@ namespace MPF.ExecutionContexts.Test
         #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")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
+        [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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs")]
         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";
+            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 --disable-cdtext --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 --refine-sector-mode --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs";
             var context = new ExecutionContext(parameters);
             string? actual = context.GenerateParameters();
             Assert.Equal(expected, actual);
@@ -377,4 +375,4 @@ namespace MPF.ExecutionContexts.Test
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Aaru/CommandStrings.cs

@@ -86,4 +86,4 @@ namespace MPF.ExecutionContexts.Aaru
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Aaru/EncodingStrings.cs

@@ -40,4 +40,4 @@ namespace MPF.ExecutionContexts.Aaru
         public const string WesternEuropeanMac = "macintosh";
         public const string WesternEuropeanRadix50 = "radix50";
     }
-}
+}

MPF.ExecutionContexts/Aaru/ExecutionContext.cs

@@ -538,7 +538,11 @@ namespace MPF.ExecutionContexts.Aaru
                     if (string.IsNullOrEmpty(InputValue))
                         return null;
 
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                    if (InputValue!.Contains(' '))
+#else
                     if (InputValue!.Contains(" "))
+#endif
                         parameters.Append($"\"{InputValue!.TrimEnd('\\')}\" ");
                     else
                         parameters.Append($"{InputValue!.TrimEnd('\\')} ");
@@ -638,11 +642,6 @@ namespace MPF.ExecutionContexts.Aaru
                 (_inputs[FlagStrings.SpeedLong] as Int8Input)?.SetValue((sbyte)driveSpeed);
             }
 
-            // First check to see if the combination of system and MediaType is valid
-            var validTypes = RedumpSystem.MediaTypes();
-            if (!validTypes.Contains(MediaType))
-                return;
-
             // Set retry count
             int rereadCount = GetInt32Setting(options, SettingConstants.RereadCount, SettingConstants.RereadCountDefault);
             if (rereadCount > 0)
@@ -673,57 +672,13 @@ namespace MPF.ExecutionContexts.Aaru
                 (_inputs[FlagStrings.PrivateLong] as BooleanInput)?.SetValue(true);
             }
 
-            // TODO: Look at dump-media formats and the like and see what options there are there to fill in defaults
-            // Now sort based on disc type
-            switch (MediaType)
-            {
-                case SabreTools.RedumpLib.Data.MediaType.CDROM:
-                    // Currently no defaults set
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.DVD:
-                    this[FlagStrings.StoreEncryptedLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.StoreEncryptedLong] as BooleanInput)?.SetValue(true);
-                    this[FlagStrings.TitleKeysLong] = false; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TitleKeysLong] as BooleanInput)?.SetValue(false);
-                    this[FlagStrings.TrimLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TrimLong] as BooleanInput)?.SetValue(true);
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.GDROM:
-                    // Currently no defaults set
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.HDDVD:
-                    this[FlagStrings.StoreEncryptedLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.StoreEncryptedLong] as BooleanInput)?.SetValue(true);
-                    this[FlagStrings.TitleKeysLong] = false; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TitleKeysLong] as BooleanInput)?.SetValue(false);
-                    this[FlagStrings.TrimLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TrimLong] as BooleanInput)?.SetValue(true);
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.BluRay:
-                    this[FlagStrings.StoreEncryptedLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.StoreEncryptedLong] as BooleanInput)?.SetValue(true);
-                    this[FlagStrings.TitleKeysLong] = false; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TitleKeysLong] as BooleanInput)?.SetValue(false);
-                    this[FlagStrings.TrimLong] = true; // TODO: Make this configurable
-                    (_inputs[FlagStrings.TrimLong] as BooleanInput)?.SetValue(true);
-                    break;
-
-                // Special Formats
-                case SabreTools.RedumpLib.Data.MediaType.NintendoGameCubeGameDisc:
-                    // Currently no defaults set
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.NintendoWiiOpticalDisc:
-                    // Currently no defaults set
-                    break;
-                case SabreTools.RedumpLib.Data.MediaType.NintendoWiiUOpticalDisc:
-                    // Currently no defaults set
-                    break;
-
-                // Non-optical
-                case SabreTools.RedumpLib.Data.MediaType.FloppyDisk:
-                    // Currently no defaults set
-                    break;
-            }
+            // Set generic, sane defaults to cover all bases
+            this[FlagStrings.StoreEncryptedLong] = true;
+            (_inputs[FlagStrings.StoreEncryptedLong] as BooleanInput)?.SetValue(true);
+            this[FlagStrings.TitleKeysLong] = false;
+            (_inputs[FlagStrings.TitleKeysLong] as BooleanInput)?.SetValue(false);
+            this[FlagStrings.TrimLong] = true;
+            (_inputs[FlagStrings.TrimLong] as BooleanInput)?.SetValue(true);
         }
 
         /// <inheritdoc/>

MPF.ExecutionContexts/Aaru/FlagStrings.cs

@@ -170,4 +170,4 @@ namespace MPF.ExecutionContexts.Aaru
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Aaru/FormatStrings.cs

@@ -166,4 +166,4 @@ namespace MPF.ExecutionContexts.Aaru
         public const string XboxPartitioning = "Xbox partitioning";
         public const string XENIX = "XENIX";
     }
-}
+}

MPF.ExecutionContexts/Aaru/NamespaceStrings.cs

@@ -24,4 +24,4 @@ namespace MPF.ExecutionContexts.Aaru
         public const string WindowsNT83MixedCase = "nt";
         public const string OS2Extended = "os2";
     }
-}
+}

MPF.ExecutionContexts/Aaru/OptionStrings.cs

@@ -40,4 +40,4 @@ namespace MPF.ExecutionContexts.Aaru
         public const string VMwareDiskImageSparse = "sparse"; // boolean, default false
         public const string VMwareDiskImageSplit = "split"; // boolean, default false
     }
-}
+}

MPF.ExecutionContexts/Aaru/SettingConstants.cs

@@ -17,4 +17,4 @@ namespace MPF.ExecutionContexts.Aaru
         public const string StripPersonalData = "AaruStripPersonalData";
         public const bool StripPersonalDataDefault = false;
     }
-}
+}

MPF.ExecutionContexts/Data/BooleanInput.cs

@@ -51,9 +51,9 @@ namespace MPF.ExecutionContexts.Data
 
             // Separator
             if (useEquals)
-                builder.Append("=");
+                builder.Append('=');
             else
-                builder.Append(" ");
+                builder.Append(' ');
 
             // Value
             builder.Append(Value.ToString());
@@ -120,4 +120,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/FlagInput.cs

@@ -70,4 +70,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/Input.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace MPF.ExecutionContexts.Data
 {
     /// <summary>
@@ -124,49 +122,77 @@ namespace MPF.ExecutionContexts.Data
             factor = 1;
 
             // Characters
-            if (value.EndsWith("c", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            if (value.EndsWith('c'))
+#else
+            if (value.EndsWith("c", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 1;
                 value = value.TrimEnd('c');
             }
 
             // Words
-            else if (value.EndsWith("w", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('w'))
+#else
+            else if (value.EndsWith("w", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 2;
                 value = value.TrimEnd('w');
             }
 
             // Double Words
-            else if (value.EndsWith("d", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('d'))
+#else
+            else if (value.EndsWith("d", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 4;
                 value = value.TrimEnd('d');
             }
 
             // Quad Words
-            else if (value.EndsWith("q", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('q'))
+#else
+            else if (value.EndsWith("q", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 8;
                 value = value.TrimEnd('q');
             }
 
             // Kilobytes
-            else if (value.EndsWith("k", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('k'))
+#else
+            else if (value.EndsWith("k", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 1024;
                 value = value.TrimEnd('k');
             }
 
             // Megabytes
-            else if (value.EndsWith("M", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('M'))
+#else
+            else if (value.EndsWith("M", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 1024 * 1024;
                 value = value.TrimEnd('M');
             }
 
             // Gigabytes
-            else if (value.EndsWith("G", StringComparison.Ordinal))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            else if (value.EndsWith('G'))
+#else
+            else if (value.EndsWith("G", System.StringComparison.Ordinal))
+#endif
             {
                 factor = 1024 * 1024 * 1024;
                 value = value.TrimEnd('G');
@@ -189,7 +215,11 @@ namespace MPF.ExecutionContexts.Data
             if (value[1] != 'x' && value[1] != 'X')
                 return value;
 
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+            return value[2..];
+#else
             return value.Substring(2);
+#endif
         }
 
         #endregion
@@ -258,4 +288,4 @@ namespace MPF.ExecutionContexts.Data
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Data/Int16Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/Int32ArrInput.cs

@@ -74,9 +74,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 int?[] nonNull = Array.FindAll(Value, i => i != null);
@@ -158,4 +158,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/Int32Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/Int64Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/Int8Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/StringInput.cs

@@ -64,9 +64,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 if (Quotes)
@@ -123,4 +123,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/UInt16Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/UInt32Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/UInt64Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/Data/UInt8Input.cs

@@ -69,9 +69,9 @@ namespace MPF.ExecutionContexts.Data
             {
                 // Separator
                 if (useEquals)
-                    builder.Append("=");
+                    builder.Append('=');
                 else
-                    builder.Append(" ");
+                    builder.Append(' ');
 
                 // Value
                 builder.Append(Value.ToString());
@@ -186,4 +186,4 @@ namespace MPF.ExecutionContexts.Data
             return false;
         }
     }
-}
+}

MPF.ExecutionContexts/DiscImageCreator/CommandStrings.cs

@@ -32,4 +32,4 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         public const string XGD2Swap = "xgd2swap";
         public const string XGD3Swap = "xgd3swap";
     }
-}
+}

MPF.ExecutionContexts/DiscImageCreator/Converters.cs

@@ -97,4 +97,4 @@ namespace MPF.ExecutionContexts.DiscImageCreator
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/DiscImageCreator/ExecutionContext.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using SabreTools.RedumpLib.Data;
 
@@ -441,7 +440,11 @@ namespace MPF.ExecutionContexts.DiscImageCreator
             {
                 if (DrivePath != null)
                 {
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                    if (DrivePath.Contains(' '))
+#else
                     if (DrivePath.Contains(" "))
+#endif
                         parameters.Append($"\"{DrivePath}\" ");
                     else
                         parameters.Append($"{DrivePath} ");

MPF.ExecutionContexts/DiscImageCreator/FlagStrings.cs

@@ -47,4 +47,4 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         public const string VideoNowColor = "/vnc";
         public const string VideoNowXP = "/vnx";
     }
-}
+}

MPF.ExecutionContexts/DiscImageCreator/SettingConstants.cs

@@ -23,4 +23,4 @@ namespace MPF.ExecutionContexts.DiscImageCreator
         public const string UseCMIFlag = "DICUseCMIFlag";
         public const bool UseCMIFlagDefault = false;
     }
-}
+}

MPF.ExecutionContexts/MPF.ExecutionContexts.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <IncludeSymbols>true</IncludeSymbols>
@@ -11,7 +11,7 @@
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.1</VersionPrefix>
+        <VersionPrefix>3.6.0</VersionPrefix>
         <WarningsNotAsErrors>NU5104</WarningsNotAsErrors>
 
         <!-- Package Properties -->
@@ -32,7 +32,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.RedumpLib" Version="1.6.6" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
     </ItemGroup>
 
 </Project>

MPF.ExecutionContexts/Redumper/CommandStrings.cs

@@ -21,10 +21,12 @@ namespace MPF.ExecutionContexts.Redumper
         public const string Info = "info";
         public const string Skeleton = "skeleton";
         public const string FlashMT1339 = "flash::mt1339";
+        public const string FlashSD616 = "flash::sd616";
+        public const string FlashPlextor = "flash::plextor";
         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/Converters.cs

@@ -29,4 +29,4 @@ namespace MPF.ExecutionContexts.Redumper
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Redumper/Enumerations.cs

@@ -1,5 +1,21 @@
 namespace MPF.ExecutionContexts.Redumper
 {
+    /// <summary>
+    /// Drive type option
+    /// </summary>
+    public enum DriveType
+    {
+        NONE = 0,
+
+        GENERIC,
+        PLEXTOR,
+        LG_ASU8A,
+        LG_ASU8B,
+        LG_ASU8C,
+        LG_ASU3,
+        LG_ASU2,
+    }
+
     /// <summary>
     /// Drive read method option
     /// </summary>
@@ -9,7 +25,6 @@ namespace MPF.ExecutionContexts.Redumper
 
         BE,
         D8,
-        BE_CDDA, // Currently an alias for BE
     }
 
     /// <summary>
@@ -24,4 +39,4 @@ namespace MPF.ExecutionContexts.Redumper
         DATA_SUB,
         DATA_C2,
     }
-}
+}

MPF.ExecutionContexts/Redumper/ExecutionContext.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -49,11 +50,6 @@ namespace MPF.ExecutionContexts.Redumper
 
         #region Flag Values
 
-        /// <summary>
-        /// Mode being run
-        /// </summary>
-        public string? ModeValue { get; set; }
-
         /// <summary>
         /// Set of all command flags
         /// </summary>
@@ -63,20 +59,19 @@ 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.ListRecommendedDrives] = new FlagInput(FlagStrings.ListRecommendedDrives),
+            [FlagStrings.ListAllDrives] = new FlagInput(FlagStrings.ListAllDrives),
             [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),
             [FlagStrings.ImagePath] = new StringInput(FlagStrings.ImagePath) { Quotes = true },
             [FlagStrings.ImageName] = new StringInput(FlagStrings.ImageName) { Quotes = true },
             [FlagStrings.Overwrite] = new FlagInput(FlagStrings.Overwrite),
+            [FlagStrings.DiscType] = new StringInput(FlagStrings.DiscType),
 
             // Drive Configuration
-            [FlagStrings.Overwrite] = new FlagInput(FlagStrings.Overwrite),
             [FlagStrings.DriveType] = new StringInput(FlagStrings.DriveType),
             [FlagStrings.DriveReadOffset] = new Int32Input(FlagStrings.DriveReadOffset),
             [FlagStrings.DriveC2Shift] = new Int32Input(FlagStrings.DriveC2Shift),
@@ -88,8 +83,10 @@ namespace MPF.ExecutionContexts.Redumper
             [FlagStrings.PlextorSkipLeadin] = new FlagInput(FlagStrings.PlextorSkipLeadin),
             [FlagStrings.PlextorLeadinRetries] = new Int32Input(FlagStrings.PlextorLeadinRetries),
             [FlagStrings.PlextorLeadinForceStore] = new FlagInput(FlagStrings.PlextorLeadinForceStore),
+            [FlagStrings.KreonPartialSS] = new FlagInput(FlagStrings.KreonPartialSS),
             [FlagStrings.AsusSkipLeadout] = new FlagInput(FlagStrings.AsusSkipLeadout),
             [FlagStrings.AsusLeadoutRetries] = new Int32Input(FlagStrings.AsusLeadoutRetries),
+            [FlagStrings.DisableCDText] = new FlagInput(FlagStrings.DisableCDText),
 
             // Offset
             [FlagStrings.ForceOffset] = new Int32Input(FlagStrings.ForceOffset),
@@ -104,22 +101,30 @@ namespace MPF.ExecutionContexts.Redumper
             [FlagStrings.SkipFill] = new UInt8Input(FlagStrings.SkipFill),
             [FlagStrings.ISO9660Trim] = new FlagInput(FlagStrings.ISO9660Trim),
 
+            // Drive Test
+            [FlagStrings.DriveTestSkipPlextorLeadin] = new FlagInput(FlagStrings.DriveTestSkipPlextorLeadin),
+            [FlagStrings.DriveTestSkipCacheRead] = new FlagInput(FlagStrings.DriveTestSkipCacheRead),
+
             // Miscellaneous
+            [FlagStrings.Continue] = new StringInput(FlagStrings.Continue),
             [FlagStrings.LBAStart] = new Int32Input(FlagStrings.LBAStart),
             [FlagStrings.LBAEnd] = new Int32Input(FlagStrings.LBAEnd),
             [FlagStrings.RefineSubchannel] = new FlagInput(FlagStrings.RefineSubchannel),
+            [FlagStrings.RefineSectorMode] = new FlagInput(FlagStrings.RefineSectorMode),
             [FlagStrings.Skip] = new StringInput(FlagStrings.Skip),
             [FlagStrings.DumpWriteOffset] = new Int32Input(FlagStrings.DumpWriteOffset),
             [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 },
+            [FlagStrings.SkipSubcodeDesync] = new FlagInput(FlagStrings.SkipSubcodeDesync),
+            [FlagStrings.Rings] = new FlagInput(FlagStrings.Rings),
+            [FlagStrings.CdrErrorThreshold] = new Int32Input(FlagStrings.CdrErrorThreshold),
+
+            // Undocumented
+            [FlagStrings.Debug] = new FlagInput(FlagStrings.Debug),
+            [FlagStrings.LegacySubs] = new FlagInput(FlagStrings.LegacySubs),
         };
 
         #endregion
@@ -153,17 +158,17 @@ namespace MPF.ExecutionContexts.Redumper
                     FlagStrings.HelpShort,
                     FlagStrings.Version,
                     FlagStrings.Verbose,
-                    FlagStrings.Continue,
+                    FlagStrings.ListRecommendedDrives,
+                    FlagStrings.ListAllDrives,
                     FlagStrings.AutoEject,
                     FlagStrings.Skeleton,
-                    FlagStrings.Debug,
-                    FlagStrings.DiscType,
                     FlagStrings.Drive,
                     FlagStrings.Speed,
                     FlagStrings.Retries,
                     FlagStrings.ImagePath,
                     FlagStrings.ImageName,
                     FlagStrings.Overwrite,
+                    FlagStrings.DiscType,
 
                     // Drive Configuration
                     FlagStrings.DriveType,
@@ -177,8 +182,10 @@ namespace MPF.ExecutionContexts.Redumper
                     FlagStrings.PlextorSkipLeadin,
                     FlagStrings.PlextorLeadinRetries,
                     FlagStrings.PlextorLeadinForceStore,
+                    FlagStrings.KreonPartialSS,
                     FlagStrings.AsusSkipLeadout,
                     FlagStrings.AsusLeadoutRetries,
+                    FlagStrings.DisableCDText,
 
                     // Offset
                     FlagStrings.ForceOffset,
@@ -193,22 +200,30 @@ namespace MPF.ExecutionContexts.Redumper
                     FlagStrings.SkipFill,
                     FlagStrings.ISO9660Trim,
 
+                    // Drive Test
+                    FlagStrings.DriveTestSkipPlextorLeadin,
+                    FlagStrings.DriveTestSkipCacheRead,
+
                     // Miscellaneous
+                    FlagStrings.Continue,
                     FlagStrings.LBAStart,
                     FlagStrings.LBAEnd,
                     FlagStrings.RefineSubchannel,
+                    FlagStrings.RefineSectorMode,
                     FlagStrings.Skip,
                     FlagStrings.DumpWriteOffset,
                     FlagStrings.DumpReadSize,
                     FlagStrings.OverreadLeadout,
                     FlagStrings.ForceUnscrambled,
                     FlagStrings.ForceRefine,
-                    FlagStrings.LegacySubs,
-                    FlagStrings.DisableCDText,
-                    FlagStrings.SkipSubcodeDesync,
-                    FlagStrings.DriveTestSkipPlextorLeadin,
-                    FlagStrings.DriveTestSkipCacheRead,
                     //FlagStrings.Firmware,
+                    FlagStrings.SkipSubcodeDesync,
+                    FlagStrings.Rings,
+                    FlagStrings.CdrErrorThreshold,
+
+                    // Undocumented
+                    FlagStrings.Debug,
+                    FlagStrings.LegacySubs,
                 ],
             };
         }
@@ -224,9 +239,9 @@ namespace MPF.ExecutionContexts.Redumper
             var parameters = new StringBuilder();
 
             // Command Mode
-            ModeValue ??= CommandStrings.NONE;
-            if (ModeValue != CommandStrings.NONE)
-                parameters.Append($"{ModeValue} ");
+            BaseCommand ??= CommandStrings.NONE;
+            if (BaseCommand != CommandStrings.NONE)
+                parameters.Append($"{BaseCommand} ");
 
             // Loop though and append all existing
             foreach (var kvp in _inputs)
@@ -253,8 +268,8 @@ namespace MPF.ExecutionContexts.Redumper
         public override bool IsDumpingCommand()
         {
             // `dump` command does not provide hashes so will error out after dump if run via MPF
-            return ModeValue == CommandStrings.NONE
-                || ModeValue == CommandStrings.Disc;
+            return BaseCommand == CommandStrings.NONE
+                || BaseCommand == CommandStrings.Disc;
         }
 
         /// <inheritdoc/>
@@ -274,25 +289,13 @@ namespace MPF.ExecutionContexts.Redumper
             int? driveSpeed,
             Dictionary<string, string?> options)
         {
-            BaseCommand = CommandStrings.NONE;
-            switch (MediaType)
-            {
-                case SabreTools.RedumpLib.Data.MediaType.CDROM:
-                case SabreTools.RedumpLib.Data.MediaType.DVD:
-                case SabreTools.RedumpLib.Data.MediaType.NintendoGameCubeGameDisc:
-                case SabreTools.RedumpLib.Data.MediaType.NintendoWiiOpticalDisc:
-                case SabreTools.RedumpLib.Data.MediaType.HDDVD:
-                case SabreTools.RedumpLib.Data.MediaType.BluRay:
-                case SabreTools.RedumpLib.Data.MediaType.NintendoWiiUOpticalDisc:
-                    ModeValue = CommandStrings.Disc;
-                    break;
-                default:
-                    BaseCommand = null;
-                    return;
-            }
+            BaseCommand = CommandStrings.Disc;
 
-            this[FlagStrings.Drive] = true;
-            (_inputs[FlagStrings.Drive] as StringInput)?.SetValue(drivePath ?? string.Empty);
+            if (drivePath != null)
+            {
+                this[FlagStrings.Drive] = true;
+                (_inputs[FlagStrings.Drive] as StringInput)?.SetValue(drivePath);
+            }
 
             if (driveSpeed != null && driveSpeed > 0)
             {
@@ -313,38 +316,60 @@ namespace MPF.ExecutionContexts.Redumper
             }
             if (GetBooleanSetting(options, SettingConstants.EnableSkeleton, SettingConstants.EnableSkeletonDefault))
             {
-                // Enable skeleton for CD dumps only by default
-                switch (MediaType)
+                switch (RedumpSystem)
                 {
-                    case SabreTools.RedumpLib.Data.MediaType.CDROM:
-                        switch (RedumpSystem)
+                    // Systems known to have significant data outside the ISO9660 filesystem
+                    case SabreTools.RedumpLib.Data.RedumpSystem.MicrosoftXbox:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.MicrosoftXbox360:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.PlaymajiPolymega:
+                    // Skeletons from newer BD-based consoles unnecessary
+                    case SabreTools.RedumpLib.Data.RedumpSystem.MicrosoftXboxOne:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.MicrosoftXboxSeriesXS:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.SonyPlayStation3:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.SonyPlayStation4:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.SonyPlayStation5:
+                    case SabreTools.RedumpLib.Data.RedumpSystem.NintendoWiiU:
+                        break;
+
+                    default:
+                        // Enable skeleton for CD and DVD only, by default
+                        switch (MediaType)
                         {
-                            case SabreTools.RedumpLib.Data.RedumpSystem.SuperAudioCD:
+                            case SabreTools.RedumpLib.Data.MediaType.CDROM:
+                            case SabreTools.RedumpLib.Data.MediaType.DVD:
+                                {
+                                    this[FlagStrings.Skeleton] = true;
+                                    (_inputs[FlagStrings.Skeleton] as FlagInput)?.SetValue(true);
+                                }
                                 break;
-                            default:
+
+                            // If the type is unknown, also enable
+                            case null:
                                 this[FlagStrings.Skeleton] = true;
                                 (_inputs[FlagStrings.Skeleton] as FlagInput)?.SetValue(true);
                                 break;
+
+                            default:
+                                break;
                         }
                         break;
-                    default:
-                        break;
                 }
             }
-            if (GetBooleanSetting(options, SettingConstants.EnableDebug, SettingConstants.EnableDebugDefault))
-            {
-                this[FlagStrings.Debug] = true;
-                (_inputs[FlagStrings.Debug] as FlagInput)?.SetValue(true);
-            }
 
             string? readMethod = GetStringSetting(options, SettingConstants.ReadMethod, SettingConstants.ReadMethodDefault);
-
             if (!string.IsNullOrEmpty(readMethod) && readMethod != ReadMethod.NONE.ToString())
             {
                 this[FlagStrings.DriveReadMethod] = true;
                 (_inputs[FlagStrings.DriveReadMethod] as StringInput)?.SetValue(readMethod!);
             }
 
+            int drivePregapStart = GetInt32Setting(options, SettingConstants.DrivePregapStart, SettingConstants.DrivePregapStartDefault);
+            if (drivePregapStart != SettingConstants.DrivePregapStartDefault)
+            {
+                this[FlagStrings.DrivePregapStart] = true;
+                (_inputs[FlagStrings.DrivePregapStart] as Int32Input)?.SetValue(drivePregapStart);
+            }
+
             string? sectorOrder = GetStringSetting(options, SettingConstants.SectorOrder, SettingConstants.SectorOrderDefault);
             if (!string.IsNullOrEmpty(sectorOrder) && sectorOrder != SectorOrder.NONE.ToString())
             {
@@ -352,10 +377,11 @@ namespace MPF.ExecutionContexts.Redumper
                 (_inputs[FlagStrings.DriveSectorOrder] as StringInput)?.SetValue(sectorOrder!);
             }
 
-            if (GetBooleanSetting(options, SettingConstants.UseGenericDriveType, SettingConstants.UseGenericDriveTypeDefault))
+            string? driveType = GetStringSetting(options, SettingConstants.DriveType, SettingConstants.DriveTypeDefault);
+            if (!string.IsNullOrEmpty(driveType) && driveType != DriveType.NONE.ToString())
             {
                 this[FlagStrings.DriveType] = true;
-                (_inputs[FlagStrings.DriveType] as StringInput)?.SetValue("GENERIC");
+                (_inputs[FlagStrings.DriveType] as StringInput)?.SetValue(driveType!);
             }
 
             // Set the output paths
@@ -376,21 +402,30 @@ namespace MPF.ExecutionContexts.Redumper
                 }
             }
 
-            this[FlagStrings.Retries] = true;
-            (_inputs[FlagStrings.Retries] as Int32Input)?.SetValue(GetInt32Setting(options, SettingConstants.RereadCount, SettingConstants.RereadCountDefault));
+            int retries = GetInt32Setting(options, SettingConstants.RereadCount, SettingConstants.RereadCountDefault);
+            if (retries > 0)
+            {
+                this[FlagStrings.Retries] = true;
+                (_inputs[FlagStrings.Retries] as Int32Input)?.SetValue(retries);
+            }
 
-            if (GetBooleanSetting(options, SettingConstants.EnableLeadinRetry, SettingConstants.EnableLeadinRetryDefault))
+            int leadinRetries = GetInt32Setting(options, SettingConstants.LeadinRetryCount, SettingConstants.LeadinRetryCountDefault);
+            if (leadinRetries != SettingConstants.LeadinRetryCountDefault)
             {
                 this[FlagStrings.PlextorLeadinRetries] = true;
-                (_inputs[FlagStrings.PlextorLeadinRetries] as Int32Input)?.SetValue(GetInt32Setting(options, SettingConstants.LeadinRetryCount, SettingConstants.LeadinRetryCountDefault));
+                (_inputs[FlagStrings.PlextorLeadinRetries] as Int32Input)?.SetValue(leadinRetries);
+            }
+
+            if (GetBooleanSetting(options, SettingConstants.RefineSectorMode, SettingConstants.RefineSectorModeDefault))
+            {
+                this[FlagStrings.RefineSectorMode] = true;
+                (_inputs[FlagStrings.RefineSectorMode] as FlagInput)?.SetValue(true);
             }
         }
 
         /// <inheritdoc/>
         protected override bool ValidateAndSetParameters(string? parameters)
         {
-            BaseCommand = CommandStrings.NONE;
-
             // The string has to be valid by itself first
             if (string.IsNullOrEmpty(parameters))
                 return false;
@@ -399,7 +434,7 @@ namespace MPF.ExecutionContexts.Redumper
             string[] parts = SplitParameterString(parameters!);
 
             // Setup the modes
-            ModeValue = null;
+            BaseCommand = null;
 
             // All modes should be cached separately
             int index = 0;
@@ -426,21 +461,27 @@ namespace MPF.ExecutionContexts.Redumper
                     case CommandStrings.Info:
                     case CommandStrings.Skeleton:
                     case CommandStrings.FlashMT1339:
+                    case CommandStrings.FlashSD616:
+                    case CommandStrings.FlashPlextor:
                     case CommandStrings.Subchannel:
                     case CommandStrings.Debug:
                     case CommandStrings.FixMSF:
                     case CommandStrings.DebugFlip:
                     case CommandStrings.DriveTest:
                         // Only allow one mode per command
-                        if (ModeValue != null)
+                        if (BaseCommand != null)
                             continue;
 
-                        ModeValue = part;
+                        BaseCommand = part;
                         break;
 
                     // Default is either a flag or an invalid mode
                     default:
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                        if (part.StartsWith('-'))
+#else
                         if (part.StartsWith("-"))
+#endif
                         {
                             isFlag = true;
                             break;
@@ -473,7 +514,7 @@ namespace MPF.ExecutionContexts.Redumper
 
             // If the image name was not set, set it with a default value
             if (string.IsNullOrEmpty((_inputs[FlagStrings.ImageName] as StringInput)?.Value))
-                (_inputs[FlagStrings.ImageName] as StringInput)?.SetValue("track");
+                (_inputs[FlagStrings.ImageName] as StringInput)?.SetValue($"track_{DateTime.Now:yyyyMMdd-HHmm}");
 
             return true;
         }

MPF.ExecutionContexts/Redumper/FlagStrings.cs

@@ -11,17 +11,17 @@ 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 ListRecommendedDrives = "--list-recommended-drives";
+        public const string ListAllDrives = "--list-all-drives";
         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";
         public const string ImagePath = "--image-path";
         public const string ImageName = "--image-name";
         public const string Overwrite = "--overwrite";
+        public const string DiscType = "--disc-type";
 
         #endregion
 
@@ -41,8 +41,10 @@ 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 KreonPartialSS = "--kreon-partial-ss";
         public const string AsusSkipLeadout = "--asus-skip-leadout";
         public const string AsusLeadoutRetries = "--asus-leadout-retries";
+        public const string DisableCDText = "--disable-cdtext";
 
         #endregion
 
@@ -65,24 +67,38 @@ namespace MPF.ExecutionContexts.Redumper
 
         #endregion
 
+        #region Drive Test
+
+        public const string DriveTestSkipPlextorLeadin = "--drive-test-skip-plextor-leadin";
+        public const string DriveTestSkipCacheRead = "--drive-test-skip-cache-read";
+
+        #endregion
+
         #region Miscellaneous
 
+        public const string Continue = "--continue";
         public const string LBAStart = "--lba-start";
         public const string LBAEnd = "--lba-end";
         public const string RefineSubchannel = "--refine-subchannel";
+        public const string RefineSectorMode = "--refine-sector-mode";
         public const string Skip = "--skip";
         public const string DumpWriteOffset = "--dump-write-offset";
         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";
+        public const string SkipSubcodeDesync = "--skip-subcode-desync";
+        public const string Rings = "--rings";
+        public const string CdrErrorThreshold = "--cdr-error-threshold";
+
+        #endregion
+
+        #region Undocumented
+
+        public const string Debug = "--debug";
+        public const string LegacySubs = "--legacy-subs";
 
         #endregion
     }
-}
+}

MPF.ExecutionContexts/Redumper/SettingConstants.cs

@@ -2,31 +2,31 @@ namespace MPF.ExecutionContexts.Redumper
 {
     public static class SettingConstants
     {
-        public const string EnableDebug = "RedumperEnableDebug";
-        public const bool EnableDebugDefault = false;
-
-        public const string EnableLeadinRetry = "RedumperEnableLeadinRetry";
-        public const bool EnableLeadinRetryDefault = false;
+        public const string DriveType = "RedumperDriveType";
+        public static readonly string DriveTypeDefault = Redumper.DriveType.NONE.ToString();
 
         public const string EnableSkeleton = "RedumperEnableSkeleton";
         public const bool EnableSkeletonDefault = true;
 
         public const string EnableVerbose = "RedumperEnableVerbose";
-        public const bool EnableVerboseDefault = true;
+        public const bool EnableVerboseDefault = false;
 
         public const string LeadinRetryCount = "RedumperLeadinRetryCount";
         public const int LeadinRetryCountDefault = 4;
 
+        public const string DrivePregapStart = "RedumperDrivePregapStart";
+        public const int DrivePregapStartDefault = 0;
+
         public const string ReadMethod = "RedumperReadMethod";
         public static readonly string ReadMethodDefault = Redumper.ReadMethod.NONE.ToString();
 
+        public const string RefineSectorMode = "RedumperRefineSectorMode";
+        public const bool RefineSectorModeDefault = false;
+
         public const string RereadCount = "RedumperRereadCount";
         public const int RereadCountDefault = 20;
 
         public const string SectorOrder = "RedumperSectorOrder";
         public static readonly string SectorOrderDefault = Redumper.SectorOrder.NONE.ToString();
-
-        public const string UseGenericDriveType = "RedumperUseGenericDriveType";
-        public const bool UseGenericDriveTypeDefault = false;
     }
-}
+}

MPF.Frontend.Test/DriveTests.cs

@@ -43,7 +43,7 @@ namespace MPF.Frontend.Test
         public static List<object?[]> GenerateDriveTypeMappingTestData()
         {
             var testData = new List<object?[]>() { new object?[] { null, true } };
-            foreach (DriveType driveType in Enum.GetValues(typeof(DriveType)))
+            foreach (DriveType driveType in Enum.GetValues<DriveType>())
             {
                 if (Array.IndexOf(_mappableDriveTypes, driveType) > -1)
                     testData.Add([driveType, false]);

MPF.Frontend.Test/DumpEnvironmentTests.cs

@@ -22,9 +22,15 @@ namespace MPF.Frontend.Test
                 ? Drive.Create(InternalDriveType.Floppy, letter.ToString())
                 : Drive.Create(InternalDriveType.Optical, letter.ToString());
 
-            var env = new DumpEnvironment(options, string.Empty, drive, RedumpSystem.IBMPCcompatible, mediaType, null, parameters);
+            var env = new DumpEnvironment(options,
+                string.Empty,
+                drive,
+                RedumpSystem.IBMPCcompatible,
+                null);
+            env.SetExecutionContext(mediaType, parameters);
+            env.SetProcessor();
 
-            bool actual = env.ParametersValid();
+            bool actual = env.ParametersValid(mediaType);
             Assert.Equal(expected, actual);
         }
     }

MPF.Frontend.Test/EnumExtensionsTests.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using SabreTools.RedumpLib.Data;
 using Xunit;
+using LogCompression = MPF.Processors.LogCompression;
+using RedumperDriveType = MPF.ExecutionContexts.Redumper.DriveType;
 using RedumperReadMethod = MPF.ExecutionContexts.Redumper.ReadMethod;
 using RedumperSectorOrder = MPF.ExecutionContexts.Redumper.SectorOrder;
 
@@ -12,6 +14,33 @@ namespace MPF.Frontend.Test
     {
         #region Long Name
 
+        [Theory]
+        [InlineData(null, "Unknown")]
+        [InlineData(InterfaceLanguage.AutoDetect, "Auto Detect")]
+        [InlineData(InterfaceLanguage.English, "English")]
+        [InlineData(InterfaceLanguage.French, "Français")]
+        [InlineData(InterfaceLanguage.German, "Deutsch")]
+        [InlineData(InterfaceLanguage.Italian, "Italiano")]
+        [InlineData(InterfaceLanguage.Japanese, "日本語")]
+        [InlineData(InterfaceLanguage.Korean, "한국어")]
+        [InlineData(InterfaceLanguage.Polish, "Polski")]
+        [InlineData(InterfaceLanguage.Russian, "Русский")]
+        [InlineData(InterfaceLanguage.Spanish, "Español")]
+        [InlineData(InterfaceLanguage.Swedish, "Svenska")]
+        [InlineData(InterfaceLanguage.Ukrainian, "Українська")]
+        [InlineData(InterfaceLanguage.L337, "L337")]
+        public void LongName_InterfaceLanguage(InterfaceLanguage? lang, string? expected)
+        {
+            string? actual = lang.LongName();
+            Assert.Equal(expected, actual);
+
+            if (lang != null)
+            {
+                actual = EnumExtensions.GetLongName(lang);
+                Assert.Equal(expected, actual);
+            }
+        }
+
         [Theory]
         [InlineData(null, "Unknown")]
         [InlineData(InternalProgram.NONE, "Unknown")]
@@ -26,6 +55,29 @@ namespace MPF.Frontend.Test
         {
             string? actual = prog.LongName();
             Assert.Equal(expected, actual);
+
+            if (prog != null)
+            {
+                actual = EnumExtensions.GetLongName(prog);
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Theory]
+        [InlineData(null, "Unknown")]
+        [InlineData(LogCompression.DeflateDefault, "ZIP using Deflate (Level 5)")]
+        [InlineData(LogCompression.DeflateMaximum, "ZIP using Deflate (Level 9)")]
+        [InlineData(LogCompression.Zstd19, "ZIP using Zstd (Level 19)")]
+        public void LongName_LogCompression(LogCompression? comp, string? expected)
+        {
+            string? actual = comp.LongName();
+            Assert.Equal(expected, actual);
+
+            if (comp != null)
+            {
+                actual = EnumExtensions.GetLongName(comp);
+                Assert.Equal(expected, actual);
+            }
         }
 
         [Theory]
@@ -33,11 +85,16 @@ namespace MPF.Frontend.Test
         [InlineData(RedumperReadMethod.NONE, "Default")]
         [InlineData(RedumperReadMethod.D8, "D8")]
         [InlineData(RedumperReadMethod.BE, "BE")]
-        [InlineData(RedumperReadMethod.BE_CDDA, "BE_CDDA")]
         public void LongName_RedumperReadMethod(RedumperReadMethod? method, string? expected)
         {
             string? actual = method.LongName();
             Assert.Equal(expected, actual);
+
+            if (method != null)
+            {
+                actual = EnumExtensions.GetLongName(method);
+                Assert.Equal(expected, actual);
+            }
         }
 
         [Theory]
@@ -51,12 +108,61 @@ namespace MPF.Frontend.Test
         {
             string? actual = order.LongName();
             Assert.Equal(expected, actual);
+
+            if (order != null)
+            {
+                actual = EnumExtensions.GetLongName(order);
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Theory]
+        [InlineData(null, "Unknown")]
+        [InlineData(RedumperDriveType.NONE, "Default")]
+        [InlineData(RedumperDriveType.GENERIC, "GENERIC")]
+        [InlineData(RedumperDriveType.PLEXTOR, "PLEXTOR")]
+        [InlineData(RedumperDriveType.LG_ASU8A, "LG_ASU8A")]
+        [InlineData(RedumperDriveType.LG_ASU8B, "LG_ASU8B")]
+        [InlineData(RedumperDriveType.LG_ASU8C, "LG_ASU8C")]
+        [InlineData(RedumperDriveType.LG_ASU3, "LG_ASU3")]
+        [InlineData(RedumperDriveType.LG_ASU2, "LG_ASU2")]
+        public void LongName_RedumperDriveType(RedumperDriveType? type, string? expected)
+        {
+            string? actual = type.LongName();
+            Assert.Equal(expected, actual);
+
+            if (type != null)
+            {
+                actual = EnumExtensions.GetLongName(type);
+                Assert.Equal(expected, actual);
+            }
         }
 
         #endregion
 
         #region Short Name
 
+        [Theory]
+        [InlineData(null, "Unknown")]
+        [InlineData(InterfaceLanguage.AutoDetect, "auto")]
+        [InlineData(InterfaceLanguage.English, "eng")]
+        [InlineData(InterfaceLanguage.French, "fra")]
+        [InlineData(InterfaceLanguage.German, "deu")]
+        [InlineData(InterfaceLanguage.Italian, "ita")]
+        [InlineData(InterfaceLanguage.Japanese, "jpn")]
+        [InlineData(InterfaceLanguage.Korean, "kor")]
+        [InlineData(InterfaceLanguage.Polish, "pol")]
+        [InlineData(InterfaceLanguage.Russian, "rus")]
+        [InlineData(InterfaceLanguage.Spanish, "spa")]
+        [InlineData(InterfaceLanguage.Swedish, "swe")]
+        [InlineData(InterfaceLanguage.Ukrainian, "ukr")]
+        [InlineData(InterfaceLanguage.L337, "l37")]
+        public void ShortName_InterfaceLanguage(InterfaceLanguage? lang, string? expected)
+        {
+            string? actual = lang.ShortName();
+            Assert.Equal(expected, actual);
+        }
+
         [Theory]
         [InlineData(null, "Unknown")]
         [InlineData(InternalProgram.NONE, "Unknown")]
@@ -77,6 +183,28 @@ namespace MPF.Frontend.Test
 
         #region From String
 
+        [Theory]
+        [InlineData(null, InterfaceLanguage.AutoDetect)]
+        [InlineData("", InterfaceLanguage.AutoDetect)]
+        [InlineData("auto", InterfaceLanguage.AutoDetect)]
+        [InlineData("eng", InterfaceLanguage.English)]
+        [InlineData("fra", InterfaceLanguage.French)]
+        [InlineData("deu", InterfaceLanguage.German)]
+        [InlineData("ita", InterfaceLanguage.Italian)]
+        [InlineData("jpn", InterfaceLanguage.Japanese)]
+        [InlineData("kor", InterfaceLanguage.Korean)]
+        [InlineData("pol", InterfaceLanguage.Polish)]
+        [InlineData("rus", InterfaceLanguage.Russian)]
+        [InlineData("spa", InterfaceLanguage.Spanish)]
+        [InlineData("swe", InterfaceLanguage.Swedish)]
+        [InlineData("ukr", InterfaceLanguage.Ukrainian)]
+        [InlineData("l37", InterfaceLanguage.L337)]
+        public void ToInterfaceLanguageTest(string? interfaceLanguage, InterfaceLanguage expected)
+        {
+            InterfaceLanguage actual = interfaceLanguage.ToInterfaceLanguage();
+            Assert.Equal(expected, actual);
+        }
+
         [Theory]
         [InlineData(null, InternalProgram.NONE)]
         [InlineData("", InternalProgram.NONE)]
@@ -107,6 +235,7 @@ namespace MPF.Frontend.Test
         private static readonly RedumpSystem?[] _copyProtectionSystems =
         [
             RedumpSystem.AppleMacintosh,
+            RedumpSystem.DVDVideo,
             RedumpSystem.EnhancedCD ,
             RedumpSystem.IBMPCcompatible,
             RedumpSystem.PalmOS,
@@ -134,7 +263,7 @@ namespace MPF.Frontend.Test
         public static List<object?[]> GenerateSupportsAntiModchipScansData()
         {
             var testData = new List<object?[]>() { new object?[] { null, false } };
-            foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
+            foreach (RedumpSystem redumpSystem in Enum.GetValues<RedumpSystem>())
             {
                 if (_antiModchipSystems.Contains(redumpSystem))
                     testData.Add([redumpSystem, true]);
@@ -148,7 +277,7 @@ namespace MPF.Frontend.Test
         public static List<object?[]> GenerateSupportsCopyProtectionScansData()
         {
             var testData = new List<object?[]>() { new object?[] { null, false } };
-            foreach (RedumpSystem redumpSystem in Enum.GetValues(typeof(RedumpSystem)))
+            foreach (RedumpSystem redumpSystem in Enum.GetValues<RedumpSystem>())
             {
                 if (_copyProtectionSystems.Contains(redumpSystem))
                     testData.Add([redumpSystem, true]);
@@ -161,4 +290,4 @@ namespace MPF.Frontend.Test
 
         #endregion
     }
-}
+}

MPF.Frontend.Test/InterfaceConstantsTests.cs

@@ -13,12 +13,12 @@ namespace MPF.Frontend.Test
         [InlineData(MediaType.HDDVD, 24)]
         [InlineData(MediaType.BluRay, 16)]
         [InlineData(MediaType.NintendoWiiUOpticalDisc, 16)]
-        [InlineData(MediaType.LaserDisc, 1)]
-        [InlineData(null, 1)]
+        [InlineData(MediaType.LaserDisc, 72)]
+        [InlineData(null, 72)]
         public void GetAllowedDriveSpeedForMediaTypeTest(MediaType? mediaType, int maxExpected)
         {
             var actual = InterfaceConstants.GetSpeedsForMediaType(mediaType);
-            Assert.Equal(maxExpected, actual[actual.Count - 1]);
+            Assert.Equal(maxExpected, actual[^1]);
         }
     }
 }

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -14,13 +14,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <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.6" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.25.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" />
@@ -29,7 +29,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.Frontend.Test/OptionsTests.cs

@@ -44,4 +44,4 @@ namespace MPF.Frontend.Test
             Assert.Equal(expectedValue, actual);
         }
     }
-}
+}

MPF.Frontend.Test/Tools/FrontendToolTests.cs

@@ -21,7 +21,7 @@ namespace MPF.Frontend.Test.Tools
         [InlineData(MediaType.NintendoWiiUOpticalDisc, 16)]
         public void GetDefaultSpeedForMediaTypeTest(MediaType? mediaType, int expected)
         {
-            Options options = new Options
+            var options = new Options
             {
                 PreferredDumpSpeedCD = 72,
                 PreferredDumpSpeedDVD = 24,
@@ -81,6 +81,8 @@ namespace MPF.Frontend.Test.Tools
         [InlineData("1.2.3.4..bin", true, "1.2.3.4..bin")]
         [InlineData("dir/filename.bin", false, "dir/filename.bin")]
         [InlineData("dir/filename.bin", true, "dir/filename.bin")]
+        [InlineData(" dir / filename.bin", false, "dir/filename.bin")]
+        [InlineData(" dir / filename.bin", true, "dir/filename.bin")]
         [InlineData("\0dir/\0filename.bin", false, "_dir/_filename.bin")]
         [InlineData("\0dir/\0filename.bin", true, "_dir/_filename.bin")]
         public void NormalizeOutputPathsTest(string? path, bool getFullPath, string expected)
@@ -95,4 +97,4 @@ namespace MPF.Frontend.Test.Tools
 
         #endregion
     }
-}
+}

MPF.Frontend.Test/Tools/InfoToolTests.cs

@@ -1,34 +1,15 @@
 using System.Collections.Generic;
-using System.IO;
-using MPF.Frontend.Tools;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Data.Sections;
 using Xunit;
 
 namespace MPF.Frontend.Test.Tools
 {
     public class InfoToolTests
     {
-        [Theory]
-        [InlineData(null, "")]
-        [InlineData(" ", " ")]
-        [InlineData("super\\blah.bin", "super\\blah.bin")]
-        [InlineData("super\\hero\\blah.bin", "super\\hero\\blah.bin")]
-        [InlineData("super.hero\\blah.bin", "super.hero\\blah.bin")]
-        [InlineData("superhero\\blah.rev.bin", "superhero\\blah.rev.bin")]
-        [InlineData("super&hero\\blah.bin", "super&hero\\blah.bin")]
-        [InlineData("superhero\\blah&foo.bin", "superhero\\blah&foo.bin")]
-        public void NormalizeOutputPathsTest(string? outputPath, string? expectedPath)
-        {
-            if (!string.IsNullOrEmpty(expectedPath))
-                expectedPath = Path.GetFullPath(expectedPath);
-
-            string actualPath = FrontendTool.NormalizeOutputPaths(outputPath, true);
-            Assert.Equal(expectedPath, actualPath);
-        }
-
         [Fact]
-        public void ProcessSpecialFieldsCompleteTest()
+        public void ProcessSpecialFields_Complete()
         {
             // Create a new SubmissionInfo object
             var info = new SubmissionInfo()
@@ -54,9 +35,9 @@ namespace MPF.Frontend.Test.Tools
 
             // Validate the basics
             Assert.NotNull(info.CommonDiscInfo.Comments);
-            Assert.Null(info.CommonDiscInfo.CommentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.CommentsSpecialFields);
             Assert.NotNull(info.CommonDiscInfo.Contents);
-            Assert.Null(info.CommonDiscInfo.ContentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.ContentsSpecialFields);
 
             // Split the values
             string[] splitComments = info.CommonDiscInfo.Comments.Split('\n');
@@ -68,23 +49,7 @@ namespace MPF.Frontend.Test.Tools
         }
 
         [Fact]
-        public void ProcessSpecialFieldsNullObjectTest()
-        {
-            // Create a new SubmissionInfo object
-            var info = new SubmissionInfo()
-            {
-                CommonDiscInfo = null,
-            };
-
-            // Process the special fields
-            Formatter.ProcessSpecialFields(info);
-
-            // Validate
-            Assert.Null(info.CommonDiscInfo);
-        }
-
-        [Fact]
-        public void ProcessSpecialFieldsNullCommentsContentsTest()
+        public void ProcessSpecialFields_NullStrings()
         {
             // Create a new SubmissionInfo object
             var info = new SubmissionInfo()
@@ -110,9 +75,9 @@ namespace MPF.Frontend.Test.Tools
 
             // Validate the basics
             Assert.NotNull(info.CommonDiscInfo.Comments);
-            Assert.Null(info.CommonDiscInfo.CommentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.CommentsSpecialFields);
             Assert.NotNull(info.CommonDiscInfo.Contents);
-            Assert.Null(info.CommonDiscInfo.ContentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.ContentsSpecialFields);
 
             // Split the values
             string[] splitComments = info.CommonDiscInfo.Comments.Split('\n');
@@ -124,7 +89,7 @@ namespace MPF.Frontend.Test.Tools
         }
 
         [Fact]
-        public void ProcessSpecialFieldsNullDictionariesTest()
+        public void ProcessSpecialFields_EmptyDictionaries()
         {
             // Create a new SubmissionInfo object
             var info = new SubmissionInfo()
@@ -132,10 +97,10 @@ namespace MPF.Frontend.Test.Tools
                 CommonDiscInfo = new CommonDiscInfoSection()
                 {
                     Comments = "This is a comments line\n[T:ISBN] ISBN Value",
-                    CommentsSpecialFields = null,
+                    CommentsSpecialFields = [],
 
                     Contents = "This is a contents line\n[T:GF] Game Footage",
-                    ContentsSpecialFields = null,
+                    ContentsSpecialFields = [],
                 }
             };
 
@@ -144,9 +109,9 @@ namespace MPF.Frontend.Test.Tools
 
             // Validate the basics
             Assert.NotNull(info.CommonDiscInfo.Comments);
-            Assert.Null(info.CommonDiscInfo.CommentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.CommentsSpecialFields);
             Assert.NotNull(info.CommonDiscInfo.Contents);
-            Assert.Null(info.CommonDiscInfo.ContentsSpecialFields);
+            Assert.Empty(info.CommonDiscInfo.ContentsSpecialFields);
 
             // Split the values
             string[] splitComments = info.CommonDiscInfo.Comments.Split('\n');

MPF.Frontend.Test/Tools/ProtectionToolTests.cs

@@ -8,12 +8,114 @@ namespace MPF.Frontend.Test.Tools
 {
     public class ProtectionToolTests
     {
+        #region SanitizeContextSensitiveProtections
+
+        [Fact]
+        public void SanitizeContextSensitiveProtections_Empty_NoException()
+        {
+            Dictionary<string, List<string>>? protections = [];
+            var actual = ProtectionTool.SanitizeContextSensitiveProtections(protections);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void SanitizeContextSensitiveProtections_NoMatch_NoChange()
+        {
+            Dictionary<string, List<string>>? protections = [];
+            protections["File1"] = ["Protection 1", "Protection 2"];
+
+            var actual = ProtectionTool.SanitizeContextSensitiveProtections(protections);
+            Assert.NotNull(actual);
+
+            string[] keys = [.. actual.Keys];
+            Assert.Contains("File1", keys);
+        }
+
+        [Fact]
+        public void SanitizeContextSensitiveProtections_Match_NoSub_NoChange()
+        {
+            Dictionary<string, List<string>>? protections = [];
+            protections["File1"] = ["Protection 1", "Protection 2"];
+            protections["File2"] = ["SecuROM Release Control - ANYTHING", "Protection 2"];
+            protections["File3"] = ["Protection 1", "SecuROM Release Control -"];
+
+            var actual = ProtectionTool.SanitizeContextSensitiveProtections(protections);
+            Assert.NotNull(actual);
+
+            string[] keys = [.. actual.Keys];
+            Assert.Contains("File1", keys);
+            Assert.Contains("File2", keys);
+            Assert.Contains("File3", keys);
+        }
+
+        [Fact]
+        public void SanitizeContextSensitiveProtections_Match_Sub_Change()
+        {
+            Dictionary<string, List<string>>? protections = [];
+            protections["File1"] = ["Protection 1", "Protection 2"];
+            protections["File2"] = ["SecuROM Release Control - ANYTHING"];
+            protections["File2/FileA"] = ["ANYTHING GitHub ANYTHING"];
+            protections["File2/FileB"] = ["SecuROM 7"];
+            protections["File2/FileC"] = ["SecuROM 8"];
+            protections["File2/FileD"] = ["SecuROM Content Activation"];
+            protections["File2/FileE"] = ["SecuROM Data File Activation"];
+            protections["File2/FileF"] = ["Unlock"];
+
+            var actual = ProtectionTool.SanitizeContextSensitiveProtections(protections);
+            Assert.NotNull(actual);
+
+            string[] keys = [.. actual.Keys];
+            Assert.Contains("File1", keys);
+            Assert.Contains("File2", keys);
+            Assert.Contains("File2/FileA", keys);
+            Assert.DoesNotContain("File2/FileB", keys);
+            Assert.DoesNotContain("File2/FileC", keys);
+            Assert.DoesNotContain("File2/FileD", keys);
+            Assert.DoesNotContain("File2/FileE", keys);
+            Assert.DoesNotContain("File2/FileF", keys);
+        }
+
+        [Fact]
+        public void SanitizeContextSensitiveProtections_MultiMatch_Sub_Change()
+        {
+            Dictionary<string, List<string>>? protections = [];
+            protections["File1"] = ["Protection 1", "Protection 2"];
+            protections["File2"] = ["SecuROM Release Control - ANYTHING"];
+            protections["File2/FileA"] = ["ANYTHING GitHub ANYTHING"];
+            protections["File2/FileB"] = ["SecuROM 7"];
+            protections["File2/FileC"] = ["SecuROM 8"];
+            protections["File3"] = ["SecuROM Release Control - ANYTHING"];
+            protections["File3/FileD"] = ["SecuROM Content Activation"];
+            protections["File3/FileE"] = ["SecuROM Data File Activation"];
+            protections["File3/FileF"] = ["Unlock"];
+
+            var actual = ProtectionTool.SanitizeContextSensitiveProtections(protections);
+            Assert.NotNull(actual);
+
+            string[] keys = [.. actual.Keys];
+            Assert.Contains("File1", keys);
+            Assert.Contains("File2", keys);
+            Assert.Contains("File2/FileA", keys);
+            Assert.DoesNotContain("File2/FileB", keys);
+            Assert.DoesNotContain("File2/FileC", keys);
+            Assert.Contains("File3", keys);
+            Assert.DoesNotContain("File3/FileD", keys);
+            Assert.DoesNotContain("File3/FileE", keys);
+            Assert.DoesNotContain("File3/FileF", keys);
+        }
+
+        #endregion
+
+        #region SanitizeFoundProtections
+
         [Fact]
         public void SanitizeFoundProtections_Exception()
         {
             List<string> protections =
             [
                 "Anything Else Protection",
+                "[Access issue when opening file",
                 "[Exception opening file",
             ];
 
@@ -559,7 +661,7 @@ namespace MPF.Frontend.Test.Tools
                 throw new ArgumentException("Invalid skip value", nameof(skip));
 
             // The list is in order of preference
-            protections = protections.Skip(skip).ToList();
+            protections = [.. protections.Skip(skip)];
 
             string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
             Assert.Equal(protections[0], sanitized);
@@ -581,9 +683,9 @@ namespace MPF.Frontend.Test.Tools
         [Theory]
         [InlineData(0, "Macrovision Protected Application [SafeDisc 0.00.000], SafeDisc 0.00.000, SafeDisc Lite")]
         [InlineData(1, "Macrovision Protected Application [SafeDisc 0.00.000 / SRV Tool APP], SafeDisc 0.00.000, SafeDisc Lite")]
-        [InlineData(2, "Macrovision Security Driver, Macrovision Security Driver [SafeDisc 1.11.111], SafeDisc 0.00.000, SafeDisc 0.00.000-1.11.111, SafeDisc Lite")]
-        [InlineData(3, "Macrovision Security Driver, Macrovision Security Driver [SafeDisc 1.11.111], SafeDisc 0.00.000, SafeDisc Lite")]
-        [InlineData(4, "Macrovision Security Driver, Macrovision Security Driver [SafeDisc 1.11.111], SafeDisc Lite")]
+        [InlineData(2, "SafeDisc 0.00.000, SafeDisc 0.00.000-1.11.111, SafeDisc 3+ (DVD), SafeDisc Lite")]
+        [InlineData(3, "SafeDisc 0.00.000, SafeDisc 3+ (DVD), SafeDisc Lite")]
+        [InlineData(4, "SafeDisc 3+ (DVD), SafeDisc Lite")]
         [InlineData(5, "Macrovision Security Driver, SafeDisc Lite")]
         [InlineData(6, "Macrovision Protection File, SafeDisc 2+, SafeDisc 3+ (DVD), SafeDisc Lite")]
         [InlineData(7, "SafeDisc 3+ (DVD)")]
@@ -592,11 +694,11 @@ namespace MPF.Frontend.Test.Tools
         {
             List<string> protections =
            [
-               "Macrovision Protected Application [SafeDisc 0.00.000]",
+                "Macrovision Protected Application [SafeDisc 0.00.000]",
                 "Macrovision Protected Application [SafeDisc 0.00.000 / SRV Tool APP]",
                 "SafeDisc 0.00.000-1.11.111",
                 "SafeDisc 0.00.000",
-                "Macrovision Security Driver [SafeDisc 1.11.111]",
+                "Macrovision Security Driver 1.11.111 / SafeDisc 1.11.111",
                 "Macrovision Security Driver",
                 "SafeDisc Lite",
                 "SafeDisc 3+ (DVD)",
@@ -609,12 +711,44 @@ namespace MPF.Frontend.Test.Tools
                 throw new ArgumentException("Invalid skip value", nameof(skip));
 
             // The list is in order of preference
-            protections = protections.Skip(skip).ToList();
+            protections = [.. protections.Skip(skip)];
 
             string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
             Assert.Equal(expected, sanitized);
         }
 
+        [Fact]
+        public void SanitizeFoundProtectsion_SafeDisc_MacrovisionSecurityDriver()
+        {
+            List<string> protections =
+           [
+                "Macrovision Protection File [Likely indicates either SafeDisc 1.45.011+ (CD) or CDS-300]",
+                "Macrovision Security Driver 4.00.060 / SafeDisc 4.00.000-4.70.000",
+                "SafeDisc 4.00.000-4.00.003",
+                "SafeDisc 4.00.002, Macrovision Protected Application"
+            ];
+
+            string expected = "SafeDisc 4.00.002";
+
+            string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
+            Assert.Equal(expected, sanitized);
+        }
+
+        [Fact]
+        public void SanitizeFoundProtections_SecuROM()
+        {
+            List<string> protections =
+            [
+                "SecuROM Release Control",
+                "SecuROM Release Control - ANYTHING",
+                "SecuROM Release Control - ANYTHING ELSE",
+                "SecuROM Release Control - EVEN MORE",
+            ];
+
+            string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
+            Assert.Equal("SecuROM Release Control", sanitized);
+        }
+
         [Theory]
         [InlineData(0)]
         [InlineData(1)]
@@ -636,12 +770,27 @@ namespace MPF.Frontend.Test.Tools
                 throw new ArgumentException("Invalid skip value", nameof(skip));
 
             // The list is in order of preference
-            protections = protections.Skip(skip).ToList();
+            protections = [.. protections.Skip(skip)];
 
             string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
             Assert.Equal(protections[0], sanitized);
         }
 
+        [Fact]
+        public void SanitizeFoundProtections_StarForce_Keyless()
+        {
+            List<string> protections =
+            [
+                "StarForce Keyless",
+                "StarForce Keyless - ",
+                "StarForce Keyless - ESPY97LS8FHNYR52JDWL8D6FJ",
+                "StarForce Keyless - UAYA-RPMVHJ-ZRY45G-ETUJ36-WL922B",
+            ];
+
+            string sanitized = ProtectionTool.SanitizeFoundProtections(protections);
+            Assert.Equal("StarForce Keyless", sanitized);
+        }
+
         [Fact]
         public void SanitizeFoundProtections_Sysiphus()
         {
@@ -669,5 +818,7 @@ namespace MPF.Frontend.Test.Tools
         }
 
         #endregion
+
+        #endregion
     }
 }

MPF.Frontend/ComboBoxItems/Element.cs

@@ -6,18 +6,18 @@ namespace MPF.Frontend.ComboBoxItems
     /// <summary>
     /// A generic combo box element
     /// </summary>
-    /// <typeparam name="T">Enum type representing the possible values</typeparam>
-    public class Element<T> : IEquatable<Element<T>>, IElement where T : struct, Enum
+    /// <typeparam name="TEnum">Enum type representing the possible values</typeparam>
+    public class Element<TEnum> : IEquatable<Element<TEnum>>, IElement where TEnum : struct, Enum
     {
-        private readonly T Data;
+        private readonly TEnum Data;
 
-        public Element(T data) => Data = data;
+        public Element(TEnum data) => Data = data;
 
         /// <summary>
         /// Allow elements to be used as their internal enum type
         /// </summary>
         /// <param name="item"></param>
-        public static implicit operator T? (Element<T> item) => item?.Data;
+        public static implicit operator TEnum?(Element<TEnum> item) => item?.Data;
 
         /// <inheritdoc/>
         public string Name => EnumExtensions.GetLongName(Data);
@@ -27,7 +27,7 @@ namespace MPF.Frontend.ComboBoxItems
         /// <summary>
         /// Internal enum value
         /// </summary>
-        public T Value => Data;
+        public TEnum Value => Data;
 
         /// <summary>
         /// Determine if the item is selected or not
@@ -39,20 +39,20 @@ namespace MPF.Frontend.ComboBoxItems
         /// Generate all elements associated with the data enum type
         /// </summary>
         /// <returns></returns>
-        public static List<Element<T>> GenerateElements()
+        public static List<Element<TEnum>> GenerateElements()
         {
-            var enumArr = (T[])Enum.GetValues(typeof(T));
-            return [.. Array.ConvertAll(enumArr, e => new Element<T>(e))];
+            var enumArr = (TEnum[])Enum.GetValues(typeof(TEnum));
+            return [.. Array.ConvertAll(enumArr, e => new Element<TEnum>(e))];
         }
 
         /// <inheritdoc/>
         public override bool Equals(object? obj)
         {
-            return Equals(obj as Element<T>);
+            return Equals(obj as Element<TEnum>);
         }
 
         /// <inheritdoc/>
-        public bool Equals(Element<T>? other)
+        public bool Equals(Element<TEnum>? other)
         {
             if (other == null)
                 return false;

MPF.Frontend/ComboBoxItems/RedumpSystemComboBoxItem.cs

@@ -84,7 +84,7 @@ namespace MPF.Frontend.ComboBoxItems
 
             var systemsValues = new List<RedumpSystemComboBoxItem>
             {
-                new RedumpSystemComboBoxItem((RedumpSystem?)null),
+                new((RedumpSystem?)null),
             };
 
             foreach (var group in mapping)

MPF.Frontend/Drive.cs

@@ -86,7 +86,11 @@ namespace MPF.Frontend
 
             // Sanitize a Windows-formatted long device path
             if (devicePath.StartsWith("\\\\.\\"))
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                devicePath = devicePath["\\\\.\\".Length..];
+#else
                 devicePath = devicePath.Substring("\\\\.\\".Length);
+#endif
 
             // Create and validate the drive info object
             var driveInfo = new DriveInfo(devicePath);

MPF.Frontend/DumpEnvironment.cs

@@ -61,11 +61,6 @@ namespace MPF.Frontend
         /// </summary>
         private readonly RedumpSystem? _system;
 
-        /// <summary>
-        /// Currently selected media type
-        /// </summary>
-        private readonly MediaType? _type;
-
         #endregion
 
         #region Passthrough Fields
@@ -86,11 +81,7 @@ namespace MPF.Frontend
         public int? Speed
         {
             get => _executionContext?.Speed;
-            set
-            {
-                if (_executionContext != null)
-                    _executionContext.Speed = value;
-            }
+            set => _executionContext?.Speed = value;
         }
 
         /// <inheritdoc cref="Extensions.LongName(RedumpSystem?)/>
@@ -114,16 +105,12 @@ namespace MPF.Frontend
         /// <param name="outputPath"></param>
         /// <param name="drive"></param>
         /// <param name="system"></param>
-        /// <param name="type"></param>
         /// <param name="internalProgram"></param>
-        /// <param name="parameters"></param>
         public DumpEnvironment(Options options,
             string? outputPath,
             Drive? drive,
             RedumpSystem? system,
-            MediaType? type,
-            InternalProgram? internalProgram,
-            string? parameters)
+            InternalProgram? internalProgram)
         {
             // Set options object
             _options = options;
@@ -134,12 +121,7 @@ namespace MPF.Frontend
             // UI information
             _drive = drive;
             _system = system ?? options.DefaultSystem;
-            _type = type ?? MediaType.NONE;
             _internalProgram = internalProgram ?? options.InternalProgram;
-
-            // Dumping program
-            SetExecutionContext(parameters);
-            SetProcessor();
         }
 
         #region Internal Program Management
@@ -147,28 +129,28 @@ namespace MPF.Frontend
         /// <summary>
         /// Check output path for matching logs from all dumping programs
         /// </summary>
-        public InternalProgram? CheckForMatchingProgram(string? outputDirectory, string outputFilename)
+        public InternalProgram? CheckForMatchingProgram(MediaType? mediaType, string? outputDirectory, string outputFilename)
         {
             // If a complete dump exists from a different program
             InternalProgram? programFound = null;
             if (programFound == null && _internalProgram != InternalProgram.Redumper)
             {
-                var processor = new Processors.Redumper(_system, _type);
-                var missingFiles = processor.FoundAllFiles(outputDirectory, outputFilename);
+                var processor = new Processors.Redumper(_system);
+                var missingFiles = processor.FoundAllFiles(mediaType, outputDirectory, outputFilename);
                 if (missingFiles.Count == 0)
                     programFound = InternalProgram.Redumper;
             }
             if (programFound == null && _internalProgram != InternalProgram.DiscImageCreator)
             {
-                var processor = new Processors.DiscImageCreator(_system, _type);
-                var missingFiles = processor.FoundAllFiles(outputDirectory, outputFilename);
+                var processor = new Processors.DiscImageCreator(_system);
+                var missingFiles = processor.FoundAllFiles(mediaType, outputDirectory, outputFilename);
                 if (missingFiles.Count == 0)
                     programFound = InternalProgram.DiscImageCreator;
             }
             if (programFound == null && _internalProgram != InternalProgram.Aaru)
             {
-                var processor = new Processors.Aaru(_system, _type);
-                var missingFiles = processor.FoundAllFiles(outputDirectory, outputFilename);
+                var processor = new Processors.Aaru(_system);
+                var missingFiles = processor.FoundAllFiles(mediaType, outputDirectory, outputFilename);
                 if (missingFiles.Count == 0)
                     programFound = InternalProgram.Aaru;
             }
@@ -179,26 +161,26 @@ namespace MPF.Frontend
         /// <summary>
         /// Check output path for partial logs from all dumping programs
         /// </summary>
-        public InternalProgram? CheckForPartialProgram(string? outputDirectory, string outputFilename)
+        public InternalProgram? CheckForPartialProgram(MediaType? mediaType, string? outputDirectory, string outputFilename)
         {
             // If a complete dump exists from a different program
             InternalProgram? programFound = null;
             if (programFound == null && _internalProgram != InternalProgram.Redumper)
             {
-                var processor = new Processors.Redumper(_system, _type);
-                if (processor.FoundAnyFiles(outputDirectory, outputFilename))
+                var processor = new Processors.Redumper(_system);
+                if (processor.FoundAnyFiles(mediaType, outputDirectory, outputFilename))
                     programFound = InternalProgram.Redumper;
             }
             if (programFound == null && _internalProgram != InternalProgram.DiscImageCreator)
             {
-                var processor = new Processors.DiscImageCreator(_system, _type);
-                if (processor.FoundAnyFiles(outputDirectory, outputFilename))
+                var processor = new Processors.DiscImageCreator(_system);
+                if (processor.FoundAnyFiles(mediaType, outputDirectory, outputFilename))
                     programFound = InternalProgram.DiscImageCreator;
             }
             if (programFound == null && _internalProgram != InternalProgram.Aaru)
             {
-                var processor = new Processors.Aaru(_system, _type);
-                if (processor.FoundAnyFiles(outputDirectory, outputFilename))
+                var processor = new Processors.Aaru(_system);
+                if (processor.FoundAnyFiles(mediaType, outputDirectory, outputFilename))
                     programFound = InternalProgram.Aaru;
             }
 
@@ -208,8 +190,9 @@ namespace MPF.Frontend
         /// <summary>
         /// Set the parameters object based on the internal program and parameters string
         /// </summary>
+        /// <param name="mediaType">MediaType for specialized dumping parameters</param>
         /// <param name="parameters">String representation of the parameters</param>
-        public bool SetExecutionContext(string? parameters)
+        public bool SetExecutionContext(MediaType? mediaType, string? parameters)
         {
             _executionContext = _internalProgram switch
             {
@@ -226,7 +209,7 @@ namespace MPF.Frontend
             if (_executionContext != null)
             {
                 _executionContext.RedumpSystem = _system;
-                _executionContext.MediaType = _type;
+                _executionContext.MediaType = mediaType;
 
                 // Set some parameters, if not already set
                 OutputPath ??= _executionContext.OutputPath!;
@@ -243,13 +226,13 @@ namespace MPF.Frontend
         {
             _processor = _internalProgram switch
             {
-                InternalProgram.Aaru => new Processors.Aaru(_system, _type),
-                InternalProgram.CleanRip => new CleanRip(_system, _type),
-                InternalProgram.DiscImageCreator => new DiscImageCreator(_system, _type),
-                InternalProgram.PS3CFW => new PS3CFW(_system, _type),
-                InternalProgram.Redumper => new Redumper(_system, _type),
-                InternalProgram.UmdImageCreator => new UmdImageCreator(_system, _type),
-                InternalProgram.XboxBackupCreator => new XboxBackupCreator(_system, _type),
+                InternalProgram.Aaru => new Processors.Aaru(_system),
+                InternalProgram.CleanRip => new CleanRip(_system),
+                InternalProgram.DiscImageCreator => new DiscImageCreator(_system),
+                InternalProgram.PS3CFW => new PS3CFW(_system),
+                InternalProgram.Redumper => new Redumper(_system),
+                InternalProgram.UmdImageCreator => new UmdImageCreator(_system),
+                InternalProgram.XboxBackupCreator => new XboxBackupCreator(_system),
 
                 // If no dumping program found, set to null
                 InternalProgram.NONE => null,
@@ -262,12 +245,13 @@ namespace MPF.Frontend
         /// <summary>
         /// Get the full parameter string for either DiscImageCreator or Aaru
         /// </summary>
+        /// <param name="mediaType">MediaType for specialized dumping parameters</param>
         /// <param name="driveSpeed">Nullable int representing the drive speed</param>
         /// <returns>String representing the params, null on error</returns>
-        public string? GetFullParameters(int? driveSpeed)
+        public string? GetFullParameters(MediaType? mediaType, int? driveSpeed)
         {
             // Populate with the correct params for inputs (if we're not on the default option)
-            if (_system != null && _type != MediaType.NONE)
+            if (_system != null && mediaType != MediaType.NONE)
             {
                 // If drive letter is invalid, skip this
                 if (_drive == null)
@@ -276,9 +260,9 @@ namespace MPF.Frontend
                 // Set the proper parameters
                 _executionContext = _internalProgram switch
                 {
-                    InternalProgram.Aaru => new ExecutionContexts.Aaru.ExecutionContext(_system, _type, _drive.Name, OutputPath, driveSpeed, _options.Settings),
-                    InternalProgram.DiscImageCreator => new ExecutionContexts.DiscImageCreator.ExecutionContext(_system, _type, _drive.Name, OutputPath, driveSpeed, _options.Settings),
-                    InternalProgram.Redumper => new ExecutionContexts.Redumper.ExecutionContext(_system, _type, _drive.Name, OutputPath, driveSpeed, _options.Settings),
+                    InternalProgram.Aaru => new ExecutionContexts.Aaru.ExecutionContext(_system, mediaType, _drive.Name, OutputPath, driveSpeed, _options.Settings),
+                    InternalProgram.DiscImageCreator => new ExecutionContexts.DiscImageCreator.ExecutionContext(_system, mediaType, _drive.Name, OutputPath, driveSpeed, _options.Settings),
+                    InternalProgram.Redumper => new ExecutionContexts.Redumper.ExecutionContext(_system, mediaType, _drive.Name, OutputPath, driveSpeed, _options.Settings),
 
                     // If no dumping program found, set to null
                     InternalProgram.NONE => null,
@@ -304,9 +288,9 @@ namespace MPF.Frontend
         /// </summary>
         /// <param name="type">MediaType value to check</param>
         /// <returns>True if the media has variable dumping speeds, false otherwise</returns>
-        public bool DoesSupportDriveSpeed()
+        public static bool DoesSupportDriveSpeed(MediaType? mediaType)
         {
-            return _type switch
+            return mediaType switch
             {
                 MediaType.CDROM
                     or MediaType.DVD
@@ -320,22 +304,22 @@ namespace MPF.Frontend
             };
         }
 
-        /// <inheritdoc cref="BaseProcessor.FoundAllFiles(string?, string)"/>
-        public bool FoundAllFiles(string? outputDirectory, string outputFilename)
+        /// <inheritdoc cref="BaseProcessor.FoundAllFiles(MediaType?, string?, string)"/>
+        public bool FoundAllFiles(MediaType? mediaType, string? outputDirectory, string outputFilename)
         {
             if (_processor == null)
                 return false;
 
-            return _processor.FoundAllFiles(outputDirectory, outputFilename).Count == 0;
+            return _processor.FoundAllFiles(mediaType, outputDirectory, outputFilename).Count == 0;
         }
 
-        /// <inheritdoc cref="BaseProcessor.FoundAnyFiles(string?, string)"/>
-        public bool FoundAnyFiles(string? outputDirectory, string outputFilename)
+        /// <inheritdoc cref="BaseProcessor.FoundAnyFiles(MediaType?, string?, string)"/>
+        public bool FoundAnyFiles(MediaType? mediaType, string? outputDirectory, string outputFilename)
         {
             if (_processor == null)
                 return false;
 
-            return _processor.FoundAnyFiles(outputDirectory, outputFilename);
+            return _processor.FoundAnyFiles(mediaType, outputDirectory, outputFilename);
         }
 
         /// <inheritdoc cref="BaseExecutionContext.GetDefaultExtension(MediaType?)"/>
@@ -359,15 +343,18 @@ namespace MPF.Frontend
         /// <summary>
         /// Verify that, given a system and a media type, they are correct
         /// </summary>
-        public ResultEventArgs GetSupportStatus()
+        public ResultEventArgs GetSupportStatus(MediaType? mediaType)
         {
             // No system chosen, update status
             if (_system == null)
                 return ResultEventArgs.Failure("Please select a valid system");
 
             // If we're on an unsupported type, update the status accordingly
-            return _type switch
+            return mediaType switch
             {
+                // Null means it will be handled by the program
+                null => ResultEventArgs.Success("Ready to dump"),
+
                 // Fully supported types
                 MediaType.BluRay
                     or MediaType.CDROM
@@ -377,22 +364,22 @@ namespace MPF.Frontend
                     or MediaType.CompactFlash
                     or MediaType.SDCard
                     or MediaType.FlashDrive
-                    or MediaType.HDDVD => ResultEventArgs.Success($"{_type.LongName()} ready to dump"),
+                    or MediaType.HDDVD => ResultEventArgs.Success($"{mediaType.LongName()} ready to dump"),
 
                 // Partially supported types
                 MediaType.GDROM
                     or MediaType.NintendoGameCubeGameDisc
                     or MediaType.NintendoWiiOpticalDisc
-                    or MediaType.NintendoWiiUOpticalDisc => ResultEventArgs.Success($"{_type.LongName()} partially supported for dumping"),
+                    or MediaType.NintendoWiiUOpticalDisc => ResultEventArgs.Success($"{mediaType.LongName()} partially supported for dumping"),
 
                 // Special case for other supported tools
-                MediaType.UMD => ResultEventArgs.Failure($"{_type.LongName()} supported for submission info parsing"),
+                MediaType.UMD => ResultEventArgs.Failure($"{mediaType.LongName()} supported for submission info parsing"),
 
                 // Specifically unknown type
-                MediaType.NONE => ResultEventArgs.Failure($"Please select a valid media type"),
+                MediaType.NONE => ResultEventArgs.Failure("Please select a valid media type"),
 
                 // Undumpable but recognized types
-                _ => ResultEventArgs.Failure($"{_type.LongName()} media are not supported for dumping"),
+                _ => ResultEventArgs.Failure($"{mediaType.LongName()} media are not supported for dumping"),
             };
         }
 
@@ -420,8 +407,9 @@ namespace MPF.Frontend
         /// <summary>
         /// Execute the initial invocation of the dumping programs
         /// </summary>
+        /// <param name="mediaType">MediaType for specialized dumping parameters</param>
         /// <param name="progress">Optional result progress callback</param>
-        public async Task<ResultEventArgs> Run(IProgress<ResultEventArgs>? progress = null)
+        public async Task<ResultEventArgs> Run(MediaType? mediaType, IProgress<ResultEventArgs>? progress = null)
         {
             // If we don't have parameters
             if (_executionContext == null)
@@ -436,7 +424,7 @@ namespace MPF.Frontend
             }
 
             // Check that we have the basics for dumping
-            ResultEventArgs result = IsValidForDump();
+            ResultEventArgs result = IsValidForDump(mediaType);
             if (!result)
                 return result;
 
@@ -494,26 +482,37 @@ namespace MPF.Frontend
             var outputDirectory = Path.GetDirectoryName(OutputPath);
             var outputFilename = Path.GetFileName(OutputPath);
 
-            // Check to make sure that the output had all the correct files
-            List<string> missingFiles = _processor.FoundAllFiles(outputDirectory, outputFilename);
-            if (missingFiles.Count > 0)
+            // If a standard log zip was provided, replace the suffix with ".tmp" for easier processing
+            if (outputFilename.EndsWith("_logs.zip", StringComparison.OrdinalIgnoreCase))
             {
-                resultProgress.Report(ResultEventArgs.Failure($"There were files missing from the output:\n{string.Join("\n", [.. missingFiles])}"));
-                return ResultEventArgs.Failure("Error! Please check output directory as dump may be incomplete!");
+                int zipSuffixIndex = outputFilename.LastIndexOf("_logs.zip", StringComparison.OrdinalIgnoreCase);
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                outputFilename = outputFilename[..zipSuffixIndex] + ".tmp";
+#else
+                outputFilename = outputFilename.Substring(0, zipSuffixIndex) + ".tmp";
+#endif
             }
 
+            // Determine the media type from the processor
+            MediaType? mediaType = _processor.DetermineMediaType(outputDirectory, outputFilename);
+            if (mediaType == null)
+                return ResultEventArgs.Failure("Could not determine the media type from output files...");
+
             // Extract the information from the output files
             resultProgress.Report(ResultEventArgs.Success("Extracting output information from output files..."));
             var submissionInfo = await SubmissionGenerator.ExtractOutputInformation(
                 OutputPath,
                 _drive,
                 _system,
-                _type,
+                mediaType,
                 _options,
                 _processor,
                 resultProgress,
                 protectionProgress);
-            resultProgress.Report(ResultEventArgs.Success("Extracting information complete!"));
+            if (submissionInfo == null)
+                return ResultEventArgs.Failure("There was an issue extracting information!");
+            else
+                resultProgress.Report(ResultEventArgs.Success("Extracting information complete!"));
 
             // Inject seed submission info data, if necessary
             if (seedInfo != null)
@@ -526,12 +525,12 @@ namespace MPF.Frontend
             // Get user-modifiable information if configured to
             if (_options.PromptForDiscInformation && processUserInfo != null)
             {
-                resultProgress.Report(ResultEventArgs.Success("Waiting for additional disc information..."));
+                resultProgress.Report(ResultEventArgs.Success("Waiting for additional media information..."));
                 bool? filledInfo = processUserInfo.Invoke(_options, ref submissionInfo);
                 if (filledInfo == true)
-                    resultProgress.Report(ResultEventArgs.Success("Additional disc information added!"));
+                    resultProgress.Report(ResultEventArgs.Success("Additional media information added!"));
                 else
-                    resultProgress.Report(ResultEventArgs.Success("Disc information skipped!"));
+                    resultProgress.Report(ResultEventArgs.Success("Media information skipped!"));
             }
 
             // Process special fields for site codes
@@ -593,7 +592,7 @@ namespace MPF.Frontend
                 await Task.Run(() =>
 #endif
                 {
-                    bool compressSuccess = _processor.CompressLogFiles(outputDirectory, outputFilename, filenameSuffix, out string compressResult);
+                    bool compressSuccess = _processor.CompressLogFiles(mediaType, _options.LogCompression, outputDirectory, outputFilename, filenameSuffix, out string compressResult);
                     if (compressSuccess)
                         resultProgress.Report(ResultEventArgs.Success(compressResult));
                     else
@@ -607,7 +606,7 @@ namespace MPF.Frontend
             if (_options.DeleteUnnecessaryFiles)
             {
                 resultProgress.Report(ResultEventArgs.Success("Deleting unnecessary files..."));
-                bool deleteSuccess = _processor.DeleteUnnecessaryFiles(outputDirectory, outputFilename, out string deleteResult);
+                bool deleteSuccess = _processor.DeleteUnnecessaryFiles(mediaType, outputDirectory, outputFilename, out string deleteResult);
                 if (deleteSuccess)
                     resultProgress.Report(ResultEventArgs.Success(deleteResult));
                 else
@@ -615,10 +614,10 @@ namespace MPF.Frontend
             }
 
             // Create PS3 IRD, if required
-            if (_options.CreateIRDAfterDumping && _system == RedumpSystem.SonyPlayStation3 && _type == MediaType.BluRay)
+            if (_options.CreateIRDAfterDumping && _system == RedumpSystem.SonyPlayStation3 && mediaType == MediaType.BluRay)
             {
                 resultProgress.Report(ResultEventArgs.Success("Creating IRD... please wait!"));
-                bool deleteSuccess = await WriteIRD(OutputPath, submissionInfo?.Extras?.DiscKey, submissionInfo?.Extras?.DiscID, submissionInfo?.Extras?.PIC, submissionInfo?.SizeAndChecksums?.Layerbreak, submissionInfo?.SizeAndChecksums?.CRC32);
+                bool deleteSuccess = await IRDTool.WriteIRD(OutputPath, submissionInfo?.Extras?.DiscKey, submissionInfo?.Extras?.DiscID, submissionInfo?.Extras?.PIC, submissionInfo?.SizeAndChecksums.Layerbreak, submissionInfo?.SizeAndChecksums.CRC32);
                 if (deleteSuccess)
                     resultProgress.Report(ResultEventArgs.Success("IRD created!"));
                 else
@@ -633,18 +632,18 @@ namespace MPF.Frontend
         /// Checks if the parameters are valid
         /// </summary>
         /// <returns>True if the configuration is valid, false otherwise</returns>
-        internal bool ParametersValid()
+        internal bool ParametersValid(MediaType? mediaType)
         {
             // Missing drive means it can never be valid
             if (_drive == null)
                 return false;
 
             bool parametersValid = _executionContext?.IsValid() ?? false;
-            bool floppyValid = !(_drive.InternalDriveType == InternalDriveType.Floppy ^ _type == MediaType.FloppyDisk);
+            bool floppyValid = !(_drive.InternalDriveType == InternalDriveType.Floppy ^ mediaType == MediaType.FloppyDisk);
 
             // TODO: HardDisk being in the Removable category is a hack, fix this later
             bool removableDiskValid = !((_drive.InternalDriveType == InternalDriveType.Removable || _drive.InternalDriveType == InternalDriveType.HardDisk)
-                ^ (_type == MediaType.CompactFlash || _type == MediaType.SDCard || _type == MediaType.FlashDrive || _type == MediaType.HardDisk));
+                ^ (mediaType == MediaType.CompactFlash || mediaType == MediaType.SDCard || mediaType == MediaType.FlashDrive || mediaType == MediaType.HardDisk));
 
             return parametersValid && floppyValid && removableDiskValid;
         }
@@ -653,10 +652,10 @@ namespace MPF.Frontend
         /// Validate the current environment is ready for a dump
         /// </summary>
         /// <returns>Result instance with the outcome</returns>
-        private ResultEventArgs IsValidForDump()
+        private ResultEventArgs IsValidForDump(MediaType? mediaType)
         {
             // Validate that everything is good
-            if (_executionContext == null || !ParametersValid())
+            if (_executionContext == null || !ParametersValid(mediaType))
                 return ResultEventArgs.Failure("Error! Current configuration is not supported!");
 
             // Fix the output paths, just in case
@@ -676,7 +675,7 @@ namespace MPF.Frontend
                 return ResultEventArgs.Failure("Error! Cannot dump same drive that executable resides on!");
 
             // Validate that the current configuration is supported
-            return GetSupportStatus();
+            return GetSupportStatus(mediaType);
         }
 
         #endregion
@@ -779,7 +778,7 @@ namespace MPF.Frontend
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return false;
             }
 
@@ -823,7 +822,11 @@ namespace MPF.Frontend
                 {
                     string scanPath = key;
                     if (hideDriveLetters)
-                        scanPath = Path.DirectorySeparatorChar + key.Substring((Path.GetPathRoot(key) ?? String.Empty).Length);
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                        scanPath = Path.DirectorySeparatorChar + key[(Path.GetPathRoot(key) ?? string.Empty).Length..];
+#else
+                        scanPath = Path.DirectorySeparatorChar + key.Substring((Path.GetPathRoot(key) ?? string.Empty).Length);
+#endif
 
                     List<string>? scanResult = info.CopyProtection.FullProtections[key];
 
@@ -835,73 +838,13 @@ namespace MPF.Frontend
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return false;
             }
 
             return true;
         }
 
-        /// <summary>
-        /// Create an IRD and write it to the specified output directory with optional filename suffix
-        /// </summary>
-        /// <param name="outputDirectory">Output folder to use as the base path</param>
-        /// <param name="filenameSuffix">Optional suffix to append to the filename</param>
-        /// <param name="outputFilename">Output filename to use as the base path</param>
-        /// <returns>True on success, false on error</returns>
-        private static async Task<bool> WriteIRD(string isoPath,
-            string? discKeyString,
-            string? discIDString,
-            string? picString,
-            long? layerbreak,
-            string? crc32)
-        {
-            try
-            {
-                // Output IRD file path
-                string irdPath = Path.ChangeExtension(isoPath, ".ird");
-
-                // Parse disc key from submission info (Required)
-                byte[]? discKey = ProcessingTool.ParseHexKey(discKeyString);
-                if (discKey == null)
-                    return false;
-
-                // Parse Disc ID from submission info (Optional)
-                byte[]? discID = ProcessingTool.ParseDiscID(discIDString);
-
-                // Parse PIC from submission info (Optional)
-                byte[]? pic = ProcessingTool.ParsePIC(picString);
-
-                // Parse CRC32 strings into ISO hash for Unique ID field (Optional)
-                uint? uid = ProcessingTool.ParseCRC32(crc32);
-
-                // Ensure layerbreak value is valid (Optional)
-                layerbreak = ProcessingTool.ParseLayerbreak(layerbreak);
-
-                // Create Redump-style reproducible IRD
-#if NET40
-                LibIRD.ReIRD ird = await Task.Factory.StartNew(() =>
-#else
-                LibIRD.ReIRD ird = await Task.Run(() =>
-#endif
-                    new LibIRD.ReIRD(isoPath, discKey, layerbreak, uid));
-                if (pic != null)
-                    ird.PIC = pic;
-                if (discID != null && ird.DiscID[15] != 0x00)
-                    ird.DiscID = discID;
-
-                // Write IRD to file
-                ird.Write(irdPath);
-
-                return true;
-            }
-            catch (Exception)
-            {
-                // We don't care what the error is
-                return false;
-            }
-        }
-
         #endregion
     }
 }

MPF.Frontend/EnumExtensions.cs

@@ -6,6 +6,8 @@ using System.Collections.Concurrent;
 #endif
 using System.Reflection;
 using SabreTools.RedumpLib.Data;
+using LogCompression = MPF.Processors.LogCompression;
+using RedumperDriveType = MPF.ExecutionContexts.Redumper.DriveType;
 using RedumperReadMethod = MPF.ExecutionContexts.Redumper.ReadMethod;
 using RedumperSectorOrder = MPF.ExecutionContexts.Redumper.SectorOrder;
 
@@ -60,6 +62,49 @@ namespace MPF.Frontend
             }
         }
 
+        /// <summary>
+        /// Get the string representation of the InterfaceLanguage enum values
+        /// </summary>
+        /// <param name="lang">InterfaceLanguage value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this InterfaceLanguage lang)
+            => ((InterfaceLanguage?)lang).LongName();
+
+        /// <summary>
+        /// Get the string representation of the InterfaceLanguage enum values
+        /// </summary>
+        /// <param name="lang">InterfaceLanguage value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this InterfaceLanguage? lang)
+        {
+            return lang switch
+            {
+                InterfaceLanguage.AutoDetect => "Auto Detect",
+                InterfaceLanguage.English => "English",
+                InterfaceLanguage.French => "Français",
+                InterfaceLanguage.German => "Deutsch",
+                InterfaceLanguage.Italian => "Italiano",
+                InterfaceLanguage.Japanese => "日本語",
+                InterfaceLanguage.Korean => "한국어",
+                InterfaceLanguage.Polish => "Polski",
+                InterfaceLanguage.Russian => "Русский",
+                InterfaceLanguage.Spanish => "Español",
+                InterfaceLanguage.Swedish => "Svenska",
+                InterfaceLanguage.Ukrainian => "Українська",
+                InterfaceLanguage.L337 => "L337",
+
+                _ => "Unknown",
+            };
+        }
+
+        /// <summary>
+        /// Get the string representation of the InternalProgram enum values
+        /// </summary>
+        /// <param name="prog">InternalProgram value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this InternalProgram prog)
+            => ((InternalProgram?)prog).LongName();
+
         /// <summary>
         /// Get the string representation of the InternalProgram enum values
         /// </summary>
@@ -91,6 +136,39 @@ namespace MPF.Frontend
             };
         }
 
+        /// <summary>
+        /// Get the string representation of the LogCompression enum values
+        /// </summary>
+        /// <param name="comp">LogCompression value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this LogCompression comp)
+            => ((LogCompression?)comp).LongName();
+
+        /// <summary>
+        /// Get the string representation of the LogCompression enum values
+        /// </summary>
+        /// <param name="comp">LogCompression value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this LogCompression? comp)
+        {
+            return comp switch
+            {
+                LogCompression.DeflateDefault => "ZIP using Deflate (Level 5)",
+                LogCompression.DeflateMaximum => "ZIP using Deflate (Level 9)",
+                LogCompression.Zstd19 => "ZIP using Zstd (Level 19)",
+
+                _ => "Unknown",
+            };
+        }
+
+        /// <summary>
+        /// Get the string representation of the RedumperReadMethod enum values
+        /// </summary>
+        /// <param name="method">RedumperReadMethod value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this RedumperReadMethod method)
+            => ((RedumperReadMethod?)method).LongName();
+
         /// <summary>
         /// Get the string representation of the RedumperReadMethod enum values
         /// </summary>
@@ -102,13 +180,20 @@ namespace MPF.Frontend
             {
                 RedumperReadMethod.D8 => "D8",
                 RedumperReadMethod.BE => "BE",
-                RedumperReadMethod.BE_CDDA => "BE_CDDA",
 
                 RedumperReadMethod.NONE => "Default",
                 _ => "Unknown",
             };
         }
 
+        /// <summary>
+        /// Get the string representation of the RedumperSectorOrder enum values
+        /// </summary>
+        /// <param name="order">RedumperSectorOrder value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this RedumperSectorOrder order)
+            => ((RedumperSectorOrder?)order).LongName();
+
         /// <summary>
         /// Get the string representation of the RedumperSectorOrder enum values
         /// </summary>
@@ -128,10 +213,75 @@ namespace MPF.Frontend
             };
         }
 
+        /// <summary>
+        /// Get the string representation of the RedumperDriveType enum values
+        /// </summary>
+        /// <param name="type">RedumperDriveType value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this RedumperDriveType type)
+            => ((RedumperDriveType?)type).LongName();
+
+        /// <summary>
+        /// Get the string representation of the RedumperDriveType enum values
+        /// </summary>
+        /// <param name="order">RedumperDriveType value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(this RedumperDriveType? type)
+        {
+            return type switch
+            {
+                RedumperDriveType.GENERIC => "GENERIC",
+                RedumperDriveType.PLEXTOR => "PLEXTOR",
+                RedumperDriveType.LG_ASU8A => "LG_ASU8A",
+                RedumperDriveType.LG_ASU8B => "LG_ASU8B",
+                RedumperDriveType.LG_ASU8C => "LG_ASU8C",
+                RedumperDriveType.LG_ASU3 => "LG_ASU3",
+                RedumperDriveType.LG_ASU2 => "LG_ASU2",
+
+                RedumperDriveType.NONE => "Default",
+                _ => "Unknown",
+            };
+        }
+
         #endregion
 
         #region Convert to Short Name
 
+        /// <summary>
+        /// Get the short string representation of the InterfaceLanguage enum values
+        /// </summary>
+        /// <param name="lang">InterfaceLanguage value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string ShortName(this InterfaceLanguage lang)
+            => ((InterfaceLanguage?)lang).ShortName();
+
+        /// <summary>
+        /// Get the short string representation of the InterfaceLanguage enum values
+        /// </summary>
+        /// <param name="lang">InterfaceLanguage value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string ShortName(this InterfaceLanguage? lang)
+        {
+            return lang switch
+            {
+                InterfaceLanguage.AutoDetect => "auto",
+                InterfaceLanguage.English => "eng",
+                InterfaceLanguage.French => "fra",
+                InterfaceLanguage.German => "deu",
+                InterfaceLanguage.Italian => "ita",
+                InterfaceLanguage.Japanese => "jpn",
+                InterfaceLanguage.Korean => "kor",
+                InterfaceLanguage.Polish => "pol",
+                InterfaceLanguage.Russian => "rus",
+                InterfaceLanguage.Spanish => "spa",
+                InterfaceLanguage.Swedish => "swe",
+                InterfaceLanguage.Ukrainian => "ukr",
+                InterfaceLanguage.L337 => "l37",
+
+                _ => "Unknown",
+            };
+        }
+
         /// <summary>
         /// Get the short string representation of the InternalProgram enum values
         /// </summary>
@@ -167,6 +317,33 @@ namespace MPF.Frontend
 
         #region Convert from String
 
+        /// <summary>
+        /// Get the InterfaceLanguage enum value for a given string
+        /// </summary>
+        /// <param name="internalLanguage">String value to convert</param>
+        /// <returns>InterfaceLanguage represented by the string, if possible</returns>
+        public static InterfaceLanguage ToInterfaceLanguage(this string? internalLanguage)
+        {
+            return (internalLanguage?.ToLowerInvariant()) switch
+            {
+                "auto" or "autodetect" or "auto detect" => InterfaceLanguage.AutoDetect,
+                "eng" or "english" => InterfaceLanguage.English,
+                "fra" or "french" or "français" => InterfaceLanguage.French,
+                "deu" or "german" or "deutsch" => InterfaceLanguage.German,
+                "ita" or "italian" or "italiano" => InterfaceLanguage.Italian,
+                "jpn" or "japanese" or "日本語" => InterfaceLanguage.Japanese,
+                "kor" or "korean" or "한국어" => InterfaceLanguage.Korean,
+                "pol" or "polish" or "polski" => InterfaceLanguage.Polish,
+                "rus" or "russian" or "русский" => InterfaceLanguage.Russian,
+                "spa" or "spanish" or "español" => InterfaceLanguage.Spanish,
+                "swe" or "swedish" or "svenska" => InterfaceLanguage.Swedish,
+                "ukr" or "ukranian" or "українська" => InterfaceLanguage.Ukrainian,
+                "l37" or "l337" => InterfaceLanguage.L337,
+
+                _ => InterfaceLanguage.AutoDetect,
+            };
+        }
+
         /// <summary>
         /// Get the InternalProgram enum value for a given string
         /// </summary>
@@ -210,6 +387,28 @@ namespace MPF.Frontend
             };
         }
 
+        /// <summary>
+        /// Get the LogCompression enum value for a given string
+        /// </summary>
+        /// <param name="logCompression">String value to convert</param>
+        /// <returns>LogCompression represented by the string, if possible</returns>
+        public static LogCompression ToLogCompression(this string? logCompression)
+        {
+            return (logCompression?.ToLowerInvariant()) switch
+            {
+                "deflate"
+                    or "deflatedefault"
+                    or "zip" => LogCompression.DeflateDefault,
+                "deflatemaximum"
+                    or "max"
+                    or "maximum" => LogCompression.DeflateMaximum,
+                "zstd"
+                    or "zstd19" => LogCompression.Zstd19,
+
+                _ => LogCompression.DeflateDefault,
+            };
+        }
+
         /// <summary>
         /// Get the RedumperReadMethod enum value for a given string
         /// </summary>
@@ -221,10 +420,6 @@ namespace MPF.Frontend
             {
                 "d8" => RedumperReadMethod.D8,
                 "be" => RedumperReadMethod.BE,
-                "be_cdda"
-                    or "be cdda"
-                    or "be-cdda"
-                    or "becdda" => RedumperReadMethod.BE_CDDA,
 
                 _ => RedumperReadMethod.NONE,
             };
@@ -260,6 +455,47 @@ namespace MPF.Frontend
             };
         }
 
+        /// <summary>
+        /// Get the RedumperDriveType enum value for a given string
+        /// </summary>
+        /// <param name="order">String value to convert</param>
+        /// <returns>RedumperDriveType represented by the string, if possible</returns>
+        public static RedumperDriveType ToRedumperDriveType(this string? type)
+        {
+            return (type?.ToLowerInvariant()) switch
+            {
+                "generic" => RedumperDriveType.GENERIC,
+                "plextor" => RedumperDriveType.PLEXTOR,
+                "lg_asu8a"
+                    or "lg-asu8a"
+                    or "lgasu8a"
+                    or "lg_asu_8a"
+                    or "lg-asu-8a" => RedumperDriveType.LG_ASU8A,
+                "lg_asu8b"
+                    or "lg-asu8b"
+                    or "lgasu8b"
+                    or "lg_asu_8b"
+                    or "lg-asu-8b" => RedumperDriveType.LG_ASU8B,
+                "lg_asu8c"
+                    or "lg-asu8c"
+                    or "lgasu8c"
+                    or "lg_asu_8c"
+                    or "lg-asu-8c" => RedumperDriveType.LG_ASU8C,
+                "lg_asus3"
+                    or "lg-asu3"
+                    or "lgasu3"
+                    or "lg_asu_3"
+                    or "lg-asu-3" => RedumperDriveType.LG_ASU3,
+                "lg_asu2"
+                    or "lg-asu2"
+                    or "lgasu2"
+                    or "lg_asu_2"
+                    or "lg-asu-2" => RedumperDriveType.LG_ASU2,
+
+                _ => RedumperDriveType.NONE,
+            };
+        }
+
         #endregion
 
         #region Functionality Support
@@ -284,6 +520,7 @@ namespace MPF.Frontend
             return system switch
             {
                 RedumpSystem.AppleMacintosh => true,
+                RedumpSystem.DVDVideo => true,
                 RedumpSystem.EnhancedCD => true,
                 RedumpSystem.IBMPCcompatible => true,
                 RedumpSystem.PalmOS => true,

MPF.Frontend/Enumerations.cs

@@ -1,5 +1,32 @@
 namespace MPF.Frontend
 {
+    /// <summary>
+    /// Interface language
+    /// </summary>
+    public enum InterfaceLanguage
+    {
+        /// <summary>
+        /// Default to auto-detecting language
+        /// </summary>
+        AutoDetect = 0,
+
+        // Selectable languages (in Manual Window dropdown)
+        English,
+        French,
+        German,
+        Italian,
+        Japanese,
+        Korean,
+        Polish,
+        Russian,
+        Spanish,
+        Swedish,
+        Ukrainian,
+
+        // Hidden languages (not in Main Window dropdown)
+        L337,
+    }
+
     /// <summary>
     /// Drive type for dumping
     /// </summary>
@@ -40,4 +67,4 @@ namespace MPF.Frontend
         ERROR,
         SECRET,
     }
-}
+}

MPF.Frontend/Features/ListCodesFeature.cs

@@ -0,0 +1,38 @@
+using System;
+using SabreTools.CommandLine;
+
+namespace MPF.Frontend.Features
+{
+    public class ListCodesFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "listcodes";
+
+        private static readonly string[] _flags = ["lc", "listcodes"];
+
+        private const string _description = "List supported comment/content site codes";
+
+        #endregion
+
+        public ListCodesFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            Console.WriteLine("Supported Site Codes:");
+            foreach (string siteCode in SabreTools.RedumpLib.Data.Extensions.ListSiteCodes())
+            {
+                Console.WriteLine(siteCode);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.Frontend/Features/ListConfigFeature.cs

@@ -0,0 +1,150 @@
+using System;
+using MPF.Frontend;
+using MPF.Frontend.Tools;
+using SabreTools.RedumpLib.Data;
+
+namespace MPF.Frontend.Features
+{
+    public class ListConfigFeature : SabreTools.CommandLine.Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "listconfig";
+
+        private static readonly string[] _flags = ["lo", "listconfig"];
+
+        private const string _description = "List current configuration values";
+
+        #endregion
+
+        public ListConfigFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            // Try to load the current config
+            var options = OptionsLoader.LoadFromConfig();
+            if (options.FirstRun)
+            {
+                Console.WriteLine("No valid configuration found!");
+                return true;
+            }
+
+            // Paths
+            Console.WriteLine("Paths:");
+            Console.WriteLine($"  Aaru Path = {options.AaruPath}");
+            Console.WriteLine($"  DiscImageCreator Path = {options.DiscImageCreatorPath}");
+            Console.WriteLine($"  Redumper Path = {options.RedumperPath}");
+            Console.WriteLine($"  Default Program = {options.InternalProgram.LongName()}");
+            Console.WriteLine();
+
+            // UI Defaults
+            Console.WriteLine("UI Defaults:");
+            Console.WriteLine($"  Dark Mode = {options.EnableDarkMode}");
+            Console.WriteLine($"  Purp Mode = {options.EnablePurpMode}");
+            Console.WriteLine($"  Custom Background Color = {options.CustomBackgroundColor}");
+            Console.WriteLine($"  Custom Text Color = {options.CustomTextColor}");
+            Console.WriteLine($"  Check for Updates on Startup = {options.CheckForUpdatesOnStartup}");
+            Console.WriteLine($"  Copy Update URL to Clipboard = {options.CopyUpdateUrlToClipboard}");
+            Console.WriteLine($"  Fast Label Update = {options.FastUpdateLabel}");
+            Console.WriteLine($"  Default Interface Language = {options.DefaultInterfaceLanguage.LongName()}");
+            Console.WriteLine($"  Default Output Path = {options.DefaultOutputPath}");
+            Console.WriteLine($"  Default System = {options.DefaultSystem.LongName()}");
+            Console.WriteLine($"  Show Debug Menu Item = {options.ShowDebugViewMenuItem}");
+            Console.WriteLine();
+
+            // Dumping Speeds
+            Console.WriteLine("Dumping Speeds:");
+            Console.WriteLine($"  Default CD Speed = {options.PreferredDumpSpeedCD}");
+            Console.WriteLine($"  Default DVD Speed = {options.PreferredDumpSpeedDVD}");
+            Console.WriteLine($"  Default HD-DVD Speed = {options.PreferredDumpSpeedHDDVD}");
+            Console.WriteLine($"  Default Blu-ray Speed = {options.PreferredDumpSpeedBD}");
+            Console.WriteLine();
+
+            // Aaru
+            Console.WriteLine("Aaru-Specific Options:");
+            Console.WriteLine($"  Enable Debug = {options.AaruEnableDebug}");
+            Console.WriteLine($"  Enable Verbose = {options.AaruEnableVerbose}");
+            Console.WriteLine($"  Force Dumping = {options.AaruForceDumping}");
+            Console.WriteLine($"  Reread Count = {options.AaruRereadCount}");
+            Console.WriteLine($"  Strip Personal Data = {options.AaruStripPersonalData}");
+            Console.WriteLine();
+
+            // DiscImageCreator
+            Console.WriteLine("DiscImageCreator-Specific Options:");
+            Console.WriteLine($"  Multi-Sector Read Flag = {options.DICMultiSectorRead}");
+            Console.WriteLine($"  Multi-Sector Read Value = {options.DICMultiSectorReadValue}");
+            Console.WriteLine($"  Overly-Secure Flags = {options.DICParanoidMode}");
+            Console.WriteLine($"  Quiet Flag = {options.DICQuietMode}");
+            Console.WriteLine($"  CD Reread Count = {options.DICRereadCount}");
+            Console.WriteLine($"  DVD Reread Count = {options.DICDVDRereadCount}");
+            Console.WriteLine($"  Use CMI Flag = {options.DICUseCMIFlag}");
+            Console.WriteLine();
+
+            // Redumper
+            Console.WriteLine("Redumper-Specific Options:");
+            Console.WriteLine($"  Enable Skeleton = {options.RedumperEnableSkeleton}");
+            Console.WriteLine($"  Enable Verbose = {options.RedumperEnableVerbose}");
+            Console.WriteLine($"  Lead-in Retry Count = {options.RedumperLeadinRetryCount}");
+            Console.WriteLine($"  Non-Redump Mode = {options.RedumperNonRedumpMode}");
+            Console.WriteLine($"  Drive Type = {options.RedumperDriveType.LongName()}");
+            Console.WriteLine($"  Read Method = {options.RedumperReadMethod.LongName()}");
+            Console.WriteLine($"  Sector Order = {options.RedumperSectorOrder.LongName()}");
+            Console.WriteLine($"  Reread Count = {options.RedumperRereadCount}");
+            Console.WriteLine($"  Refine Sector Mode = {options.RedumperRefineSectorMode}");
+            Console.WriteLine();
+
+            // Extra Dumping Options
+            Console.WriteLine("Extra Dumping Options:");
+            Console.WriteLine($"  Scan for Protection = {options.ScanForProtection}");
+            Console.WriteLine($"  Add Placeholders = {options.AddPlaceholders}");
+            Console.WriteLine($"  Prompt for Media Information = {options.PromptForDiscInformation}");
+            Console.WriteLine($"  Pull All Information = {options.PullAllInformation}");
+            Console.WriteLine($"  Enable Tabs in Input Fields = {options.EnableTabsInInputFields}");
+            Console.WriteLine($"  Enable Redump Compatibility = {options.EnableRedumpCompatibility}");
+            Console.WriteLine($"  Show Disc Eject Reminder = {options.ShowDiscEjectReminder}");
+            Console.WriteLine($"  Ignore Fixed Drives = {options.IgnoreFixedDrives}");
+            Console.WriteLine($"  Add Filename Suffix = {options.AddFilenameSuffix}");
+            Console.WriteLine($"  Output Submission JSON = {options.OutputSubmissionJSON}");
+            Console.WriteLine($"  Include Artifacts = {options.IncludeArtifacts}");
+            Console.WriteLine($"  Compress Log Files = {options.CompressLogFiles}");
+            Console.WriteLine($"  Log Compression = {options.LogCompression.LongName()}");
+            Console.WriteLine($"  Delete Unnecessary Files = {options.DeleteUnnecessaryFiles}");
+            Console.WriteLine($"  Create IRD After Dumping = {options.CreateIRDAfterDumping}");
+            Console.WriteLine();
+
+            // Skip Options
+            Console.WriteLine("Skip Options:");
+            Console.WriteLine($"  Skip System Detection = {options.SkipSystemDetection}");
+            Console.WriteLine();
+
+            // Protection Scanning Options
+            Console.WriteLine("Protection Scanning Options:");
+            Console.WriteLine($"  Scan Archives for Protection = {options.ScanArchivesForProtection}");
+            Console.WriteLine($"  Include Debug Protection Information = {options.IncludeDebugProtectionInformation}");
+            Console.WriteLine($"  Hide Drive Letters = {options.HideDriveLetters}");
+            Console.WriteLine();
+
+            // Logging Options
+            Console.WriteLine("Logging Options:");
+            Console.WriteLine($"  Verbose Logging = {options.VerboseLogging}");
+            Console.WriteLine($"  Open Log Window at Startup = {options.OpenLogWindowAtStartup}");
+            Console.WriteLine();
+
+            // Redump Login Information
+            Console.WriteLine("Redump Login Information:");
+            Console.WriteLine($"  Retrieve Match Information = {options.RetrieveMatchInformation}");
+            Console.WriteLine($"  Redump Username = {options.RedumpUsername}");
+            Console.WriteLine($"  Redump Password = {(string.IsNullOrEmpty(options.RedumpPassword) ? "[UNSET]" : "[SET]")}");
+            Console.WriteLine();
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.Frontend/Features/ListMediaTypesFeature.cs

@@ -0,0 +1,38 @@
+using System;
+using SabreTools.CommandLine;
+
+namespace MPF.Frontend.Features
+{
+    public class ListMediaTypesFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "listmedia";
+
+        private static readonly string[] _flags = ["lm", "listmedia"];
+
+        private const string _description = "List supported media types";
+
+        #endregion
+
+        public ListMediaTypesFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            Console.WriteLine("Supported Media Types:");
+            foreach (string mediaType in SabreTools.RedumpLib.Data.Extensions.ListMediaTypes())
+            {
+                Console.WriteLine(mediaType);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.Frontend/Features/ListProgramsFeature.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using SabreTools.CommandLine;
+
+namespace MPF.Frontend.Features
+{
+    public class ListProgramsFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "listprograms";
+
+        private static readonly string[] _flags = ["lp", "listprograms"];
+
+        private const string _description = "List supported dumping program outputs";
+
+        #endregion
+
+        public ListProgramsFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            Console.WriteLine("Supported Programs:");
+            foreach (string program in ListPrograms())
+            {
+                Console.WriteLine(program);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => 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;
+        }
+    }
+}

MPF.Frontend/Features/ListSystemsFeature.cs

@@ -0,0 +1,38 @@
+using System;
+using SabreTools.CommandLine;
+
+namespace MPF.Frontend.Features
+{
+    public class ListSystemsFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "listsystems";
+
+        private static readonly string[] _flags = ["ls", "listsystems"];
+
+        private const string _description = "List supported system types";
+
+        #endregion
+
+        public ListSystemsFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            Console.WriteLine("Supported Systems:");
+            foreach (string system in SabreTools.RedumpLib.Data.Extensions.ListSystems())
+            {
+                Console.WriteLine(system);
+            }
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.Frontend/Features/VersionFeature.cs

@@ -0,0 +1,34 @@
+using System;
+using MPF.Frontend.Tools;
+using SabreTools.CommandLine;
+
+namespace MPF.Frontend.Features
+{
+    public class VersionFeature : Feature
+    {
+        #region Feature Definition
+
+        public const string DisplayName = "version";
+
+        private static readonly string[] _flags = ["version"];
+
+        private const string _description = "Display the program version";
+
+        #endregion
+
+        public VersionFeature()
+            : base(DisplayName, _flags, _description)
+        {
+        }
+
+        /// <inheritdoc/>
+        public override bool Execute()
+        {
+            Console.WriteLine(FrontendTool.GetCurrentVersion() ?? "Unknown version");
+            return true;
+        }
+
+        /// <inheritdoc/>
+        public override bool VerifyInputs() => true;
+    }
+}

MPF.Frontend/InterfaceConstants.cs

@@ -33,11 +33,6 @@ namespace MPF.Frontend
         /// </summary>
         public static List<int> BD => _speedValues.FindAll(s => s <= 16);
 
-        /// <summary>
-        /// Set of accepted speeds for all other media
-        /// </summary>
-        public static List<int> Unknown => [1];
-
         /// <summary>
         /// Get list of all drive speeds for a given MediaType
         /// </summary>
@@ -55,7 +50,9 @@ namespace MPF.Frontend
                 MediaType.HDDVD => HDDVD,
                 MediaType.BluRay
                     or MediaType.NintendoWiiUOpticalDisc => BD,
-                _ => Unknown,
+
+                // Default to CD speed range
+                _ => CD,
             };
         }
     }

MPF.Frontend/MPF.Frontend.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <LangVersion>latest</LangVersion>
@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <VersionPrefix>3.3.1</VersionPrefix>
+        <VersionPrefix>3.6.0</VersionPrefix>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
@@ -31,12 +31,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BinaryObjectScanner" Version="3.3.4" />
-        <PackageReference Include="LibIRD" Version="0.9.3" />
+        <PackageReference Include="BinaryObjectScanner" Version="[3.5.0]" />
+        <PackageReference Include="LibIRD" Version="[1.0.1]" />
         <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.6" />
+        <PackageReference Include="MinThreadingBridge" Version="0.11.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
         <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>
 

MPF.Frontend/OldDotNet.cs

@@ -42,4 +42,4 @@ namespace MPF.Frontend
         IEnumerator IEnumerable.GetEnumerator() => _queue.GetEnumerator();
     }
 }
-#endif
+#endif

MPF.Frontend/Options.cs

@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using SabreTools.RedumpLib.Data;
 using AaruSettings = MPF.ExecutionContexts.Aaru.SettingConstants;
 using DICSettings = MPF.ExecutionContexts.DiscImageCreator.SettingConstants;
+using LogCompression = MPF.Processors.LogCompression;
+using RedumperDriveType = MPF.ExecutionContexts.Redumper.DriveType;
 using RedumperReadMethod = MPF.ExecutionContexts.Redumper.ReadMethod;
 using RedumperSectorOrder = MPF.ExecutionContexts.Redumper.SectorOrder;
 using RedumperSettings = MPF.ExecutionContexts.Redumper.SettingConstants;
@@ -10,6 +14,76 @@ namespace MPF.Frontend
 {
     public class Options
     {
+        #region Default Paths
+
+        /// <summary>
+        /// Default Aaru path
+        /// </summary>
+        private static string DefaultAaruPath
+        {
+            get
+            {
+                string executableName = Environment.OSVersion.Platform switch
+                {
+                    PlatformID.Unix => "aaru",
+                    PlatformID.MacOSX => "aaru",
+                    _ => "aaru.exe"
+                };
+
+#if NET20 || NET35
+                return Path.Combine("Programs", Path.Combine("Aaru", executableName));
+#else
+                return Path.Combine("Programs", "Aaru", executableName);
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Default DiscImageCreator path
+        /// </summary>
+        private static string DefaultDiscImageCreatorPath
+        {
+            get
+            {
+                string executableName = Environment.OSVersion.Platform switch
+                {
+                    PlatformID.Unix => "DiscImageCreator.out",
+                    PlatformID.MacOSX => "DiscImageCreator",
+                    _ => "DiscImageCreator.exe"
+                };
+
+#if NET20 || NET35
+                return Path.Combine("Programs", Path.Combine("Creator", executableName));
+#else
+                return Path.Combine("Programs", "Creator", executableName);
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Default Redumper path
+        /// </summary>
+        private static string DefaultRedumperPath
+        {
+            get
+            {
+                string executableName = Environment.OSVersion.Platform switch
+                {
+                    PlatformID.Unix => "redumper",
+                    PlatformID.MacOSX => "redumper",
+                    _ => "redumper.exe"
+                };
+
+#if NET20 || NET35
+                return Path.Combine("Programs", Path.Combine("Redumper", executableName));
+#else
+                return Path.Combine("Programs", "Redumper", executableName);
+#endif
+            }
+        }
+
+        #endregion
+
         /// <summary>
         /// All settings in the form of a dictionary
         /// </summary>
@@ -31,7 +105,7 @@ namespace MPF.Frontend
         /// </summary>
         public string? AaruPath
         {
-            get { return GetStringSetting(Settings, "AaruPath", "Programs\\Aaru\\Aaru.exe"); }
+            get { return GetStringSetting(Settings, "AaruPath", DefaultAaruPath); }
             set { Settings["AaruPath"] = value; }
         }
 
@@ -40,7 +114,7 @@ namespace MPF.Frontend
         /// </summary>
         public string? DiscImageCreatorPath
         {
-            get { return GetStringSetting(Settings, "DiscImageCreatorPath", "Programs\\Creator\\DiscImageCreator.exe"); }
+            get { return GetStringSetting(Settings, "DiscImageCreatorPath", DefaultDiscImageCreatorPath); }
             set { Settings["DiscImageCreatorPath"] = value; }
         }
 
@@ -49,7 +123,7 @@ namespace MPF.Frontend
         /// </summary>
         public string? RedumperPath
         {
-            get { return GetStringSetting(Settings, "RedumperPath", "Programs\\Redumper\\redumper.exe"); }
+            get { return GetStringSetting(Settings, "RedumperPath", DefaultRedumperPath); }
             set { Settings["RedumperPath"] = value; }
         }
 
@@ -122,6 +196,15 @@ namespace MPF.Frontend
             set { Settings["CheckForUpdatesOnStartup"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Try to copy the update URL to the clipboard if one is found
+        /// </summary>
+        public bool CopyUpdateUrlToClipboard
+        {
+            get { return GetBooleanSetting(Settings, "CopyUpdateUrlToClipboard", true); }
+            set { Settings["CopyUpdateUrlToClipboard"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Fast update label - Skips disc checks and updates path only
         /// </summary>
@@ -131,6 +214,22 @@ namespace MPF.Frontend
             set { Settings["FastUpdateLabel"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Default interface language to launch MPF into
+        /// </summary>
+        public InterfaceLanguage DefaultInterfaceLanguage
+        {
+            get
+            {
+                var valueString = GetStringSetting(Settings, "DefaultInterfaceLanguage", InterfaceLanguage.AutoDetect.ShortName());
+                return valueString.ToInterfaceLanguage();
+            }
+            set
+            {
+                Settings["DefaultInterfaceLanguage"] = value.ShortName();
+            }
+        }
+
         /// <summary>
         /// Default output path for dumps
         /// </summary>
@@ -147,13 +246,13 @@ namespace MPF.Frontend
         {
             get
             {
-                var valueString = GetStringSetting(Settings, "DefaultSystem", RedumpSystem.IBMPCcompatible.LongName());
-                var valueEnum = Extensions.ToRedumpSystem(valueString ?? string.Empty);
+                var valueString = GetStringSetting(Settings, "DefaultSystem", RedumpSystem.IBMPCcompatible.ToString());
+                var valueEnum = (valueString ?? string.Empty).ToRedumpSystem();
                 return valueEnum;
             }
             set
             {
-                Settings["DefaultSystem"] = value.LongName();
+                Settings["DefaultSystem"] = value.ToString();
             }
         }
 
@@ -332,24 +431,6 @@ namespace MPF.Frontend
 
         #region Redumper
 
-        /// <summary>
-        /// Enable debug output while dumping by default
-        /// </summary>
-        public bool RedumperEnableDebug
-        {
-            get { return GetBooleanSetting(Settings, RedumperSettings.EnableDebug, RedumperSettings.EnableDebugDefault); }
-            set { Settings[RedumperSettings.EnableDebug] = value.ToString(); }
-        }
-
-        /// <summary>
-        /// Enable Redumper custom lead-in retries for Plextor drives
-        /// </summary>
-        public bool RedumperEnableLeadinRetry
-        {
-            get { return GetBooleanSetting(Settings, RedumperSettings.EnableLeadinRetry, RedumperSettings.EnableLeadinRetryDefault); }
-            set { Settings[RedumperSettings.EnableLeadinRetry] = value.ToString(); }
-        }
-
         /// <summary>
         /// Enable skeleton output while dumping by default
         /// </summary>
@@ -388,12 +469,28 @@ namespace MPF.Frontend
         }
 
         /// <summary>
-        /// Enable generic drive type by default with Redumper
+        /// Currently selected default redumper drive type
         /// </summary>
-        public bool RedumperUseGenericDriveType
+        public RedumperDriveType RedumperDriveType
         {
-            get { return GetBooleanSetting(Settings, RedumperSettings.UseGenericDriveType, RedumperSettings.UseGenericDriveTypeDefault); }
-            set { Settings[RedumperSettings.UseGenericDriveType] = value.ToString(); }
+            get
+            {
+                var valueString = GetStringSetting(Settings, RedumperSettings.DriveType, RedumperSettings.DriveTypeDefault);
+                return valueString.ToRedumperDriveType();
+            }
+            set
+            {
+                Settings[RedumperSettings.DriveType] = value.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Currently selected default redumper drive pregap start sector
+        /// </summary>
+        public int RedumperDrivePregapStart
+        {
+            get { return GetInt32Setting(Settings, RedumperSettings.DrivePregapStart, RedumperSettings.DrivePregapStartDefault); }
+            set { Settings[RedumperSettings.DrivePregapStart] = value.ToString(); }
         }
 
         /// <summary>
@@ -437,6 +534,15 @@ namespace MPF.Frontend
             set { Settings[RedumperSettings.RereadCount] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Enable the refine sector mode flag by default
+        /// </summary>
+        public bool RedumperRefineSectorMode
+        {
+            get { return GetBooleanSetting(Settings, RedumperSettings.RefineSectorMode, RedumperSettings.RefineSectorModeDefault); }
+            set { Settings[RedumperSettings.RefineSectorMode] = value.ToString(); }
+        }
+
         #endregion
 
         #region Extra Dumping Options
@@ -460,7 +566,7 @@ namespace MPF.Frontend
         }
 
         /// <summary>
-        /// Show the disc information window after dumping
+        /// Show the media information window after dumping
         /// </summary>
         public bool PromptForDiscInformation
         {
@@ -496,7 +602,7 @@ namespace MPF.Frontend
         }
 
         /// <summary>
-        /// Show disc eject reminder before the disc information window is shown
+        /// Show disc eject reminder before the media information window is shown
         /// </summary>
         public bool ShowDiscEjectReminder
         {
@@ -549,6 +655,22 @@ namespace MPF.Frontend
             set { Settings["CompressLogFiles"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Compression type used during log compression
+        /// </summary>
+        public LogCompression LogCompression
+        {
+            get
+            {
+                var valueString = GetStringSetting(Settings, "LogCompression", LogCompression.DeflateMaximum.ToString());
+                return valueString.ToLogCompression();
+            }
+            set
+            {
+                Settings["LogCompression"] = value.ToString();
+            }
+        }
+
         /// <summary>
         /// Delete unnecessary files to reduce space
         /// </summary>
@@ -571,15 +693,6 @@ namespace MPF.Frontend
 
         #region Skip Options
 
-        /// <summary>
-        /// Skip detecting media type on disc scan
-        /// </summary>
-        public bool SkipMediaTypeDetection
-        {
-            get { return GetBooleanSetting(Settings, "SkipMediaTypeDetection", false); }
-            set { Settings["SkipMediaTypeDetection"] = value.ToString(); }
-        }
-
         /// <summary>
         /// Skip detecting known system on disc scan
         /// </summary>
@@ -646,6 +759,15 @@ namespace MPF.Frontend
 
         #region Redump Login Information
 
+        /// <summary>
+        /// Enable retrieving match information from Redump
+        /// </summary>
+        public bool RetrieveMatchInformation
+        {
+            get { return GetBooleanSetting(Settings, "RetrieveMatchInformation", true); }
+            set { Settings["RetrieveMatchInformation"] = value.ToString(); }
+        }
+
         public string? RedumpUsername
         {
             get { return GetStringSetting(Settings, "RedumpUsername", ""); }
@@ -655,18 +777,10 @@ namespace MPF.Frontend
         // TODO: Figure out a way to keep this encrypted in some way, BASE64 to start?
         public string? RedumpPassword
         {
-            get
-            {
-                return GetStringSetting(Settings, "RedumpPassword", "");
-            }
+            get { return GetStringSetting(Settings, "RedumpPassword", ""); }
             set { Settings["RedumpPassword"] = value; }
         }
 
-        /// <summary>
-        /// Determine if a complete set of Redump credentials might exist
-        /// </summary>
-        public bool HasRedumpLogin { get => !string.IsNullOrEmpty(RedumpUsername) && !string.IsNullOrEmpty(RedumpPassword); }
-
         #endregion
 
         /// <summary>

MPF.Frontend/ProcessUserInfoDelegate.cs

@@ -9,4 +9,4 @@ namespace MPF.Frontend
     /// <param name="info">Submission info that may be overwritten</param>
     /// <returns>True for successful updating, false or null otherwise</returns>
     public delegate bool? ProcessUserInfoDelegate(Options? options, ref SubmissionInfo? info);
-}
+}

MPF.Frontend/Progress.cs

@@ -0,0 +1,108 @@
+#if NET20 || NET35 || NET40
+
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Threading;
+using System.Diagnostics;
+
+namespace MPF.Frontend
+{
+    /// <summary>
+    /// Provides an IProgress{T} that invokes callbacks for each reported progress value.
+    /// </summary>
+    /// <typeparam name="T">Specifies the type of the progress report value.</typeparam>
+    /// <remarks>
+    /// Any handler provided to the constructor or event handlers registered with
+    /// the <see cref="ProgressChanged"/> event are invoked through a
+    /// <see cref="SynchronizationContext"/> instance captured
+    /// when the instance is constructed.  If there is no current SynchronizationContext
+    /// at the time of construction, the callbacks will be invoked on the ThreadPool.
+    /// </remarks>
+    /// <see href="https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Progress.cs"/>
+    internal class Progress<T> : IProgress<T> where T : EventArgs
+    {
+        /// <summary>The synchronization context captured upon construction.  This will never be null.</summary>
+        private readonly SynchronizationContext? _synchronizationContext;
+        /// <summary>The handler specified to the constructor.  This may be null.</summary>
+        private readonly Action<T>? _handler;
+        /// <summary>A cached delegate used to post invocation to the synchronization context.</summary>
+        private readonly SendOrPostCallback _invokeHandlers;
+
+        /// <summary>Initializes the <see cref="Progress{T}"/>.</summary>
+        public Progress()
+        {
+            // Capture the current synchronization context.
+            // If there is no current context, we use a default instance targeting the ThreadPool.
+            _synchronizationContext = SynchronizationContext.Current ?? ProgressStatics.DefaultContext;
+            Debug.Assert(_synchronizationContext != null);
+            _invokeHandlers = new SendOrPostCallback(InvokeHandlers);
+        }
+
+        /// <summary>Initializes the <see cref="Progress{T}"/> with the specified callback.</summary>
+        /// <param name="handler">
+        /// A handler to invoke for each reported progress value.  This handler will be invoked
+        /// in addition to any delegates registered with the <see cref="ProgressChanged"/> event.
+        /// Depending on the <see cref="SynchronizationContext"/> instance captured by
+        /// the <see cref="Progress{T}"/> at construction, it's possible that this handler instance
+        /// could be invoked concurrently with itself.
+        /// </param>
+        /// <exception cref="ArgumentNullException">The <paramref name="handler"/> is null (<see langword="Nothing" /> in Visual Basic).</exception>
+        public Progress(Action<T> handler) : this()
+        {
+            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        }
+
+        /// <summary>Raised for each reported progress value.</summary>
+        /// <remarks>
+        /// Handlers registered with this event will be invoked on the
+        /// <see cref="SynchronizationContext"/> captured when the instance was constructed.
+        /// </remarks>
+        public event EventHandler<T>? ProgressChanged;
+
+        /// <summary>Reports a progress change.</summary>
+        /// <param name="value">The value of the updated progress.</param>
+        protected virtual void OnReport(T value)
+        {
+            // If there's no handler, don't bother going through the sync context.
+            // Inside the callback, we'll need to check again, in case
+            // an event handler is removed between now and then.
+            Action<T>? handler = _handler;
+            EventHandler<T>? changedEvent = ProgressChanged;
+            if (handler != null || changedEvent != null)
+            {
+                // Post the processing to the sync context.
+                // (If T is a value type, it will get boxed here.)
+                _synchronizationContext?.Post(_invokeHandlers, value);
+            }
+        }
+
+        /// <summary>Reports a progress change.</summary>
+        /// <param name="value">The value of the updated progress.</param>
+        void IProgress<T>.Report(T value) { OnReport(value); }
+
+        /// <summary>Invokes the action and event callbacks.</summary>
+        /// <param name="state">The progress value.</param>
+        private void InvokeHandlers(object? state)
+        {
+            T value = (T)state!;
+
+            Action<T>? handler = _handler;
+            EventHandler<T>? changedEvent = ProgressChanged;
+
+            handler?.Invoke(value);
+            changedEvent?.Invoke(this, value);
+        }
+    }
+
+    /// <summary>Holds static values for <see cref="Progress{T}"/>.</summary>
+    /// <remarks>This avoids one static instance per type T.</remarks>
+    internal static class ProgressStatics
+    {
+        /// <summary>A default synchronization context that targets the ThreadPool.</summary>
+        internal static readonly SynchronizationContext DefaultContext = new();
+    }
+}
+
+#endif

MPF.Frontend/StringEventArgs.cs

@@ -49,4 +49,4 @@ namespace MPF.Frontend
         /// </summary>
         public static implicit operator StringEventArgs(StringBuilder? sb) => new(sb);
     }
-}
+}

MPF.Frontend/Tools/FrontendTool.cs

@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using SabreTools.RedumpLib.Data;
 
 namespace MPF.Frontend.Tools
@@ -48,6 +49,9 @@ namespace MPF.Frontend.Tools
             if (string.IsNullOrEmpty(volumeLabel))
                 return null;
 
+            // Trim the volume label
+            volumeLabel = volumeLabel!.Trim();
+
             // Audio CD
             if (volumeLabel!.Equals("Audio CD", StringComparison.OrdinalIgnoreCase))
                 return RedumpSystem.AudioCD;
@@ -150,8 +154,7 @@ namespace MPF.Frontend.Tools
                 return title;
 
             // If we have an invalid language, assume Language.English
-            if (language == null)
-                language = Language.English;
+            language ??= Language.English;
 
             // Get the title split into parts
             string[] splitTitle = Array.FindAll(title!.Split(' '), s => !string.IsNullOrEmpty(s));
@@ -495,12 +498,20 @@ namespace MPF.Frontend.Tools
                 else if (!itemInserted && segment.EndsWith(":"))
                 {
                     itemInserted = true;
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                    newTitleBuilder.Append($" {segment[..^1]}, {firstItem}:");
+#else
                     newTitleBuilder.Append($" {segment.Substring(0, segment.Length - 1)}, {firstItem}:");
+#endif
                 }
                 else if (!itemInserted && segment.EndsWith("-"))
                 {
                     itemInserted = true;
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                    newTitleBuilder.Append($" {segment[..^1]}, {firstItem}-");
+#else
                     newTitleBuilder.Append($" {segment.Substring(0, segment.Length - 1)}, {firstItem}-");
+#endif
                 }
                 else
                 {
@@ -522,7 +533,6 @@ namespace MPF.Frontend.Tools
         /// <param name="path">Path value to normalize</param>
         public static string NormalizeOutputPaths(string? path, bool getFullPath)
         {
-            // The easy way
             try
             {
                 // If we have an invalid path
@@ -536,21 +546,27 @@ namespace MPF.Frontend.Tools
 
                 // Remove invalid path characters
                 foreach (char c in Path.GetInvalidPathChars())
+                {
                     path = path.Replace(c, '_');
+                }
 
                 // Try getting the combined path and returning that directly
                 string fullPath = getFullPath ? Path.GetFullPath(path) : path;
-                var fullDirectory = Path.GetDirectoryName(fullPath);
-                string fullFile = Path.GetFileName(fullPath);
+                var fullDirectory = Path.GetDirectoryName(fullPath)?.Trim();
+                string fullFile = Path.GetFileName(fullPath).Trim();
 
                 // Remove invalid filename characters
                 foreach (char c in Path.GetInvalidFileNameChars())
+                {
                     fullFile = fullFile.Replace(c, '_');
+                }
 
-                if (string.IsNullOrEmpty(fullDirectory))
-                    return fullFile;
-                else
-                    return Path.Combine(fullDirectory, fullFile);
+                // Rebuild the path, if necessary
+                if (!string.IsNullOrEmpty(fullDirectory))
+                    fullFile = Path.Combine(fullDirectory, fullFile);
+
+                // Remove spaces before and after separators
+                return Regex.Replace(fullFile, @"\s*([\\|/])\s*", @"$1");
             }
             catch { }
 
@@ -660,4 +676,4 @@ namespace MPF.Frontend.Tools
 
         #endregion
     }
-}
+}

MPF.Frontend/Tools/IRDTool.cs

@@ -0,0 +1,99 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using MPF.Processors;
+
+namespace MPF.Frontend.Tools
+{
+    internal static class IRDTool
+    {
+        /// <summary>
+        /// Create an IRD and write it next to the input ISO path
+        /// </summary>
+        /// <param name="isoPath">Path to the original ISO</param>
+        /// <param name="discKeyString">Required hexadecimal disc key as a string</param>
+        /// <param name="discIDString">Optional hexadecimal disc ID as a string</param>
+        /// <param name="picString">Optional string representation of the PIC information</param>
+        /// <param name="layerbreak">Optional disc layerbreak value</param>
+        /// <param name="crc32">Optional ISO CRC-32 value for the Unique ID field</param>
+        /// <returns>True on success, false on error</returns>
+        public static async Task<bool> WriteIRD(string isoPath,
+            string? discKeyString,
+            string? discIDString,
+            string? picString,
+            long? layerbreak,
+            string? crc32)
+        {
+            try
+            {
+                // Parse string values into required formats
+                byte[]? discKey = ProcessingTool.ParseHexKey(discKeyString);
+                byte[]? discID = ProcessingTool.ParseDiscID(discIDString);
+                byte[]? pic = ProcessingTool.ParsePIC(picString);
+                uint? uid = ProcessingTool.ParseCRC32(crc32);
+
+                return await WriteIRD(isoPath, discKey, discID, pic, layerbreak, uid);
+            }
+            catch (Exception)
+            {
+                // Absorb the exception
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Create an IRD and write it next to the input ISO path
+        /// </summary>
+        /// <param name="isoPath">Path to the original ISO</param>
+        /// <param name="discKey">Required hexadecimal disc key as a byte array</param>
+        /// <param name="discID">Optional hexadecimal disc ID as a byte array</param>
+        /// <param name="pic">Optional byte array representation of the PIC information</param>
+        /// <param name="layerbreak">Optional disc layerbreak value</param>
+        /// <param name="uid">Optional ISO CRC-32 value for the Unique ID field</param>
+        /// <returns>True on success, false on error</returns>
+        public static async Task<bool> WriteIRD(string isoPath,
+            byte[]? discKey,
+            byte[]? discID,
+            byte[]? pic,
+            long? layerbreak,
+            uint? uid)
+        {
+            try
+            {
+                // Fail on a missing disc key
+                if (discKey == null)
+                    return false;
+
+                // Output IRD file path
+                string irdPath = Path.ChangeExtension(isoPath, ".ird");
+
+                // Ensure layerbreak value is valid
+                layerbreak = ProcessingTool.ParseLayerbreak(layerbreak);
+
+                // Create Redump-style reproducible IRD
+#if NET40
+                LibIRD.ReIRD ird = await Task.Factory.StartNew(() =>
+#else
+                LibIRD.ReIRD ird = await Task.Run(() =>
+#endif
+                    new LibIRD.ReIRD(isoPath, discKey, layerbreak, uid));
+
+                // Set optional fields if valid
+                if (pic != null)
+                    ird.PIC = pic;
+                if (discID != null && ird.DiscID[15] != 0x00)
+                    ird.DiscID = discID;
+
+                // Write IRD to file
+                ird.Write(irdPath);
+
+                return true;
+            }
+            catch (Exception)
+            {
+                // Absorb the exception
+                return false;
+            }
+        }
+    }
+}

MPF.Frontend/Tools/OptionsLoader.cs

@@ -32,97 +32,6 @@ namespace MPF.Frontend.Tools
 
         #region Arguments
 
-        /// <summary>
-        /// Process any standalone arguments for the program
-        /// </summary>
-        /// <returns>True if one of the arguments was processed, false otherwise</returns>
-        public static bool? ProcessStandaloneArguments(string[] args)
-        {
-            // Help options
-            if (args.Length == 0 || args[0] == "-h" || args[0] == "-?")
-                return null;
-
-            // List options
-            if (args[0] == "-lc" || args[0] == "--listcodes")
-            {
-                Console.WriteLine("Supported Site Codes:");
-                foreach (string siteCode in Extensions.ListSiteCodes())
-                {
-                    Console.WriteLine(siteCode);
-                }
-
-                return true;
-            }
-            else if (args[0] == "-lm" || args[0] == "--listmedia")
-            {
-                Console.WriteLine("Supported Media Types:");
-                foreach (string mediaType in Extensions.ListMediaTypes())
-                {
-                    Console.WriteLine(mediaType);
-                }
-
-                return true;
-            }
-            else if (args[0] == "-lp" || args[0] == "--listprograms")
-            {
-                Console.WriteLine("Supported Programs:");
-                foreach (string program in ListPrograms())
-                {
-                    Console.WriteLine(program);
-                }
-
-                return true;
-            }
-            else if (args[0] == "-ls" || args[0] == "--listsystems")
-            {
-                Console.WriteLine("Supported Systems:");
-                foreach (string system in Extensions.ListSystems())
-                {
-                    Console.WriteLine(system);
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Process common arguments for all functionality
-        /// </summary>
-        /// <returns>True if all arguments pass, false otherwise</returns>
-        public static bool ProcessCommonArguments(string[] args, out MediaType mediaType, out RedumpSystem? system, out string? message)
-        {
-            // All other use requires at least 3 arguments
-            if (args.Length < 3)
-            {
-                mediaType = MediaType.NONE;
-                system = null;
-                message = "Invalid number of arguments";
-                return false;
-            }
-
-            // Check the MediaType
-            mediaType = ToMediaType(args[0].Trim('"'));
-            if (mediaType == MediaType.NONE)
-            {
-                system = null;
-                message = $"{args[0]} is not a recognized media type";
-                return false;
-            }
-
-            // Check the RedumpSystem
-            system = Extensions.ToRedumpSystem(args[1].Trim('"'));
-            if (system == null)
-            {
-                message = $"{args[1]} is not a recognized system";
-                return false;
-            }
-
-            message = null;
-            return true;
-        }
-
         /// <summary>
         /// Get the MediaType enum value for a given string
         /// </summary>
@@ -266,24 +175,6 @@ 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
@@ -297,18 +188,15 @@ namespace MPF.Frontend.Tools
             if (string.IsNullOrEmpty(ConfigurationPath))
                 return new Options();
 
-            // Ensure the file exists
+            // If the file does not exist
             if (!File.Exists(ConfigurationPath) || new FileInfo(ConfigurationPath).Length == 0)
-            {
-                File.Create(ConfigurationPath).Dispose();
                 return new Options();
-            }
 
             var serializer = JsonSerializer.Create();
-            var stream = File.Open(ConfigurationPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-            var reader = new StreamReader(stream);
+            var stream = File.Open(ConfigurationPath, FileMode.Open, FileAccess.Read, FileShare.None);
+            using var reader = new StreamReader(stream);
             var settings = serializer.Deserialize(reader, typeof(Dictionary<string, string?>)) as Dictionary<string, string?>;
-            reader.Dispose();
+
             return new Options(settings);
         }
 
@@ -337,13 +225,11 @@ namespace MPF.Frontend.Tools
                 property.SetValue(options, val, null);
             }
 
-            // Handle a very strange edge case
-            if (!File.Exists(ConfigurationPath))
-                File.Create(ConfigurationPath).Dispose();
-
             var serializer = JsonSerializer.Create();
-            var sw = new StreamWriter(ConfigurationPath) { AutoFlush = true };
+            var stream = File.Open(ConfigurationPath, FileMode.Create, FileAccess.Write, FileShare.None);
+            using var sw = new StreamWriter(stream) { AutoFlush = true };
             var writer = new JsonTextWriter(sw) { Formatting = Formatting.Indented };
+
             serializer.Serialize(writer, options.Settings, typeof(Dictionary<string, string>));
         }
 

MPF.Frontend/Tools/PhysicalTool.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -57,7 +58,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return null;
             }
         }
@@ -93,7 +94,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return null;
             }
 
@@ -149,7 +150,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return false;
             }
         }
@@ -205,7 +206,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is, assume SYSTEM.CNF doesn't exist
+                // Absorb the exception, assume SYSTEM.CNF doesn't exist
             }
 
             // If the SYSTEM.CNF value can't be found, try PSX.EXE
@@ -274,7 +275,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
                 return null;
             }
         }
@@ -306,7 +307,7 @@ namespace MPF.Frontend.Tools
                 }
                 catch
                 {
-                    // We don't care what the error was
+                    // Absorb the exception
                     return null;
                 }
             }
@@ -327,7 +328,7 @@ namespace MPF.Frontend.Tools
                 }
                 catch
                 {
-                    // We don't care what the error was
+                    // Absorb the exception
                     return null;
                 }
             }
@@ -364,7 +365,7 @@ namespace MPF.Frontend.Tools
                 }
                 catch
                 {
-                    // We don't care what the error was
+                    // Absorb the exception
                     return null;
                 }
             }
@@ -385,7 +386,7 @@ namespace MPF.Frontend.Tools
                 }
                 catch
                 {
-                    // We don't care what the error was
+                    // Absorb the exception
                     return null;
                 }
             }
@@ -430,7 +431,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -468,7 +469,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -506,7 +507,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -545,11 +546,11 @@ namespace MPF.Frontend.Tools
 
                     // Read the app.pkg header
                     using var fileStream = new FileStream(appPkgPath, FileMode.Open, FileAccess.Read);
-                    var appPkgHeaderDeserializer = new SabreTools.Serialization.Deserializers.AppPkgHeader();
+                    var appPkgHeaderDeserializer = new SabreTools.Serialization.Readers.AppPkgHeader();
                     var appPkgHeader = appPkgHeaderDeserializer.Deserialize(fileStream);
 
                     if (appPkgHeader != null)
-                        pkgInfo += $"{appPkgHeader.ContentID}" + Environment.NewLine;
+                        pkgInfo += $"{appPkgHeader.ContentID}{Environment.NewLine}";
                 }
 
                 if (pkgInfo == "")
@@ -559,7 +560,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -582,7 +583,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -605,7 +606,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -657,7 +658,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -696,11 +697,11 @@ namespace MPF.Frontend.Tools
 
                     // Read the app_sc.pkg header
                     using var fileStream = new FileStream(appPkgPath, FileMode.Open, FileAccess.Read);
-                    var appPkgHeaderDeserializer = new SabreTools.Serialization.Deserializers.AppPkgHeader();
+                    var appPkgHeaderDeserializer = new SabreTools.Serialization.Readers.AppPkgHeader();
                     var appPkgHeader = appPkgHeaderDeserializer.Deserialize(fileStream);
 
                     if (appPkgHeader != null)
-                        pkgInfo += $"{appPkgHeader.ContentID}" + Environment.NewLine;
+                        pkgInfo += $"{appPkgHeader.ContentID}{Environment.NewLine}";
                 }
 
                 if (pkgInfo == "")
@@ -710,7 +711,7 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error was
+                // Absorb the exception
                 return null;
             }
         }
@@ -726,11 +727,11 @@ namespace MPF.Frontend.Tools
         /// <returns>Filenames if possible, null on error</returns>
         public static string? GetXboxFilenames(Drive? drive)
         {
-            // If there's no drive path, we can't get BEE flag
+            // If there's no drive path, can't do anything
             if (string.IsNullOrEmpty(drive?.Name))
                 return null;
 
-            // If the folder no longer exists, we can't get exe name
+            // If the folder no longer exists, can't do anything
             if (!Directory.Exists(drive!.Name))
                 return null;
 
@@ -747,7 +748,59 @@ namespace MPF.Frontend.Tools
             }
             catch
             {
-                // We don't care what the error is
+                // Absorb the exception
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get Title ID(s) for Xbox One and Xbox Series X
+        /// </summary>
+        /// <param name="drive">Drive to extract information from</param>
+        /// <returns>Title ID(s) if possible, null on error</returns>
+        public static string? GetXboxTitleID(Drive? drive)
+        {
+            // If there's no drive path, can't do anything
+            if (string.IsNullOrEmpty(drive?.Name))
+                return null;
+
+            // If the folder no longer exists, can't do anything
+            if (!Directory.Exists(drive!.Name))
+                return null;
+
+            // Get the catalog.js path
+#if NET20 || NET35
+            string catalogjs = Path.Combine(drive.Name, Path.Combine("MSXC", Path.Combine("Metadata", "catalog.js")));
+#else
+            string catalogjs = Path.Combine(drive.Name, "MSXC", "Metadata", "catalog.js");
+#endif
+            // Check catalog.js exists
+            if (!File.Exists(catalogjs))
+                return null;
+
+            // Deserialize catalog.js and extract Title ID(s)
+            try
+            {
+                var catalog = new SabreTools.Serialization.Readers.Catalog().Deserialize(catalogjs);
+                if (catalog == null)
+                    return null;
+                if (!string.IsNullOrEmpty(catalog.TitleID))
+                    return catalog.TitleID;
+                if (catalog.Packages == null)
+                    return null;
+
+                List<string> titleIDs = [];
+                foreach (var package in catalog.Packages)
+                {
+                    if (package?.TitleID != null)
+                        titleIDs.Add(package.TitleID);
+                }
+
+                return string.Join(", ", [.. titleIDs]);
+            }
+            catch
+            {
+                // Absorb the exception
                 return null;
             }
         }
@@ -815,4 +868,4 @@ namespace MPF.Frontend.Tools
         #endregion
 
     }
-}
+}

MPF.Frontend/Tools/ProtectionTool.cs

@@ -65,6 +65,72 @@ namespace MPF.Frontend.Tools
             #endregion
         ];
 
+        /// <summary>
+        /// Run comprehensive protection scans based on both the
+        /// physical media as well as the image
+        /// </summary>
+        /// <param name="basePath">Base output image path</param>
+        /// <param name="drive">Drive object representing the current drive</param>
+        /// <param name="options">Options object that determines what to scan</param>
+        /// <param name="progress">Optional progress callback</param>
+        public async static Task<Dictionary<string, List<string>>> RunCombinedProtectionScans(string basePath,
+            Drive? drive,
+            Options options,
+            IProgress<ProtectionProgress>? protectionProgress = null)
+        {
+            // Setup the output protections dictionary
+            Dictionary<string, List<string>> protections = [];
+
+            // Scan the disc image, if possible
+            if (File.Exists($"{basePath}.iso"))
+            {
+                var imageProtections = await RunProtectionScanOnImage($"{basePath}.iso", options, protectionProgress);
+                MergeDictionaries(protections, imageProtections);
+            }
+            else if (File.Exists($"{basePath}.bin"))
+            {
+                var imageProtections = await RunProtectionScanOnImage($"{basePath}.bin", options, protectionProgress);
+                MergeDictionaries(protections, imageProtections);
+            }
+            else if (File.Exists($"{basePath}.cue"))
+            {
+                string[] cueLines = File.ReadAllLines($"{basePath}.cue");
+                foreach (string cueLine in cueLines)
+                {
+                    // Skip all non-FILE lines
+                    if (!cueLine.StartsWith("FILE"))
+                        continue;
+
+                    // Extract the information
+                    var match = Regex.Match(cueLine, @"FILE ""(.*?)"" BINARY");
+                    if (!match.Success || match.Groups.Count == 0)
+                        continue;
+
+                    // Get the track name from the matches
+                    string trackName = match.Groups[1].Value;
+                    trackName = Path.GetFileNameWithoutExtension(trackName);
+                    string baseDir = Path.GetDirectoryName(basePath) ?? string.Empty;
+                    string trackPath = Path.Combine(baseDir, trackName);
+
+                    // Scan the track for protections, if it exists
+                    if (File.Exists($"{trackPath}.bin"))
+                    {
+                        var trackProtections = await RunProtectionScanOnImage($"{trackPath}.bin", options, protectionProgress);
+                        MergeDictionaries(protections, trackProtections);
+                    }
+                }
+            }
+
+            // Scan the mounted drive path
+            if (drive?.Name != null)
+            {
+                var driveProtections = await RunProtectionScanOnPath(drive.Name, options, protectionProgress);
+                MergeDictionaries(protections, driveProtections);
+            }
+
+            return protections;
+        }
+
         /// <summary>
         /// Run protection scan on a given path
         /// </summary>
@@ -72,7 +138,7 @@ namespace MPF.Frontend.Tools
         /// <param name="options">Options object that determines what to scan</param>
         /// <param name="progress">Optional progress callback</param>
         /// <returns>Set of all detected copy protections with an optional error string</returns>
-        public static async Task<ProtectionDictionary> RunProtectionScanOnPath(string path,
+        public static async Task<Dictionary<string, List<string>>> RunProtectionScanOnPath(string path,
             Options options,
             IProgress<ProtectionProgress>? progress = null)
         {
@@ -97,8 +163,41 @@ namespace MPF.Frontend.Tools
             if (found == null || found.Count == 0)
                 return [];
 
-            // Filter out any empty protections
-            found.ClearEmptyKeys();
+            // Return the filtered set of protections
+            return found;
+        }
+
+        /// <summary>
+        /// Run protection scan on a disc image
+        /// </summary>
+        /// <param name="image">Image path to scan for protection</param>
+        /// <param name="options">Options object that determines what to scan</param>
+        /// <param name="progress">Optional progress callback</param>
+        /// <returns>Set of all detected copy protections with an optional error string</returns>
+        public static async Task<Dictionary<string, List<string>>> RunProtectionScanOnImage(string image,
+            Options options,
+            IProgress<ProtectionProgress>? progress = null)
+        {
+#if NET40
+            var found = await Task.Factory.StartNew(() =>
+#else
+            var found = await Task.Run(() =>
+#endif
+            {
+                var scanner = new Scanner(
+                    scanArchives: false, // Disable extracting disc images for now
+                    scanContents: false, // Disabled for image scanning
+                    scanPaths: false, // Disabled for image scanning
+                    scanSubdirectories: false, // Disabled for image scanning
+                    options.IncludeDebugProtectionInformation,
+                    progress);
+
+                return scanner.GetProtections(image);
+            });
+
+            // If nothing was returned, return
+            if (found == null || found.Count == 0)
+                return [];
 
             // Return the filtered set of protections
             return found;
@@ -108,15 +207,21 @@ namespace MPF.Frontend.Tools
         /// Format found protections to a deduplicated, ordered string
         /// </summary>
         /// <param name="protections">Dictionary of file to list of protection mappings</param>
+        /// <param name="drive">Drive object representing the current drive</param>
         /// <returns>Detected protections, if any</returns>
-        public static string? FormatProtections(ProtectionDictionary? protections)
+        public static string? FormatProtections(Dictionary<string, List<string>>? protections, Drive? drive)
         {
             // If the filtered list is empty in some way, return
             if (protections == null)
-                return "(CHECK WITH PROTECTIONID)";
-            else if (protections.Count == 0)
+                return "[EXTERNAL SCAN NEEDED]";
+            else if (protections.Count == 0 && drive?.Name == null)
+                return "Mounted disc path missing [EXTERNAL SCAN NEEDED]";
+            else if (protections.Count == 0 && drive?.Name != null)
                 return "None found [OMIT FROM SUBMISSION]";
 
+            // Sanitize context-sensitive protections
+            protections = SanitizeContextSensitiveProtections(protections);
+
             // Get a list of distinct found protections
 #if NET20
             var protectionValues = new List<string>();
@@ -124,7 +229,7 @@ namespace MPF.Frontend.Tools
             {
                 if (value.Count == 0)
                     continue;
-                
+
                 foreach (var prot in value)
                 {
                     if (!protectionValues.Contains(prot))
@@ -166,7 +271,7 @@ namespace MPF.Frontend.Tools
                 try
                 {
                     var antiModchip = new BinaryObjectScanner.Protection.PSXAntiModchip();
-                    foreach (string file in IOExtensions.SafeGetFiles(path!, "*", SearchOption.AllDirectories))
+                    foreach (string file in path!.SafeGetFiles("*", SearchOption.AllDirectories))
                     {
                         try
                         {
@@ -184,6 +289,66 @@ namespace MPF.Frontend.Tools
             });
         }
 
+        /// <summary>
+        /// Sanitize unnecessary protections where context matters
+        /// </summary>
+        /// <param name="protections">Dictionary of file to list of protection mappings</param>
+        /// <returns>Dictionary with all necessary items filtered out</returns>
+        public static Dictionary<string, List<string>> SanitizeContextSensitiveProtections(Dictionary<string, List<string>> protections)
+        {
+            // Setup the output dictionary
+            Dictionary<string, List<string>> filtered = [];
+
+            // Setup a list for keys that need additional processing
+            List<string> foundKeys = [];
+
+            // Loop through the keys and add relevant ones
+            string[] paths = [.. protections.Keys];
+            foreach (var path in paths)
+            {
+                if (!protections.TryGetValue(path, out var values) || values == null || values.Count == 0)
+                    continue;
+
+                // Always copy the values if they're valid
+                filtered[path] = values;
+
+                if (values.Exists(s => s.StartsWith("SecuROM Release Control -")))
+                    foundKeys.Add(path);
+            }
+
+            // If there are no keys found
+            if (foundKeys.Count == 0)
+                return filtered;
+
+            // Process the keys as necessary
+            foreach (var key in foundKeys)
+            {
+                // Get all matching paths
+                var matchingPaths = Array.FindAll(paths, s => s != key && s.StartsWith(key));
+                if (matchingPaths.Length == 0)
+                    continue;
+
+                // Loop through the matching paths
+                foreach (var path in matchingPaths)
+                {
+                    if (!filtered.TryGetValue(path, out var values) || values == null || values.Count == 0)
+                        continue;
+
+                    if (values.Exists(s => !s.Contains("GitHub") &&
+                        (s.Contains("SecuROM 7")
+                            || s.Contains("SecuROM 8")
+                            || s.Contains("SecuROM Content Activation")
+                            || s.Contains("SecuROM Data File Activation")
+                            || s.Contains("Unlock"))))
+                    {
+                        filtered.Remove(path);
+                    }
+                }
+            }
+
+            return filtered;
+        }
+
         /// <summary>
         /// Sanitize unnecessary protection duplication from output
         /// </summary>
@@ -200,7 +365,12 @@ namespace MPF.Frontend.Tools
             // EXCEPTIONS
             if (foundProtections.Exists(p => p.StartsWith("[Exception opening file")))
             {
-                foundProtections = foundProtections.FindAll(p => !p.StartsWith("[Exception opening file"));
+                foundProtections = foundProtections.FindAll(p => !p.StartsWith("[Exception opening file") && !p.StartsWith("[Access issue when opening file"));
+                foundProtections.Add("Exception occurred while scanning [RESCAN NEEDED]");
+            }
+            if (foundProtections.Exists(p => p.StartsWith("[Access issue when opening file")))
+            {
+                foundProtections = foundProtections.FindAll(p => !p.StartsWith("[Exception opening file") && !p.StartsWith("[Access issue when opening file"));
                 foundProtections.Add("Exception occurred while scanning [RESCAN NEEDED]");
             }
 
@@ -310,9 +480,8 @@ namespace MPF.Frontend.Tools
 
                 // Best case scenario for SafeDisc 2+: A full SafeDisc version is found in a line starting with "Macrovision Protected Application".
                 // All other SafeDisc detections can be safely scrubbed.
-                // TODO: Scrub "Macrovision Protected Application, " from before the SafeDisc version.
                 if (foundProtections.Exists(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)
-                        && p.StartsWith("Macrovision Protected Application")
+                        && p.Contains("Macrovision Protected Application")
                         && !p.Contains("SRV Tool APP")))
                 {
                     foundProtections = foundProtections.FindAll(p => !p.StartsWith("Macrovision Protection File"))
@@ -326,11 +495,14 @@ namespace MPF.Frontend.Tools
                         .FindAll(p => p != "SafeDisc 1/Lite")
                         .FindAll(p => p != "SafeDisc 2+")
                         .FindAll(p => p != "SafeDisc 3+ (DVD)");
+                    foundProtections = foundProtections.ConvertAll(p => p
+                            .Replace("Macrovision Protected Application, ", string.Empty)
+                            .Replace(", Macrovision Protected Application", string.Empty));
                 }
 
                 // Next best case for SafeDisc 2+: A full SafeDisc version is found from the "SafeDisc SRV Tool APP".
                 else if (foundProtections.Exists(p => Regex.IsMatch(p, @"SafeDisc [0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)
-                        && p.StartsWith("Macrovision Protected Application")
+                        && p.Contains("Macrovision Protected Application")
                         && p.Contains("SRV Tool APP")))
                 {
                     foundProtections = foundProtections.FindAll(p => !p.StartsWith("Macrovision Protection File"))
@@ -360,7 +532,7 @@ namespace MPF.Frontend.Tools
                     .FindAll(p => p != "SafeDisc 2+");
                 }
 
-                // Best case for SafeDisc 1.X: A full SafeDisc version is found that isn't part of a version range. 
+                // Best case for SafeDisc 1.X: A full SafeDisc version is found that isn't part of a version range.
                 else if (foundProtections.Exists(p => Regex.IsMatch(p, @"SafeDisc 1\.[0-9]{2}\.[0-9]{3}$", RegexOptions.Compiled)
                         && !Regex.IsMatch(p, @"SafeDisc 1\.[0-9]{2}\.[0-9]{3}-[0-9]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)))
                 {
@@ -374,7 +546,6 @@ namespace MPF.Frontend.Tools
                 }
 
                 // Next best case for SafeDisc 1: A SafeDisc version range is found from "SECDRV.SYS".
-                // TODO: Scrub "Macrovision Security Driver {Version}" from before the SafeDisc version.
                 else if (foundProtections.Exists(p => p.StartsWith("Macrovision Security Driver")
                         && Regex.IsMatch(p, @"SafeDisc 1\.[0-9]{2}\.[0-9]{3}-[1-2]\.[0-9]{2}\.[0-9]{3}", RegexOptions.Compiled)
                         || Regex.IsMatch(p, @"SafeDisc 1\.[0-9]{2}\.[0-9]{3}$")))
@@ -386,10 +557,12 @@ namespace MPF.Frontend.Tools
                         .FindAll(p => p != "SafeDisc")
                         .FindAll(p => p != "SafeDisc 1")
                         .FindAll(p => p != "SafeDisc 1/Lite");
+                    foundProtections = foundProtections.ConvertAll(p => p.StartsWith("Macrovision Security Driver") && p.Split('/').Length > 1
+                        ? p.Split('/')[1].TrimStart()
+                        : p);
                 }
 
                 // Next best case for SafeDisc 2+: A SafeDisc version range is found from "SECDRV.SYS".
-                // TODO: Scrub "Macrovision Security Driver {Version}" from before the SafeDisc version.
                 else if (foundProtections.Exists(p => p.StartsWith("Macrovision Security Driver")))
                 {
                     foundProtections = foundProtections.FindAll(p => !p.StartsWith("Macrovision Protection File"))
@@ -401,6 +574,9 @@ namespace MPF.Frontend.Tools
                         .FindAll(p => p != "SafeDisc 1/Lite")
                         .FindAll(p => p != "SafeDisc 2+")
                         .FindAll(p => p != "SafeDisc 3+ (DVD)");
+                    foundProtections = foundProtections.ConvertAll(p => p.StartsWith("Macrovision Security Driver") && p.Split('/').Length > 1
+                        ? p.Split('/')[1].TrimStart()
+                        : p);
                 }
 
                 // Only SafeDisc Lite is found.
@@ -429,7 +605,11 @@ namespace MPF.Frontend.Tools
             }
 
             // SecuROM
-            // TODO: Figure this one out
+            if (foundProtections.Exists(p => p.StartsWith("SecuROM Release Control")))
+            {
+                foundProtections = foundProtections.FindAll(p => !p.StartsWith("SecuROM Release Control"));
+                foundProtections.Add("SecuROM Release Control");
+            }
 
             // SolidShield
             // TODO: Figure this one out
@@ -461,6 +641,12 @@ namespace MPF.Frontend.Tools
                 }
             }
 
+            if (foundProtections.Exists(p => p.StartsWith("StarForce Keyless")))
+            {
+                foundProtections = foundProtections.FindAll(p => !p.StartsWith("StarForce Keyless"));
+                foundProtections.Add("StarForce Keyless");
+            }
+
             // Sysiphus
             if (foundProtections.Exists(p => p == "Sysiphus")
                 && foundProtections.Exists(p => p.StartsWith("Sysiphus") && p.Length > "Sysiphus".Length))
@@ -482,5 +668,31 @@ namespace MPF.Frontend.Tools
             foundProtections.Sort();
             return string.Join(", ", [.. foundProtections]);
         }
+
+        /// <summary>
+        /// Merge two dictionaries together based on keys
+        /// </summary>
+        /// <param name="original">Source dictionary to add to</param>
+        /// <param name="add">Second dictionary to add from</param>
+        /// TODO: Remove from here when IO is updated
+        private static void MergeDictionaries(Dictionary<string, List<string>> original, Dictionary<string, List<string>> add)
+        {
+            // Ignore if there are no values to append
+            if (add.Count == 0)
+                return;
+
+            // Loop through and add from the new dictionary
+            foreach (var kvp in add)
+            {
+                // Ignore empty values
+                if (kvp.Value.Count == 0)
+                    continue;
+
+                if (!original.ContainsKey(kvp.Key))
+                    original[kvp.Key] = [];
+
+                original[kvp.Key].AddRange(kvp.Value);
+            }
+        }
     }
 }

MPF.Frontend/Tools/SubmissionGenerator.cs

@@ -10,6 +10,7 @@ using BinaryObjectScanner;
 using MPF.Processors;
 using SabreTools.RedumpLib;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Data.Sections;
 using SabreTools.RedumpLib.Web;
 
 namespace MPF.Frontend.Tools
@@ -51,23 +52,34 @@ namespace MPF.Frontend.Tools
             IProgress<ResultEventArgs>? resultProgress = null,
             IProgress<ProtectionProgress>? protectionProgress = null)
         {
-            // Ensure the current disc combination should exist
-            if (!system.MediaTypes().Contains(mediaType))
-                return null;
-
             // Split the output path for easier use
             var outputDirectory = Path.GetDirectoryName(outputPath);
             string outputFilename = Path.GetFileName(outputPath);
 
+            // If a standard log zip was provided, replace the suffix with ".tmp" for easier processing
+            if (outputFilename.EndsWith("_logs.zip", StringComparison.OrdinalIgnoreCase))
+            {
+                int zipSuffixIndex = outputFilename.LastIndexOf("_logs.zip", StringComparison.OrdinalIgnoreCase);
+#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER
+                outputFilename = outputFilename[..zipSuffixIndex] + ".tmp";
+#else
+                outputFilename = outputFilename.Substring(0, zipSuffixIndex) + ".tmp";
+#endif
+            }
+
             // Check that all of the relevant files are there
-            List<string> missingFiles = processor.FoundAllFiles(outputDirectory, outputFilename);
+            List<string> missingFiles = processor.FoundAllFiles(mediaType, outputDirectory, outputFilename);
             if (missingFiles.Count > 0)
             {
-                resultProgress?.Report(ResultEventArgs.Failure($"There were files missing from the output:\n{string.Join("\n", [.. missingFiles])}"));
-                resultProgress?.Report(ResultEventArgs.Failure($"This may indicate an issue with the hardware or media, including unsupported devices.\nPlease see dumping program documentation for more details."));
+                resultProgress?.Report(ResultEventArgs.Failure($"There were files missing from the output:\n{string.Join("\n", [.. missingFiles])}\nThis may indicate an issue with the hardware or media, including unsupported devices.\nPlease see dumping program documentation for more details."));
                 return null;
             }
 
+            // Extract files from existing log archive, if it exists
+#if NET462_OR_GREATER || NETCOREAPP
+            processor.ExtractFromLogs(mediaType, outputDirectory, outputFilename);
+#endif
+
             // Assemble a base path
             string basePath = Path.GetFileNameWithoutExtension(outputFilename);
             if (!string.IsNullOrEmpty(outputDirectory))
@@ -77,22 +89,28 @@ namespace MPF.Frontend.Tools
             SubmissionInfo info = CreateDefaultSubmissionInfo(processor, system, mediaType, options.AddPlaceholders);
 
             // Get specific tool output handling
-            processor?.GenerateSubmissionInfo(info, basePath, options.EnableRedumpCompatibility);
+            processor.GenerateSubmissionInfo(info, mediaType, basePath, options.EnableRedumpCompatibility);
             if (options.IncludeArtifacts)
-                info.Artifacts = processor?.GenerateArtifacts(outputDirectory, outputFilename);
+                info.Artifacts = processor.GenerateArtifacts(mediaType, outputDirectory, outputFilename);
 
             // Get a list of matching IDs for each line in the DAT
-            if (!string.IsNullOrEmpty(info.TracksAndWriteOffsets!.ClrMameProData) && options.HasRedumpLogin)
-                _ = await FillFromRedump(options, info, resultProgress);
+            if (!string.IsNullOrEmpty(info.TracksAndWriteOffsets.ClrMameProData))
+            {
+                bool filledInfo = await FillFromRedump(options, info, resultProgress);
+
+                // Add a placeholder for the logs link if not a verification
+                if (!filledInfo)
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.LogsLink] = "[Please provide a link to your logs here]";
+            }
 
             // If we have both ClrMamePro and Size and Checksums data, remove the ClrMamePro
-            if (!string.IsNullOrEmpty(info.SizeAndChecksums?.CRC32))
+            if (!string.IsNullOrEmpty(info.SizeAndChecksums.CRC32))
                 info.TracksAndWriteOffsets.ClrMameProData = null;
 
             // Add the volume label to comments, if possible or necessary
-            string? volLabels = FormatVolumeLabels(drive?.VolumeLabel, processor?.VolumeLabels);
+            string? volLabels = FormatVolumeLabels(drive?.VolumeLabel, processor.VolumeLabels);
             if (volLabels != null)
-                info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.VolumeLabel] = volLabels;
+                info.CommonDiscInfo.CommentsSpecialFields[SiteCode.VolumeLabel] = volLabels;
 
             // Extract info based generically on MediaType
             ProcessMediaType(info, mediaType, options.AddPlaceholders);
@@ -101,7 +119,7 @@ namespace MPF.Frontend.Tools
             ProcessSystem(info, system, drive, options.AddPlaceholders, processor is DiscImageCreator, basePath);
 
             // Run anti-modchip check, if necessary
-            if (drive != null && system.SupportsAntiModchipScans() && info.CopyProtection!.AntiModchip == YesNo.NULL)
+            if (drive != null && system.SupportsAntiModchipScans() && info.CopyProtection.AntiModchip == YesNo.NULL)
             {
                 resultProgress?.Report(ResultEventArgs.Success("Checking for anti-modchip strings... this might take a while!"));
                 info.CopyProtection.AntiModchip = await ProtectionTool.GetPlayStationAntiModchipDetected(drive?.Name) ? YesNo.Yes : YesNo.No;
@@ -113,15 +131,21 @@ namespace MPF.Frontend.Tools
             {
                 resultProgress?.Report(ResultEventArgs.Success("Running copy protection scan... this might take a while!"));
 
-                ProtectionDictionary? protections = null;
                 try
                 {
-                    if (options.ScanForProtection && drive?.Name != null)
-                        protections = await ProtectionTool.RunProtectionScanOnPath(drive.Name, options, protectionProgress);
+                    Dictionary<string, List<string>>? protections = null;
+                    if (options.ScanForProtection)
+                    {
+                        // Explicitly note missing/invalid device paths
+                        if (drive?.Name == null)
+                            resultProgress?.Report(ResultEventArgs.Success("No mounted device path found, protection outputs may be incomplete!"));
 
-                    var protectionString = ProtectionTool.FormatProtections(protections);
+                        protections = await ProtectionTool.RunCombinedProtectionScans(basePath, drive, options, protectionProgress);
+                    }
 
-                    info.CopyProtection!.Protection += protectionString;
+                    var protectionString = ProtectionTool.FormatProtections(protections, drive);
+
+                    info.CopyProtection.Protection += protectionString;
                     info.CopyProtection.FullProtections = ReformatProtectionDictionary(protections);
                     resultProgress?.Report(ResultEventArgs.Success("Copy protection scan complete!"));
                 }
@@ -132,8 +156,8 @@ namespace MPF.Frontend.Tools
             }
 
             // Set fields that may have automatic filling otherwise
-            info.CommonDiscInfo!.Category ??= DiscCategory.Games;
-            info.VersionAndEditions!.Version ??= options.AddPlaceholders ? RequiredIfExistsValue : string.Empty;
+            info.CommonDiscInfo.Category ??= DiscCategory.Games;
+            info.VersionAndEditions.Version ??= options.AddPlaceholders ? RequiredIfExistsValue : string.Empty;
 
             // Comments and contents have odd handling
             if (string.IsNullOrEmpty(info.CommonDiscInfo.Comments))
@@ -157,27 +181,28 @@ namespace MPF.Frontend.Tools
             SubmissionInfo info,
             IProgress<ResultEventArgs>? resultProgress = null)
         {
-            // If no username is provided
-            if (string.IsNullOrEmpty(options.RedumpUsername) || string.IsNullOrEmpty(options.RedumpPassword))
+            // If information should not be pulled at all
+            if (!options.RetrieveMatchInformation)
                 return false;
 
             // Set the current dumper based on username
-            info.DumpersAndStatus ??= new DumpersAndStatusSection();
-            info.DumpersAndStatus.Dumpers = [options.RedumpUsername!];
+            info.DumpersAndStatus.Dumpers = [options.RedumpUsername ?? "Anonymous User"];
             info.PartiallyMatchedIDs = [];
 
-            // Login to Redump
+            // Login to Redump, if possible
             var wc = new RedumpClient();
-            bool? loggedIn = await wc.Login(options.RedumpUsername ?? string.Empty, options.RedumpPassword ?? string.Empty);
-            if (loggedIn == null)
+            if (!string.IsNullOrEmpty(options.RedumpUsername) && !string.IsNullOrEmpty(options.RedumpPassword))
             {
-                resultProgress?.Report(ResultEventArgs.Failure("There was an unknown error connecting to Redump"));
-                return false;
-            }
-            else if (loggedIn == false)
-            {
-                // Don't log the as a failure or error
-                return false;
+                bool? loggedIn = await wc.Login(options.RedumpUsername!, options.RedumpPassword!);
+                if (loggedIn == null)
+                {
+                    resultProgress?.Report(ResultEventArgs.Failure("There was an unknown error connecting to Redump, skipping..."));
+                    return false;
+                }
+                else if (loggedIn == false)
+                {
+                    resultProgress?.Report(ResultEventArgs.Failure("Provided Redump credentials were invalid, not using..."));
+                }
             }
 
             // Setup the checks
@@ -186,7 +211,7 @@ namespace MPF.Frontend.Tools
 
             // Loop through all of the hashdata to find matching IDs
             resultProgress?.Report(ResultEventArgs.Success("Finding disc matches on Redump..."));
-            var splitData = info.TracksAndWriteOffsets?.ClrMameProData?.TrimEnd('\n')?.Split('\n');
+            var splitData = info.TracksAndWriteOffsets.ClrMameProData?.TrimEnd('\n')?.Split('\n');
             int trackCount = splitData?.Length ?? 0;
             foreach (string hashData in splitData ?? [])
             {
@@ -383,8 +408,6 @@ namespace MPF.Frontend.Tools
                 },
             };
 
-            // Ensure that required sections exist
-            info = Builder.EnsureAllSections(info);
             return info;
         }
 
@@ -454,6 +477,11 @@ namespace MPF.Frontend.Tools
             if (driveLabel != null && driveLabel.Length == 0)
                 driveLabel = null;
 
+            // Treat "path" labels as null -- Indicates a mounted path
+            // This can over-match if a label contains a directory separator somehow
+            if (driveLabel != null && (driveLabel.Contains("/") || driveLabel.Contains("\\")))
+                driveLabel = null;
+
             // Must have at least one label to format
             if (driveLabel == null && (labels == null || labels.Count == 0))
                 return null;
@@ -569,7 +597,7 @@ namespace MPF.Frontend.Tools
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -582,9 +610,9 @@ namespace MPF.Frontend.Tools
                 case MediaType.BluRay:
 
                     // If we have a single-layer disc
-                    if (info.SizeAndChecksums!.Layerbreak == default)
+                    if (info.SizeAndChecksums.Layerbreak == default)
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -592,9 +620,9 @@ namespace MPF.Frontend.Tools
                         info.CommonDiscInfo.Layer0AdditionalMould = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     }
                     // If we have a dual-layer disc
-                    else if (info.SizeAndChecksums!.Layerbreak2 == default)
+                    else if (info.SizeAndChecksums.Layerbreak2 == default)
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -606,9 +634,9 @@ namespace MPF.Frontend.Tools
                         info.CommonDiscInfo.Layer1MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     }
                     // If we have a triple-layer disc
-                    else if (info.SizeAndChecksums!.Layerbreak3 == default)
+                    else if (info.SizeAndChecksums.Layerbreak3 == default)
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -626,7 +654,7 @@ namespace MPF.Frontend.Tools
                     // If we have a quad-layer disc
                     else
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -649,22 +677,22 @@ namespace MPF.Frontend.Tools
                     break;
 
                 case MediaType.NintendoGameCubeGameDisc:
-                    info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer1MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0AdditionalMould = addPlaceholders ? RequiredIfExistsValue : string.Empty;
-                    info.Extras!.BCA ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.Extras.BCA ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case MediaType.NintendoWiiOpticalDisc:
                 case MediaType.NintendoWiiUOpticalDisc:
 
                     // If we have a single-layer disc
-                    if (info.SizeAndChecksums!.Layerbreak == default)
+                    if (info.SizeAndChecksums.Layerbreak == default)
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -674,7 +702,7 @@ namespace MPF.Frontend.Tools
                     // If we have a dual-layer disc
                     else
                     {
-                        info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                         info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -686,14 +714,14 @@ namespace MPF.Frontend.Tools
                         info.CommonDiscInfo.Layer1MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     }
 
-                    info.Extras!.DiscKey = addPlaceholders ? RequiredValue : string.Empty;
+                    info.Extras.DiscKey = addPlaceholders ? RequiredValue : string.Empty;
                     info.Extras.BCA ??= addPlaceholders ? RequiredValue : string.Empty;
 
                     break;
 
                 case MediaType.UMD:
                     // Both single- and dual-layer discs have two "layers" for the ring
-                    info.CommonDiscInfo!.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0MasteringRing = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer0MouldSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
@@ -702,10 +730,10 @@ namespace MPF.Frontend.Tools
                     info.CommonDiscInfo.Layer1MasteringSID = addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     info.CommonDiscInfo.Layer1ToolstampMasteringCode = addPlaceholders ? RequiredIfExistsValue : string.Empty;
 
-                    info.SizeAndChecksums!.CRC32 ??= (addPlaceholders ? RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
+                    info.SizeAndChecksums.CRC32 ??= (addPlaceholders ? RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
                     info.SizeAndChecksums.MD5 ??= (addPlaceholders ? RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
                     info.SizeAndChecksums.SHA1 ??= (addPlaceholders ? RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
-                    info.TracksAndWriteOffsets!.ClrMameProData = null;
+                    info.TracksAndWriteOffsets.ClrMameProData = null;
                     break;
             }
 
@@ -721,85 +749,85 @@ namespace MPF.Frontend.Tools
             switch (system)
             {
                 case RedumpSystem.AcornArchimedes:
-                    info.CommonDiscInfo!.Region ??= Region.UnitedKingdom;
+                    info.CommonDiscInfo.Region ??= Region.UnitedKingdom;
                     break;
 
                 case RedumpSystem.AudioCD:
                 case RedumpSystem.DVDAudio:
                 case RedumpSystem.EnhancedCD:
                 case RedumpSystem.SuperAudioCD:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Audio;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Audio;
                     break;
 
                 case RedumpSystem.BandaiPlaydiaQuickInteractiveSystem:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     info.CommonDiscInfo.Region ??= info.CommonDiscInfo.Region ?? Region.Japan;
                     break;
 
                 case RedumpSystem.BDVideo:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Video;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Video;
                     bool bee = PhysicalTool.GetBusEncryptionEnabled(drive);
-                    if (bee && string.IsNullOrEmpty(info.CopyProtection!.Protection))
+                    if (bee && string.IsNullOrEmpty(info.CopyProtection.Protection))
                         info.CopyProtection.Protection = "Bus encryption enabled flag set";
                     else if (bee)
-                        info.CopyProtection!.Protection += "\nBus encryption enabled flag set";
+                        info.CopyProtection.Protection += "\nBus encryption enabled flag set";
                     else
-                        info.CopyProtection!.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                        info.CopyProtection.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
 
                     break;
 
                 case RedumpSystem.DVDVideo:
                 case RedumpSystem.HDDVDVideo:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Video;
-                    info.CopyProtection!.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Video;
+                    info.CopyProtection.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     break;
 
                 case RedumpSystem.CommodoreAmigaCD:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.CommodoreAmigaCD32:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     info.CommonDiscInfo.Region ??= Region.Europe;
                     break;
 
                 case RedumpSystem.CommodoreAmigaCDTV:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     info.CommonDiscInfo.Region ??= Region.Europe;
                     break;
 
                 case RedumpSystem.FujitsuFMTownsseries:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.FujitsuFMTownsMarty:
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.HasbroVideoNow:
                 case RedumpSystem.HasbroVideoNowColor:
                 case RedumpSystem.HasbroVideoNowJr:
                 case RedumpSystem.VideoCD:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Video;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Video;
                     break;
 
                 case RedumpSystem.HasbroVideoNowXP:
                 case RedumpSystem.PhotoCD:
                 case RedumpSystem.SonyElectronicBook:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Multimedia;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Multimedia;
                     break;
 
                 case RedumpSystem.IncredibleTechnologiesEagle:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.KonamieAmusement:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.KonamiFireBeat:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.KonamiPython2:
@@ -807,89 +835,91 @@ namespace MPF.Frontend.Tools
 
                     // TODO: Remove this hack when DIC supports build date output
                     if (isDiscImageCreator)
-                        info.CommonDiscInfo!.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", kp2Exe);
+                        info.CommonDiscInfo.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", kp2Exe);
 
                     SetCommentFieldIfNotExists(info, SiteCode.InternalSerialName, drive, PhysicalTool.GetPlayStationSerial);
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, kp2Exe, fixTwoDigitYear: true);
+                    info.CommonDiscInfo.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, kp2Exe, fixTwoDigitYear: true);
 
                     if (CommentFieldExists(info, SiteCode.InternalSerialName, out kp2Exe))
-                        info.CommonDiscInfo!.Region = ProcessingTool.GetPlayStationRegion(kp2Exe);
+                        info.CommonDiscInfo.Region = ProcessingTool.GetPlayStationRegion(kp2Exe);
 
                     SetVersionIfNotExists(info, drive, PhysicalTool.GetPlayStation2Version);
                     break;
 
                 case RedumpSystem.KonamiSystemGV:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.KonamiSystem573:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.KonamiTwinkle:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.MattelHyperScan:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.MicrosoftXboxOne:
-                    info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.Filename] = PhysicalTool.GetXboxFilenames(drive) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename] = PhysicalTool.GetXboxFilenames(drive) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.TitleID] = PhysicalTool.GetXboxTitleID(drive) ?? string.Empty;
                     break;
 
                 case RedumpSystem.MicrosoftXboxSeriesXS:
-                    info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.Filename] = PhysicalTool.GetXboxFilenames(drive) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename] = PhysicalTool.GetXboxFilenames(drive) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.TitleID] = PhysicalTool.GetXboxTitleID(drive) ?? string.Empty;
                     break;
 
                 case RedumpSystem.NamcoSegaNintendoTriforce:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.NavisoftNaviken21:
-                    info.CommonDiscInfo!.EXEDateBuildDate = addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate = addPlaceholders ? RequiredValue : string.Empty;
                     info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.NECPC88series:
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.NECPC98series:
-                    info.CommonDiscInfo!.EXEDateBuildDate = addPlaceholders ? RequiredValue : string.Empty;
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.EXEDateBuildDate = addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.NECPCFXPCFXGA:
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.SegaChihiro:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SegaDreamcast:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SegaNaomi:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SegaNaomi2:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SegaTitanVideo:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SharpX68000:
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.SNKNeoGeoCD:
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.CommonDiscInfo.EXEDateBuildDate ??= addPlaceholders ? RequiredValue : string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation:
@@ -897,26 +927,26 @@ namespace MPF.Frontend.Tools
 
                     // TODO: Remove this hack when DIC supports build date output
                     if (isDiscImageCreator)
-                        info.CommonDiscInfo!.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", ps1Exe, psx: true);
+                        info.CommonDiscInfo.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", ps1Exe, psx: true);
 
                     SetCommentFieldIfNotExists(info, SiteCode.InternalSerialName, drive, PhysicalTool.GetPlayStationSerial);
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, ps1Exe, fixTwoDigitYear: true);
+                    info.CommonDiscInfo.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, ps1Exe, fixTwoDigitYear: true);
 
                     if (CommentFieldExists(info, SiteCode.InternalSerialName, out ps1Exe))
-                        info.CommonDiscInfo!.Region = ProcessingTool.GetPlayStationRegion(ps1Exe);
+                        info.CommonDiscInfo.Region = ProcessingTool.GetPlayStationRegion(ps1Exe);
 
                     break;
 
                 case RedumpSystem.SonyPlayStation2:
-                    info.CommonDiscInfo!.LanguageSelection ??= [];
+                    info.CommonDiscInfo.LanguageSelection ??= [];
                     string? ps2Exe = PhysicalTool.GetPlayStationExecutableName(drive);
 
                     // TODO: Remove this hack when DIC supports build date output
                     if (isDiscImageCreator)
-                        info.CommonDiscInfo!.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", ps2Exe);
+                        info.CommonDiscInfo.EXEDateBuildDate = DiscImageCreator.GetPlayStationEXEDate($"{basePath}_volDesc.txt", ps2Exe);
 
                     SetCommentFieldIfNotExists(info, SiteCode.InternalSerialName, drive, PhysicalTool.GetPlayStationSerial);
-                    info.CommonDiscInfo!.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, ps2Exe, fixTwoDigitYear: true);
+                    info.CommonDiscInfo.EXEDateBuildDate ??= PhysicalTool.GetFileDate(drive, ps2Exe, fixTwoDigitYear: true);
 
                     if (CommentFieldExists(info, SiteCode.InternalSerialName, out ps2Exe))
                         info.CommonDiscInfo.Region = ProcessingTool.GetPlayStationRegion(ps2Exe);
@@ -925,7 +955,7 @@ namespace MPF.Frontend.Tools
                     break;
 
                 case RedumpSystem.SonyPlayStation3:
-                    info.Extras!.DiscKey ??= addPlaceholders ? RequiredValue : string.Empty;
+                    info.Extras.DiscKey ??= addPlaceholders ? RequiredValue : string.Empty;
                     info.Extras.DiscID ??= addPlaceholders ? RequiredValue : string.Empty;
 
                     SetCommentFieldIfNotExists(info, SiteCode.InternalSerialName, drive, PhysicalTool.GetPlayStation3Serial);
@@ -946,12 +976,12 @@ namespace MPF.Frontend.Tools
                     break;
 
                 case RedumpSystem.TomyKissSite:
-                    info.CommonDiscInfo!.Category ??= DiscCategory.Video;
-                    info.CommonDiscInfo!.Region ??= Region.Japan;
+                    info.CommonDiscInfo.Category ??= DiscCategory.Video;
+                    info.CommonDiscInfo.Region ??= Region.Japan;
                     break;
 
                 case RedumpSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem:
-                    info.CopyProtection!.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
+                    info.CopyProtection.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
                     break;
             }
 
@@ -976,7 +1006,7 @@ namespace MPF.Frontend.Tools
         private static bool CommentFieldExists(SubmissionInfo info, SiteCode key, out string? value)
         {
             // Ensure the comments fields exist
-            if (info.CommonDiscInfo!.CommentsSpecialFields == null)
+            if (info.CommonDiscInfo.CommentsSpecialFields == null)
                 info.CommonDiscInfo.CommentsSpecialFields = [];
 
             // Check if the field exists
@@ -992,7 +1022,7 @@ namespace MPF.Frontend.Tools
         /// <summary>
         /// Set a comment field if it doesn't already have a value
         /// </summary>
-        private static void SetCommentFieldIfNotExists(SubmissionInfo info, SiteCode key, Drive? drive, Func<Drive?, string?> valueFunc)
+        private static void SetCommentFieldIfNotExists(SubmissionInfo info, SiteCode key, Drive? drive, System.Func<Drive?, string?> valueFunc)
         {
             // If the field has a valid value, skip
             if (CommentFieldExists(info, key, out _))
@@ -1001,7 +1031,7 @@ namespace MPF.Frontend.Tools
             // Set the value
             string? value = valueFunc(drive);
             if (value != null)
-                info.CommonDiscInfo!.CommentsSpecialFields![key] = value;
+                info.CommonDiscInfo.CommentsSpecialFields[key] = value;
         }
 
         /// <summary>
@@ -1010,7 +1040,7 @@ namespace MPF.Frontend.Tools
         private static bool ContentFieldExists(SubmissionInfo info, SiteCode key, out string? value)
         {
             // Ensure the contents fields exist
-            if (info.CommonDiscInfo!.ContentsSpecialFields == null)
+            if (info.CommonDiscInfo.ContentsSpecialFields == null)
                 info.CommonDiscInfo.ContentsSpecialFields = [];
 
             // Check if the field exists
@@ -1035,7 +1065,7 @@ namespace MPF.Frontend.Tools
             // Set the value
             string? value = valueFunc(drive);
             if (value != null)
-                info.CommonDiscInfo!.ContentsSpecialFields![key] = value;
+                info.CommonDiscInfo.ContentsSpecialFields![key] = value;
         }
 
         /// <summary>
@@ -1044,7 +1074,7 @@ namespace MPF.Frontend.Tools
         private static void SetVersionIfNotExists(SubmissionInfo info, Drive? drive, Func<Drive?, string?> valueFunc)
         {
             // If the version already exists, skip
-            if (!string.IsNullOrEmpty(info.VersionAndEditions!.Version))
+            if (!string.IsNullOrEmpty(info.VersionAndEditions.Version))
                 return;
 
             // Set the version
@@ -1056,7 +1086,7 @@ namespace MPF.Frontend.Tools
         /// </summary>
         /// <param name="oldDict">ProtectionDictionary to format</param>
         /// <returns>Reformatted dictionary on success, empty on error</returns>
-        private static Dictionary<string, List<string>?> ReformatProtectionDictionary(ProtectionDictionary? oldDict)
+        private static Dictionary<string, List<string>?> ReformatProtectionDictionary(Dictionary<string, List<string>>? oldDict)
         {
             // Null or empty protections return empty
             if (oldDict == null || oldDict.Count == 0)

MPF.Frontend/ViewModels/CheckDumpViewModel.cs

@@ -66,34 +66,6 @@ namespace MPF.Frontend.ViewModels
         }
         private bool _systemTypeComboBoxEnabled;
 
-        /// <summary>
-        /// Currently selected media type value
-        /// </summary>
-        public MediaType? CurrentMediaType
-        {
-            get => _currentMediaType;
-            set
-            {
-                _currentMediaType = value;
-                TriggerPropertyChanged(nameof(CurrentMediaType));
-            }
-        }
-        private MediaType? _currentMediaType;
-
-        /// <summary>
-        /// Indicates the status of the media type combo box
-        /// </summary>
-        public bool MediaTypeComboBoxEnabled
-        {
-            get => _mediaTypeComboBoxEnabled;
-            set
-            {
-                _mediaTypeComboBoxEnabled = value;
-                TriggerPropertyChanged(nameof(MediaTypeComboBoxEnabled));
-            }
-        }
-        private bool _mediaTypeComboBoxEnabled;
-
         /// <summary>
         /// Currently provided input path
         /// </summary>
@@ -229,20 +201,6 @@ namespace MPF.Frontend.ViewModels
 
         #region List Properties
 
-        /// <summary>
-        /// Current list of supported media types
-        /// </summary>
-        public List<Element<MediaType>>? MediaTypes
-        {
-            get => _mediaTypes;
-            set
-            {
-                _mediaTypes = value;
-                TriggerPropertyChanged(nameof(MediaTypes));
-            }
-        }
-        private List<Element<MediaType>>? _mediaTypes;
-
         /// <summary>
         /// Current list of supported system profiles
         /// </summary>
@@ -287,16 +245,13 @@ namespace MPF.Frontend.ViewModels
             SystemTypeComboBoxEnabled = true;
             InputPathTextBoxEnabled = true;
             InputPathBrowseButtonEnabled = true;
-            MediaTypeComboBoxEnabled = true;
             DumpingProgramComboBoxEnabled = true;
             CheckDumpButtonEnabled = false;
             CancelButtonEnabled = true;
 
-            MediaTypes = [];
             Systems = RedumpSystemComboBoxItem.GenerateElements();
             InternalPrograms = [];
 
-            PopulateMediaType();
             PopulateInternalPrograms();
             EnableEventHandlers();
         }
@@ -327,15 +282,6 @@ namespace MPF.Frontend.ViewModels
         /// Change the currently selected system
         /// </summary>
         public void ChangeSystem()
-        {
-            PopulateMediaType();
-            CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
-        }
-
-        /// <summary>
-        /// Change the currently selected media type
-        /// </summary>
-        public void ChangeMediaType()
         {
             CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
         }
@@ -369,7 +315,6 @@ namespace MPF.Frontend.ViewModels
             InputPathTextBoxEnabled = true;
             InputPathBrowseButtonEnabled = true;
             DumpingProgramComboBoxEnabled = true;
-            PopulateMediaType();
             CheckDumpButtonEnabled = ShouldEnableCheckDumpButton();
             CancelButtonEnabled = true;
         }
@@ -382,7 +327,6 @@ namespace MPF.Frontend.ViewModels
             SystemTypeComboBoxEnabled = false;
             InputPathTextBoxEnabled = false;
             InputPathBrowseButtonEnabled = false;
-            MediaTypeComboBoxEnabled = false;
             DumpingProgramComboBoxEnabled = false;
             CheckDumpButtonEnabled = false;
             CancelButtonEnabled = false;
@@ -392,35 +336,6 @@ namespace MPF.Frontend.ViewModels
 
         #region Population
 
-        /// <summary>
-        /// Populate media type according to system type
-        /// </summary>
-        private void PopulateMediaType()
-        {
-            // Disable other UI updates
-            bool cachedCanExecuteSelectionChanged = CanExecuteSelectionChanged;
-            DisableEventHandlers();
-
-            if (CurrentSystem != null)
-            {
-                var mediaTypeValues = CurrentSystem.MediaTypes();
-                int index = mediaTypeValues.FindIndex(m => m == CurrentMediaType);
-
-                MediaTypes = mediaTypeValues.ConvertAll(m => new Element<MediaType>(m ?? MediaType.NONE));
-                MediaTypeComboBoxEnabled = MediaTypes.Count > 1;
-                CurrentMediaType = (index > -1 ? MediaTypes[index] : MediaTypes[0]);
-            }
-            else
-            {
-                MediaTypeComboBoxEnabled = false;
-                MediaTypes = null;
-                CurrentMediaType = null;
-            }
-
-            // Reenable event handlers, if necessary
-            if (cachedCanExecuteSelectionChanged) EnableEventHandlers();
-        }
-
         /// <summary>
         /// Populate media type according to system type
         /// </summary>
@@ -451,7 +366,7 @@ namespace MPF.Frontend.ViewModels
 
         private bool ShouldEnableCheckDumpButton()
         {
-            return CurrentSystem != null && CurrentMediaType != null && !string.IsNullOrEmpty(InputPath);
+            return CurrentSystem != null && !string.IsNullOrEmpty(InputPath);
         }
 
         /// <summary>
@@ -478,13 +393,13 @@ namespace MPF.Frontend.ViewModels
         /// Performs MPF.Check functionality
         /// </summary>
         /// <returns>An error message if failed, otherwise string.Empty/null</returns>
-        public async Task<string?> CheckDump(ProcessUserInfoDelegate processUserInfo)
+        public async Task<ResultEventArgs> CheckDump(ProcessUserInfoDelegate processUserInfo)
         {
             if (string.IsNullOrEmpty(InputPath))
-                return "Invalid Input path";
+                return ResultEventArgs.Failure("Invalid Input path");
 
             if (!File.Exists(InputPath!.Trim('"')))
-                return "Input Path is not a valid file";
+                return ResultEventArgs.Failure("Input Path is not a valid file");
 
             // Disable UI while Check is running
             DisableUIElements();
@@ -502,9 +417,8 @@ namespace MPF.Frontend.ViewModels
                 Path.GetFullPath(InputPath.Trim('"')),
                 null,
                 CurrentSystem,
-                CurrentMediaType,
-                CurrentProgram,
-                parameters: null);
+                CurrentProgram);
+            env.SetProcessor();
 
             // Finally, attempt to do the output dance
             var result = await env.VerifyAndSaveDumpOutput(
@@ -517,7 +431,7 @@ namespace MPF.Frontend.ViewModels
             if (cachedCanExecuteSelectionChanged)
                 EnableEventHandlers();
 
-            return result.Message;
+            return result;
         }
 
         /// <summary>

MPF.Frontend/ViewModels/CreateIRDViewModel.cs

@@ -544,7 +544,7 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         private bool ShouldEnableCreateIRDButton()
         {
-            if(string.IsNullOrEmpty(InputPath) || !File.Exists(InputPath))
+            if (string.IsNullOrEmpty(InputPath) || !File.Exists(InputPath))
             {
                 CreateIRDStatus = "Please provide an ISO";
                 return false;

MPF.Frontend/ViewModels/MainViewModel.cs

@@ -9,6 +9,7 @@ using MPF.Frontend.Tools;
 using SabreTools.IO;
 using SabreTools.IO.Extensions;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Data.Sections;
 
 namespace MPF.Frontend.ViewModels
 {
@@ -543,11 +544,11 @@ namespace MPF.Frontend.ViewModels
 
         #endregion
 
-        #region Constants
+        #region Strings
 
         private const string DiscNotDetectedValue = "Disc Not Detected";
-        private const string StartDumpingValue = "Start Dumping";
-        private const string StopDumpingValue = "Stop Dumping";
+        private string StartDumpingValue = "Start Dumping";
+        private string StopDumpingValue = "Stop Dumping";
 
         #endregion
 
@@ -674,7 +675,7 @@ namespace MPF.Frontend.ViewModels
 
                 // Set the selected index
                 CurrentDrive = (index != -1 ? Drives[index] : Drives[0]);
-                Status = "Valid drive found! Choose your Media Type";
+                Status = "Valid drive found!";
                 CopyProtectScanButtonEnabled = true;
 
                 // Get the current system type
@@ -770,11 +771,11 @@ namespace MPF.Frontend.ViewModels
         public void ChangeDumpingProgram()
         {
             VerboseLogLn($"Changed dumping program to: {((InternalProgram?)CurrentProgram).LongName()}");
-            EnsureDiscInformation();
+            EnsureMediaInformation();
             // New output name depends on new environment
             GetOutputNames(false);
             // New environment depends on new output name
-            EnsureDiscInformation();
+            EnsureMediaInformation();
         }
 
         /// <summary>
@@ -787,7 +788,7 @@ namespace MPF.Frontend.ViewModels
                 SetSupportedDriveSpeed();
 
             GetOutputNames(false);
-            EnsureDiscInformation();
+            EnsureMediaInformation();
         }
 
         /// <summary>
@@ -798,7 +799,7 @@ namespace MPF.Frontend.ViewModels
             VerboseLogLn($"Changed system to: {CurrentSystem.LongName()}");
             PopulateMediaType();
             GetOutputNames(false);
-            EnsureDiscInformation();
+            EnsureMediaInformation();
         }
 
         /// <summary>
@@ -813,25 +814,6 @@ namespace MPF.Frontend.ViewModels
                 message = "An exception occurred while checking for versions, please try again later. See the log window for more details.";
         }
 
-        /// <summary>
-        /// Build the about text 
-        /// </summary>
-        /// <returns></returns>
-        public string CreateAboutText()
-        {
-            string aboutText = $"Media Preservation Frontend (MPF)"
-                + $"{Environment.NewLine}"
-                + $"{Environment.NewLine}A community preservation frontend developed in C#."
-                + $"{Environment.NewLine}Supports Redumper, Aaru, and DiscImageCreator."
-                + $"{Environment.NewLine}Originally created to help the Redump project."
-                + $"{Environment.NewLine}"
-                + $"{Environment.NewLine}Thanks to everyone who has supported this project!"
-                + $"{Environment.NewLine}"
-                + $"{Environment.NewLine}Version {FrontendTool.GetCurrentVersion()}";
-            SecretLogLn(aboutText);
-            return aboutText;
-        }
-
         /// <summary>
         /// Build a dummy SubmissionInfo
         /// </summary>
@@ -1063,7 +1045,7 @@ namespace MPF.Frontend.ViewModels
             SetSupportedDriveSpeed();
             _environment = DetermineEnvironment();
             GetOutputNames(true);
-            EnsureDiscInformation();
+            EnsureMediaInformation();
 
             // Enable event handlers
             EnableEventHandlers();
@@ -1100,7 +1082,7 @@ namespace MPF.Frontend.ViewModels
             // Set the initial environment and UI values
             _environment = DetermineEnvironment();
             GetOutputNames(true);
-            EnsureDiscInformation();
+            EnsureMediaInformation();
 
             // Enable event handlers
             EnableEventHandlers();
@@ -1213,14 +1195,8 @@ namespace MPF.Frontend.ViewModels
             if (defaultMediaType == MediaType.NONE)
                 defaultMediaType = MediaType.CDROM;
 
-            // If we're skipping detection, set the default value
-            if (Options.SkipMediaTypeDetection)
-            {
-                VerboseLogLn($"Media type detection disabled, defaulting to {defaultMediaType.LongName()}.");
-                CurrentMediaType = defaultMediaType;
-            }
             // If the drive is marked active, try to read from it
-            else if (CurrentDrive.MarkedActive)
+            if (CurrentDrive.MarkedActive)
             {
                 VerboseLog($"Trying to detect media type for drive {CurrentDrive.Name} [{CurrentDrive.DriveFormat}] using size and filesystem.. ");
                 MediaType? detectedMediaType = CurrentDrive.GetMediaType(CurrentSystem);
@@ -1238,8 +1214,7 @@ namespace MPF.Frontend.ViewModels
                     CurrentMediaType = detectedMediaType;
                 }
             }
-
-            // All other cases, just use the default
+            // Otherwise just use the default
             else
             {
                 VerboseLogLn($"Drive marked as empty, defaulting to {defaultMediaType.LongName()}.");
@@ -1253,14 +1228,15 @@ namespace MPF.Frontend.ViewModels
         /// <returns>Filled DumpEnvironment Parent</returns>
         private DumpEnvironment DetermineEnvironment()
         {
-            return new DumpEnvironment(
+            var env = new DumpEnvironment(
                 Options,
                 EvaluateOutputPath(OutputPath),
                 CurrentDrive,
                 CurrentSystem,
-                CurrentMediaType,
-                CurrentProgram,
-                Parameters);
+                CurrentProgram);
+            env.SetExecutionContext(CurrentMediaType, Parameters);
+            env.SetProcessor();
+            return env;
         }
 
         /// <summary>
@@ -1361,15 +1337,19 @@ namespace MPF.Frontend.ViewModels
         }
 
         /// <summary>
-        /// Ensure information is consistent with the currently selected disc type
+        /// Ensure information is consistent with the currently selected media type
         /// </summary>
-        public void EnsureDiscInformation()
+        public void EnsureMediaInformation()
         {
+            // If the drive list is empty, ignore updates
+            if (Drives.Count == 0)
+                return;
+
             // Get the current environment information
             _environment = DetermineEnvironment();
 
             // Get the status to write out
-            ResultEventArgs result = _environment.GetSupportStatus();
+            ResultEventArgs result = _environment.GetSupportStatus(CurrentMediaType);
             if (CurrentProgram == InternalProgram.NONE)
                 Status = "No dumping program found";
             else
@@ -1379,12 +1359,12 @@ namespace MPF.Frontend.ViewModels
             StartStopButtonEnabled = result && ShouldEnableDumpingButton();
 
             // If we're in a type that doesn't support drive speeds
-            DriveSpeedComboBoxEnabled = _environment.DoesSupportDriveSpeed();
+            DriveSpeedComboBoxEnabled = DumpEnvironment.DoesSupportDriveSpeed(CurrentMediaType);
 
             // If input params are enabled, generate the full parameters from the environment
             if (ParametersCheckBoxEnabled)
             {
-                var generated = _environment.GetFullParameters(DriveSpeed);
+                var generated = _environment.GetFullParameters(CurrentMediaType, DriveSpeed);
                 if (generated != null)
                     Parameters = generated;
             }
@@ -1412,9 +1392,9 @@ namespace MPF.Frontend.ViewModels
             string programShort = program == "DiscImageCreator" ? "DIC" : program;
             if (string.IsNullOrEmpty(programShort))
                 programShort = "Unknown Program";
-            string label = GetFormattedVolumeLabel(_currentDrive) ?? "track";
+            string label = GetFormattedVolumeLabel(_currentDrive) ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
             if (string.IsNullOrEmpty(label))
-                label = "track";
+                label = $"track_{DateTime.Now:yyyyMMdd-HHmm}";
             string date = DateTime.Today.ToString("yyyyMMdd");
             if (string.IsNullOrEmpty(date))
                 date = "UNKNOWN";
@@ -1449,7 +1429,7 @@ namespace MPF.Frontend.ViewModels
             // Get path pieces that are used in all branches
             string defaultOutputPath = Options.DefaultOutputPath ?? "ISO";
             string extension = _environment?.GetDefaultExtension(CurrentMediaType) ?? ".bin";
-            string label = GetFormattedVolumeLabel(CurrentDrive) ?? CurrentSystem.LongName() ?? "track";
+            string label = GetFormattedVolumeLabel(CurrentDrive) ?? CurrentSystem.LongName() ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
             string defaultFilename = $"{label}{extension}";
 
             // If no path exists, set one using default values
@@ -1528,7 +1508,7 @@ namespace MPF.Frontend.ViewModels
                 return null;
             }
 
-            // We're going to assume for floppies, HDDs, and removable drives
+            // Floppies, HDDs, and removable drives are assumed
             if (drive.InternalDriveType != InternalDriveType.Optical)
                 return RedumpSystem.IBMPCcompatible;
 
@@ -1615,7 +1595,7 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 if (Directory.Exists(Path.Combine(drive.Name, "$SystemUpdate"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "$SystemUpdate")).Length > 0
+                    && Path.Combine(drive.Name, "$SystemUpdate").SafeGetFiles().Length > 0
                     && drive.TotalSize <= 500_000_000)
                 {
                     return RedumpSystem.MicrosoftXbox360;
@@ -1638,7 +1618,7 @@ namespace MPF.Frontend.ViewModels
                         if (!File.Exists(catalogjs))
                             return RedumpSystem.MicrosoftXboxOne;
 
-                        SabreTools.Models.Xbox.Catalog? catalog = SabreTools.Serialization.Deserializers.Catalog.DeserializeFile(catalogjs);
+                        var catalog = new SabreTools.Serialization.Readers.Catalog().Deserialize(catalogjs);
                         if (catalog != null && catalog.Version != null && catalog.Packages != null)
                         {
                             if (!double.TryParse(catalog.Version, out double version))
@@ -1664,6 +1644,12 @@ namespace MPF.Frontend.ViewModels
             }
             catch { }
 
+            // Playmaji Polymega
+            if (File.Exists(Path.Combine(drive.Name, "Get Polymega App.url")))
+            {
+                return RedumpSystem.PlaymajiPolymega;
+            }
+
             try
             {
                 // Sega Saturn / Sega Dreamcast / Sega Mega-CD / Sega-CD
@@ -1824,13 +1810,13 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 if (Directory.Exists(Path.Combine(drive.Name, "AUDIO_TS"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "AUDIO_TS")).Length > 0)
+                    && Path.Combine(drive.Name, "AUDIO_TS").SafeGetFiles().Length > 0)
                 {
                     return RedumpSystem.DVDAudio;
                 }
 
                 else if (Directory.Exists(Path.Combine(drive.Name, "VIDEO_TS"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "VIDEO_TS")).Length > 0)
+                    && Path.Combine(drive.Name, "VIDEO_TS").SafeGetFiles().Length > 0)
                 {
                     return RedumpSystem.DVDVideo;
                 }
@@ -1841,7 +1827,7 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 if (Directory.Exists(Path.Combine(drive.Name, "HVDVD_TS"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "HVDVD_TS")).Length > 0)
+                    && Path.Combine(drive.Name, "HVDVD_TS").SafeGetFiles().Length > 0)
                 {
                     return RedumpSystem.HDDVDVideo;
                 }
@@ -1852,7 +1838,7 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 if (Directory.Exists(Path.Combine(drive.Name, "PHOTO_CD"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "PHOTO_CD")).Length > 0)
+                    && Path.Combine(drive.Name, "PHOTO_CD").SafeGetFiles().Length > 0)
                 {
                     return RedumpSystem.PhotoCD;
                 }
@@ -1863,7 +1849,7 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 if (Directory.Exists(Path.Combine(drive.Name, "VCD"))
-                    && IOExtensions.SafeGetFiles(Path.Combine(drive.Name, "VCD")).Length > 0)
+                    && Path.Combine(drive.Name, "VCD").SafeGetFiles().Length > 0)
                 {
                     return RedumpSystem.VideoCD;
                 }
@@ -1876,13 +1862,21 @@ namespace MPF.Frontend.ViewModels
             return null;
         }
 
+        /// <summary>
+        /// Logs the About text
+        /// </summary>
+        public void LogAboutText(string message)
+        {
+            SecretLogLn(message);
+        }
+
         /// <summary>
         /// Process the current custom parameters back into UI values
         /// </summary>
         public void ProcessCustomParameters()
         {
             // Set the execution context and processor
-            if (_environment?.SetExecutionContext(Parameters) != true)
+            if (_environment?.SetExecutionContext(CurrentMediaType, Parameters) != true)
                 return;
             if (_environment?.SetProcessor() != true)
                 return;
@@ -1965,7 +1959,7 @@ namespace MPF.Frontend.ViewModels
             try
             {
                 var protections = await ProtectionTool.RunProtectionScanOnPath(CurrentDrive.Name, Options, progress);
-                var output = ProtectionTool.FormatProtections(protections);
+                var output = ProtectionTool.FormatProtections(protections, CurrentDrive);
 
                 LogLn($"Detected the following protections in {CurrentDrive.Name}:\r\n\r\n{output}");
                 return output;
@@ -2003,36 +1997,55 @@ namespace MPF.Frontend.ViewModels
         /// <summary>
         /// Media label as read by Windows, formatted to avoid odd outputs
         /// If no volume label present, use PSX or PS2 serial if valid
-        /// Otherwise, use "track" as volume label
+        /// Otherwise, use "track" with current datetime as volume label
         /// </summary>
         private static string? GetFormattedVolumeLabel(Drive? drive)
         {
+            // If the drive is invalid
             if (drive == null)
                 return null;
 
-            string? volumeLabel = DiscNotDetectedValue;
+            // If the drive is marked as inactive
             if (!drive.MarkedActive)
-                return volumeLabel;
+                return DiscNotDetectedValue;
 
-            if (!string.IsNullOrEmpty(drive.VolumeLabel))
+            // Use internal serials where appropriate
+            string? volumeLabel = string.IsNullOrEmpty(drive.VolumeLabel) ? null : drive.VolumeLabel!.Trim();
+            switch (GetRedumpSystem(drive))
             {
-                volumeLabel = drive.VolumeLabel;
-            }
-            else
-            {
-                // No Volume Label found, fallback to something sensible
-                switch (GetRedumpSystem(drive))
-                {
-                    case RedumpSystem.SonyPlayStation:
-                    case RedumpSystem.SonyPlayStation2:
-                        string? serial = PhysicalTool.GetPlayStationSerial(drive);
-                        volumeLabel = serial ?? "track";
-                        break;
+                case RedumpSystem.SonyPlayStation:
+                case RedumpSystem.SonyPlayStation2:
+                    string? ps12Serial = PhysicalTool.GetPlayStationSerial(drive);
+                    volumeLabel ??= ps12Serial ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
+                    break;
 
-                    default:
-                        volumeLabel = "track";
-                        break;
-                }
+                case RedumpSystem.SonyPlayStation3:
+                    string? ps3Serial = PhysicalTool.GetPlayStation3Serial(drive);
+                    if (volumeLabel == "PS3VOLUME")
+                        volumeLabel = ps3Serial ?? volumeLabel;
+                    else
+                        volumeLabel ??= ps3Serial ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
+                    break;
+
+                case RedumpSystem.SonyPlayStation4:
+                    string? ps4Serial = PhysicalTool.GetPlayStation4Serial(drive);
+                    if (volumeLabel == "PS4VOLUME")
+                        volumeLabel = ps4Serial ?? volumeLabel;
+                    else
+                        volumeLabel ??= ps4Serial ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
+                    break;
+
+                case RedumpSystem.SonyPlayStation5:
+                    string? ps5Serial = PhysicalTool.GetPlayStation5Serial(drive);
+                    if (volumeLabel == "PS5VOLUME")
+                        volumeLabel = ps5Serial ?? volumeLabel;
+                    else
+                        volumeLabel ??= ps5Serial ?? $"track_{DateTime.Now:yyyyMMdd-HHmm}";
+                    break;
+
+                default:
+                    volumeLabel ??= $"track_{DateTime.Now:yyyyMMdd-HHmm}";
+                    break;
             }
 
             foreach (char c in Path.GetInvalidFileNameChars())
@@ -2080,6 +2093,10 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         public void SetSupportedDriveSpeed()
         {
+            // Skip trying to set speeds if no drives
+            if (Drives.Count == 0)
+                return;
+
             // Set the drive speed list that's appropriate
             DriveSpeeds = InterfaceConstants.GetSpeedsForMediaType(CurrentMediaType);
             VerboseLogLn($"Supported media speeds: {string.Join(", ", [.. DriveSpeeds.ConvertAll(ds => ds.ToString())])}");
@@ -2093,8 +2110,7 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         private bool ShouldEnableDumpingButton()
         {
-            return Drives != null
-                && Drives.Count > 0
+            return Drives.Count > 0
                 && CurrentSystem != null
                 && CurrentMediaType != null
                 && ProgramSupportsMedia();
@@ -2163,30 +2179,13 @@ namespace MPF.Frontend.ViewModels
         {
             // Ask user to confirm before exiting application during a dump
             AskBeforeQuit = true;
-            
+
             // One last check to determine environment, just in case
             _environment = DetermineEnvironment();
 
             // Force an internal drive refresh in case the user entered things manually
             _environment.RefreshDrive();
 
-            // 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 dump with these custom parameters?", 2, true);
-                if (result == true)
-                {
-                    ParametersCheckBoxEnabled = true;
-                    ProcessCustomParameters();
-                }
-                else
-                {
-                    // Re-allow quick exiting
-                    AskBeforeQuit = false;
-                    return;
-                }
-            }
-
             try
             {
                 // Run pre-dumping validation checks
@@ -2216,7 +2215,7 @@ namespace MPF.Frontend.ViewModels
                 _environment.ReportStatus += ProgressUpdated;
 
                 // Run the program with the parameters
-                ResultEventArgs result = await _environment.Run(resultProgress);
+                ResultEventArgs result = await _environment.Run(CurrentMediaType, resultProgress);
 
                 // If we didn't execute a dumping command we cannot get submission output
                 if (!_environment.IsDumpingCommand())
@@ -2236,9 +2235,12 @@ namespace MPF.Frontend.ViewModels
                 if (result)
                 {
                     result = await _environment.VerifyAndSaveDumpOutput(
-                        resultProgress,
-                        protectionProgress,
-                        _processUserInfo);
+                        resultProgress: resultProgress,
+                        protectionProgress: protectionProgress,
+                        processUserInfo: _processUserInfo);
+
+                    if (!result)
+                        ErrorLogLn(result.Message);
                 }
                 else
                 {
@@ -2283,6 +2285,7 @@ namespace MPF.Frontend.ViewModels
                 MediaScanButtonEnabled = false;
                 UpdateVolumeLabelEnabled = false;
                 CopyProtectScanButtonEnabled = false;
+                StartStopButtonEnabled = false;
             }
             else
             {
@@ -2303,6 +2306,7 @@ namespace MPF.Frontend.ViewModels
                 MediaScanButtonEnabled = true;
                 UpdateVolumeLabelEnabled = true;
                 CopyProtectScanButtonEnabled = true;
+                StartStopButtonEnabled = true;
             }
         }
 
@@ -2344,7 +2348,7 @@ namespace MPF.Frontend.ViewModels
             string outputFilename = Path.GetFileName(_environment.OutputPath);
 
             // If a complete or partial dump already exists
-            bool foundAllFiles = _environment.FoundAllFiles(outputDirectory, outputFilename);
+            bool foundAllFiles = _environment.FoundAllFiles(CurrentMediaType, outputDirectory, outputFilename);
             if (foundAllFiles && _displayUserMessage != null)
             {
                 bool? mbresult = _displayUserMessage("Overwrite?", "A complete dump already exists! Are you sure you want to overwrite?", 2, true);
@@ -2357,7 +2361,7 @@ namespace MPF.Frontend.ViewModels
             else
             {
                 // If a partial dump exists
-                bool foundAnyFiles = _environment.FoundAnyFiles(outputDirectory, outputFilename);
+                bool foundAnyFiles = _environment.FoundAnyFiles(CurrentMediaType, outputDirectory, outputFilename);
                 if (foundAnyFiles && _displayUserMessage != null)
                 {
                     bool? mbresult = _displayUserMessage("Overwrite?", $"A partial dump already exists! Dumping here may cause issues. Are you sure you want to overwrite?", 2, true);
@@ -2370,7 +2374,7 @@ namespace MPF.Frontend.ViewModels
                 else
                 {
                     // If a complete dump exists from a different program
-                    InternalProgram? completeProgramFound = _environment.CheckForMatchingProgram(outputDirectory, outputFilename);
+                    InternalProgram? completeProgramFound = _environment.CheckForMatchingProgram(CurrentMediaType, outputDirectory, outputFilename);
                     if (completeProgramFound != null && _displayUserMessage != null)
                     {
                         bool? mbresult = _displayUserMessage("Overwrite?", $"A complete dump from {completeProgramFound} already exists! Dumping here may cause issues. Are you sure you want to overwrite?", 2, true);
@@ -2383,7 +2387,7 @@ namespace MPF.Frontend.ViewModels
                     else
                     {
                         // If a partial dump exists from a different program
-                        InternalProgram? partialProgramFound = _environment.CheckForPartialProgram(outputDirectory, outputFilename);
+                        InternalProgram? partialProgramFound = _environment.CheckForPartialProgram(CurrentMediaType, outputDirectory, outputFilename);
                         if (partialProgramFound != null && _displayUserMessage != null)
                         {
                             bool? mbresult = _displayUserMessage("Overwrite?", $"A partial dump from {partialProgramFound} already exists! Dumping here may cause issues. Are you sure you want to overwrite?", 2, true);
@@ -2443,6 +2447,31 @@ namespace MPF.Frontend.ViewModels
             }
         }
 
+        /// <summary>
+        /// Translates strings in MainModelView
+        /// </summary>
+        /// <param name="translationStrings">Dictionary of keys and their translated string</param>
+        public void TranslateStrings(Dictionary<string, string>? translationStrings)
+        {
+            if (translationStrings != null)
+            {
+                // Cache current start dumping string
+                var oldStartDumpingValue = StartDumpingValue;
+
+                // Get translated strings
+                if (translationStrings.TryGetValue("StartDumpingButtonString", out string? startDumpingButtonString))
+                    StartDumpingValue = startDumpingButtonString ?? StartDumpingValue;
+                if (translationStrings.TryGetValue("StopDumpingButtonString", out string? stopDumpingValue))
+                    StopDumpingValue = stopDumpingValue ?? StopDumpingValue;
+
+                // Set button text
+                if (StartStopButtonText as string == oldStartDumpingValue)
+                    StartStopButtonText = StartDumpingValue;
+                else
+                    StartStopButtonText = StopDumpingValue;
+            }
+        }
+
         #endregion
 
         #region Progress Reporting

MPF.Frontend/ViewModels/MediaInformationViewModel.cs

@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using MPF.Frontend.ComboBoxItems;
 using MPF.Frontend.Tools;
 using SabreTools.RedumpLib.Data;
+using SabreTools.RedumpLib.Data.Sections;
 
 namespace MPF.Frontend.ViewModels
 {
-    public class DiscInformationViewModel
+    public class MediaInformationViewModel
     {
         #region Fields
 
@@ -39,8 +40,8 @@ namespace MPF.Frontend.ViewModels
         /// <summary>
         /// List of Redump-supported Regions
         /// </summary>
-        private static readonly List<Region> RedumpRegions = new()
-        {
+        private static readonly List<Region> RedumpRegions =
+        [
             Region.Argentina,
             Region.Asia,
             Region.AsiaEurope,
@@ -120,7 +121,7 @@ namespace MPF.Frontend.ViewModels
             Region.USAJapan,
             Region.USAKorea,
             Region.World,
-        };
+        ];
 
         /// <summary>
         /// List of available languages
@@ -131,8 +132,8 @@ namespace MPF.Frontend.ViewModels
         /// <summary>
         /// List of Redump-supported Languages
         /// </summary>
-        private static readonly List<Language> RedumpLanguages = new()
-        {
+        private static readonly List<Language> RedumpLanguages =
+        [
             Language.Afrikaans,
             Language.Albanian,
             Language.Arabic,
@@ -181,7 +182,7 @@ namespace MPF.Frontend.ViewModels
             Language.Turkish,
             Language.Ukrainian,
             Language.Vietnamese,
-        };
+        ];
 
         /// <summary>
         /// List of available languages
@@ -194,7 +195,7 @@ namespace MPF.Frontend.ViewModels
         /// <summary>
         /// Constructor
         /// </summary>
-        public DiscInformationViewModel(Options options, SubmissionInfo? submissionInfo)
+        public MediaInformationViewModel(Options options, SubmissionInfo? submissionInfo)
         {
             Options = options;
             SubmissionInfo = submissionInfo?.Clone() as SubmissionInfo ?? new SubmissionInfo();

MPF.Frontend/ViewModels/OptionsViewModel.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using MPF.Frontend.ComboBoxItems;
+using LogCompression = MPF.Processors.LogCompression;
+using RedumperDriveType = MPF.ExecutionContexts.Redumper.DriveType;
 using RedumperReadMethod = MPF.ExecutionContexts.Redumper.ReadMethod;
 using RedumperSectorOrder = MPF.ExecutionContexts.Redumper.SectorOrder;
 
@@ -49,15 +51,30 @@ namespace MPF.Frontend.ViewModels
         /// </summary>
         public static List<Element<InternalProgram>> InternalPrograms => PopulateInternalPrograms();
 
+        /// <summary>
+        /// List of available interface languages
+        /// </summary>
+        public static List<Element<InterfaceLanguage>> InterfaceLanguages => Element<InterfaceLanguage>.GenerateElements();
+
+        /// <summary>
+        /// List of available log compression methods
+        /// </summary>
+        public static List<Element<LogCompression>> LogCompressions => Element<LogCompression>.GenerateElements();
+
         /// <summary>
         /// Current list of supported Redumper read methods
         /// </summary>
-        public static List<Element<RedumperReadMethod>> RedumperReadMethods => PopulateRedumperReadMethods();
+        public static List<Element<RedumperReadMethod>> RedumperReadMethods => Element<RedumperReadMethod>.GenerateElements();
 
         /// <summary>
         /// Current list of supported Redumper sector orders
         /// </summary>
-        public static List<Element<RedumperSectorOrder>> RedumperSectorOrders => PopulateRedumperSectorOrders();
+        public static List<Element<RedumperSectorOrder>> RedumperSectorOrders => Element<RedumperSectorOrder>.GenerateElements();
+
+        /// <summary>
+        /// Current list of supported Redumper drive types
+        /// </summary>
+        public static List<Element<RedumperDriveType>> RedumperDriveTypes => Element<RedumperDriveType>.GenerateElements();
 
         /// <summary>
         /// Current list of supported system profiles
@@ -93,24 +110,6 @@ namespace MPF.Frontend.ViewModels
             return internalPrograms.ConvertAll(ip => new Element<InternalProgram>(ip));
         }
 
-        /// <summary>
-        /// Get a complete list of supported redumper drive read methods
-        /// </summary>
-        private static List<Element<RedumperReadMethod>> PopulateRedumperReadMethods()
-        {
-            var readMethods = new List<RedumperReadMethod> { RedumperReadMethod.NONE, RedumperReadMethod.D8, RedumperReadMethod.BE, RedumperReadMethod.BE_CDDA };
-            return readMethods.ConvertAll(rm => new Element<RedumperReadMethod>(rm));
-        }
-
-        /// <summary>
-        /// Get a complete list of supported redumper drive sector orders
-        /// </summary>
-        private static List<Element<RedumperSectorOrder>> PopulateRedumperSectorOrders()
-        {
-            var sectorOrders = new List<RedumperSectorOrder> { RedumperSectorOrder.NONE, RedumperSectorOrder.DATA_C2_SUB, RedumperSectorOrder.DATA_SUB_C2, RedumperSectorOrder.DATA_SUB, RedumperSectorOrder.DATA_C2 };
-            return sectorOrders.ConvertAll(so => new Element<RedumperSectorOrder>(so));
-        }
-
         #endregion
 
         #region UI Commands
@@ -135,7 +134,7 @@ namespace MPF.Frontend.ViewModels
         {
             Options.RedumperReadMethod = RedumperReadMethod.NONE;
             Options.RedumperSectorOrder = RedumperSectorOrder.NONE;
-            Options.RedumperUseGenericDriveType = false;
+            Options.RedumperDriveType = RedumperDriveType.NONE;
             TriggerPropertyChanged(nameof(Options));
         }
 

MPF.Processors.Test/AaruTests.cs

@@ -11,6 +11,41 @@ namespace MPF.Processors.Test
     // TODO: Add tests around remaining helper methods
     public class AaruTests
     {
+        // TODO: Create minimal sidecars for all other supported types
+        #region DetermineMediaType
+
+        [Fact]
+        public void DetermineMediaType_Empty_Null()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Invalid_Null()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_CD_Valid_CD()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
+            string outputFilename = "test";
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.CDROM, actual);
+        }
+
+        #endregion
+
         #region GetOutputFiles
 
         [Fact]
@@ -18,9 +53,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, null);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(null, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -29,9 +64,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(8, actual.Count);
         }
 
@@ -40,9 +75,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.DVD);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
@@ -51,9 +86,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.HDDVD);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.HDDVD, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
@@ -62,9 +97,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.BluRay);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
@@ -73,9 +108,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.ApertureCard);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.ApertureCard, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -88,8 +123,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAllFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
@@ -98,8 +133,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
             string outputFilename = "test.aaruf";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAllFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -112,8 +147,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.False(actual);
         }
 
@@ -122,8 +157,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
             string outputFilename = "test.aaruf";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -132,8 +167,8 @@ namespace MPF.Processors.Test
         {
             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);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -146,8 +181,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GenerateArtifacts(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -156,8 +191,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
             string outputFilename = "test.aaruf";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GenerateArtifacts(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
@@ -170,8 +205,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetDeleteableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -180,8 +215,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
             string outputFilename = "test.aaruf";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetDeleteableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -194,8 +229,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetZippableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -204,13 +239,37 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
             string outputFilename = "test.aaruf";
-            var processor = new Aaru(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetZippableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(7, actual.Count);
         }
 
         #endregion
 
+        #region GetPreservedFilePaths
+
+        [Fact]
+        public void GetPreservedFilePaths_Invalid_Empty()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetPreservedFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void GetPreservedFilePaths_Valid_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "Aaru", "CDROM");
+            string outputFilename = "test.aaruf";
+            var processor = new Aaru(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetPreservedFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
+        #endregion
+
         #region GenerateCuesheet
 
         [Fact]
@@ -225,7 +284,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GenerateCuesheet_Empty_Null()
         {
-            CICMMetadataType? cicmSidecar = new CICMMetadataType();
+            CICMMetadataType? cicmSidecar = new();
             string basePath = "test";
             string? actual = Aaru.GenerateCuesheet(cicmSidecar, basePath);
             Assert.Null(actual);
@@ -234,7 +293,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GenerateCuesheet_Valid_Filled()
         {
-            TrackType trackType = new TrackType
+            TrackType trackType = new()
             {
                 BytesPerSector = 2352,
                 Flags = new TrackFlagsType { Quadraphonic = true },
@@ -244,7 +303,7 @@ namespace MPF.Processors.Test
                 TrackType1 = TrackTypeTrackType.mode1,
             };
 
-            OpticalDiscType opticalDiscType = new OpticalDiscType
+            OpticalDiscType opticalDiscType = new()
             {
                 DiscType = "CD-ROM",
                 MediaCatalogueNumber = "mcn",
@@ -252,7 +311,7 @@ namespace MPF.Processors.Test
                 Tracks = [1],
             };
 
-            CICMMetadataType? cicmSidecar = new CICMMetadataType
+            CICMMetadataType? cicmSidecar = new()
             {
                 OpticalDisc = [opticalDiscType],
                 Performer = ["performer"],
@@ -282,7 +341,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GenerateDatafile_Empty_Null()
         {
-            CICMMetadataType? cicmSidecar = new CICMMetadataType();
+            CICMMetadataType? cicmSidecar = new();
             string basePath = "test";
             var actual = Aaru.GenerateDatafile(cicmSidecar, basePath);
             Assert.Null(actual);
@@ -291,7 +350,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GenerateDatafile_Valid_Filled()
         {
-            TrackType trackType = new TrackType
+            TrackType trackType = new()
             {
                 Checksums =
                 [
@@ -303,7 +362,7 @@ namespace MPF.Processors.Test
                 Size = 12345,
             };
 
-            OpticalDiscType opticalDiscType = new OpticalDiscType
+            OpticalDiscType opticalDiscType = new()
             {
                 DiscType = "CD-ROM",
                 MediaCatalogueNumber = "mcn",
@@ -311,7 +370,7 @@ namespace MPF.Processors.Test
                 Tracks = [1],
             };
 
-            CICMMetadataType? cicmSidecar = new CICMMetadataType
+            CICMMetadataType? cicmSidecar = new()
             {
                 OpticalDisc = [opticalDiscType],
             };
@@ -338,7 +397,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GeneratePVD_Empty_Null()
         {
-            CICMMetadataType? cicmSidecar = new CICMMetadataType();
+            CICMMetadataType? cicmSidecar = new();
             var actual = Aaru.GeneratePVD(cicmSidecar);
             Assert.Null(actual);
         }
@@ -346,7 +405,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GeneratePVD_Valid_Filled()
         {
-            FileSystemType fileSystemType = new FileSystemType
+            FileSystemType fileSystemType = new()
             {
                 CreationDate = DateTime.UtcNow,
                 CreationDateSpecified = true,
@@ -358,22 +417,22 @@ namespace MPF.Processors.Test
                 EffectiveDateSpecified = true,
             };
 
-            PartitionType partitionType = new PartitionType
+            PartitionType partitionType = new()
             {
                 FileSystems = [fileSystemType],
             };
 
-            TrackType trackType = new TrackType
+            TrackType trackType = new()
             {
                 FileSystemInformation = [partitionType],
             };
 
-            OpticalDiscType opticalDiscType = new OpticalDiscType
+            OpticalDiscType opticalDiscType = new()
             {
                 Track = [trackType],
             };
 
-            CICMMetadataType? cicmSidecar = new CICMMetadataType
+            CICMMetadataType? cicmSidecar = new()
             {
                 OpticalDisc = [opticalDiscType],
             };
@@ -385,5 +444,149 @@ namespace MPF.Processors.Test
         }
 
         #endregion
+
+        #region GetDiscTypeFromStrings
+
+        [Theory]
+        [InlineData(null, "ANY", null)]
+        [InlineData("", "ANY", null)]
+        [InlineData("INVALID", "ANY", null)]
+        [InlineData("3\" floppy", "ANY", MediaType.FloppyDisk)]
+        [InlineData("3.5\" floppy", "ANY", MediaType.FloppyDisk)]
+        [InlineData("3.5\" magneto-optical", "ANY", MediaType.Floptical)]
+        [InlineData("3.5\" SyQuest cartridge", "ANY", null)]
+        [InlineData("3.9\" SyQuest cartridge", "ANY", null)]
+        [InlineData("5.25\" floppy", "ANY", MediaType.FloppyDisk)]
+        [InlineData("5.25\" magneto-optical", "ANY", MediaType.Floptical)]
+        [InlineData("5.25\" SyQuest cartridge", "ANY", null)]
+        [InlineData("8\" floppy", "ANY", MediaType.FloppyDisk)]
+        [InlineData("300mm magneto optical", "ANY", MediaType.Floptical)]
+        [InlineData("356mm magneto-optical", "ANY", MediaType.Floptical)]
+        [InlineData("Advanced Digital Recording", "ANY", null)]
+        [InlineData("Advanced Intelligent Tape", "ANY", null)]
+        [InlineData("Archival Disc", "ANY", null)]
+        [InlineData("BeeCard", "ANY", null)]
+        [InlineData("Blu-ray", "Wii U Optical Disc", MediaType.NintendoWiiUOpticalDisc)]
+        [InlineData("Blu-ray", "ANY", MediaType.BluRay)]
+        [InlineData("Borsu", "ANY", null)]
+        [InlineData("Compact Cassette", "ANY", MediaType.Cassette)]
+        [InlineData("Compact Disc", "ANY", MediaType.CDROM)]
+        [InlineData("Compact Flash", "ANY", MediaType.CompactFlash)]
+        [InlineData("CompacTape", "ANY", null)]
+        [InlineData("CRVdisc", "ANY", null)]
+        [InlineData("Data8", "ANY", null)]
+        [InlineData("DataPlay", "ANY", null)]
+        [InlineData("DataStore", "ANY", null)]
+        [InlineData("DDCD", "ANY", MediaType.CDROM)]
+        [InlineData("DECtape", "ANY", null)]
+        [InlineData("DemiDiskette", "ANY", null)]
+        [InlineData("Digital Audio Tape", "ANY", null)]
+        [InlineData("Digital Data Storage", "ANY", MediaType.DataCartridge)]
+        [InlineData("Digital Linear Tape", "ANY", null)]
+        [InlineData("DIR", "ANY", null)]
+        [InlineData("DST", "ANY", null)]
+        [InlineData("DTF", "ANY", null)]
+        [InlineData("DTF2", "ANY", null)]
+        [InlineData("DV tape", "ANY", null)]
+        [InlineData("DVD", "GameCube Game Disc", MediaType.NintendoGameCubeGameDisc)]
+        [InlineData("DVD", "Wii Optical Disc", MediaType.NintendoWiiOpticalDisc)]
+        [InlineData("DVD", "ANY", MediaType.DVD)]
+        [InlineData("EVD", "ANY", null)]
+        [InlineData("Exatape", "ANY", null)]
+        [InlineData("Express Card", "ANY", null)]
+        [InlineData("FDDVD", "ANY", null)]
+        [InlineData("Flextra", "ANY", null)]
+        [InlineData("Floptical", "ANY", MediaType.Floptical)]
+        [InlineData("FVD", "ANY", null)]
+        [InlineData("GD", "ANY", MediaType.GDROM)]
+        [InlineData("Hard Disk Drive", "ANY", MediaType.HardDisk)]
+        [InlineData("HD DVD", "ANY", MediaType.HDDVD)]
+        [InlineData("HD VMD", "ANY", null)]
+        [InlineData("HiFD", "ANY", MediaType.FloppyDisk)]
+        [InlineData("HiTC", "ANY", null)]
+        [InlineData("HuCard", "ANY", MediaType.Cartridge)]
+        [InlineData("HVD", "ANY", null)]
+        [InlineData("HyperFlex", "ANY", null)]
+        [InlineData("IBM 3470", "ANY", null)]
+        [InlineData("IBM 3480", "ANY", null)]
+        [InlineData("IBM 3490", "ANY", null)]
+        [InlineData("IBM 3490E", "ANY", null)]
+        [InlineData("IBM 3592", "ANY", null)]
+        [InlineData("Iomega Bernoulli Box", "ANY", MediaType.IomegaBernoulliDisk)]
+        [InlineData("Iomega Bernoulli Box II", "ANY", MediaType.IomegaBernoulliDisk)]
+        [InlineData("Iomega Ditto", "ANY", null)]
+        [InlineData("Iomega Jaz", "ANY", MediaType.IomegaJaz)]
+        [InlineData("Iomega PocketZip", "ANY", MediaType.IomegaZip)]
+        [InlineData("Iomega REV", "ANY", null)]
+        [InlineData("Iomega ZIP", "ANY", MediaType.IomegaZip)]
+        [InlineData("Kodak Verbatim", "ANY", null)]
+        [InlineData("LaserDisc", "ANY", MediaType.LaserDisc)]
+        [InlineData("Linear Tape-Open", "ANY", null)]
+        [InlineData("LT1", "ANY", null)]
+        [InlineData("Magneto-optical", "ANY", MediaType.Floptical)]
+        [InlineData("Memory Stick", "ANY", MediaType.SDCard)]
+        [InlineData("MiniCard", "ANY", null)]
+        [InlineData("MiniDisc", "ANY", null)]
+        [InlineData("MultiMediaCard", "ANY", MediaType.SDCard)]
+        [InlineData("Nintendo 3DS Game Card", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo 64 Disk", "ANY", MediaType.Nintendo64DD)]
+        [InlineData("Nintendo 64 Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Disk Card", "ANY", MediaType.NintendoFamicomDiskSystem)]
+        [InlineData("Nintendo DS Game Card", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo DSi Game Card", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Entertainment System Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Famicom Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Game Boy Advance Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Game Boy Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Nintendo Switch Game Card", "ANY", MediaType.Cartridge)]
+        [InlineData("Optical Disc Archive", "ANY", null)]
+        [InlineData("Orb", "ANY", null)]
+        [InlineData("PCMCIA Card", "ANY", null)]
+        [InlineData("PD650", "ANY", null)]
+        [InlineData("PlayStation Memory Card", "ANY", null)]
+        [InlineData("Quarter-inch cartridge", "ANY", MediaType.DataCartridge)]
+        [InlineData("Quarter-inch mini cartridge", "ANY", MediaType.DataCartridge)]
+        [InlineData("QuickDisk", "ANY", null)]
+        [InlineData("RDX", "ANY", null)]
+        [InlineData("SACD", "ANY", MediaType.DVD)]
+        [InlineData("Scalable Linear Recording", "ANY", null)]
+        [InlineData("Secure Digital", "ANY", MediaType.SDCard)]
+        [InlineData("SmartMedia", "ANY", MediaType.SDCard)]
+        [InlineData("Sony Professional Disc", "ANY", null)]
+        [InlineData("Sony Professional Disc for DATA", "ANY", null)]
+        [InlineData("STK 4480", "ANY", null)]
+        [InlineData("STK 4490", "ANY", null)]
+        [InlineData("STK 9490", "ANY", null)]
+        [InlineData("STK T-9840", "ANY", null)]
+        [InlineData("STK T-9940", "ANY", null)]
+        [InlineData("STK T-10000", "ANY", null)]
+        [InlineData("Super Advanced Intelligent Tape", "ANY", null)]
+        [InlineData("Super Digital Linear Tape", "ANY", null)]
+        [InlineData("Super Nintendo Game Pak", "ANY", MediaType.Cartridge)]
+        [InlineData("Super Nintendo Game Pak (US)", "ANY", MediaType.Cartridge)]
+        [InlineData("SuperDisk", "ANY", MediaType.FloppyDisk)]
+        [InlineData("SVOD", "ANY", null)]
+        [InlineData("Travan", "ANY", null)]
+        [InlineData("UDO", "ANY", null)]
+        [InlineData("UHD144", "ANY", null)]
+        [InlineData("UMD", "ANY", MediaType.UMD)]
+        [InlineData("Unknown", "ANY", null)]
+        [InlineData("USB flash drive", "ANY", MediaType.FlashDrive)]
+        [InlineData("VCDHD", "ANY", null)]
+        [InlineData("VideoFloppy", "ANY", null)]
+        [InlineData("VideoNow", "ANY", MediaType.CDROM)]
+        [InlineData("VXA", "ANY", MediaType.FlashDrive)]
+        [InlineData("Wafer", "ANY", null)]
+        [InlineData("xD", "ANY", null)]
+        [InlineData("XQD", "ANY", null)]
+        [InlineData("Zoned Hard Disk Drive", "ANY", MediaType.HardDisk)]
+        [InlineData("ZX Microdrive", "ANY", null)]
+        public void GetDiscTypeFromStringsTest(string? discType, string? discSubType, MediaType? expected)
+        {
+            var actual = Aaru.GetDiscTypeFromStrings(discType, discSubType);
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
     }
-}
+}

MPF.Processors.Test/BaseProcessorTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using SabreTools.Data.Models.Logiqx;
 using Xunit;
 
 namespace MPF.Processors.Test
@@ -85,6 +86,43 @@ namespace MPF.Processors.Test
 
         #endregion
 
+        #region GenerateDatafile
+
+        [Fact]
+        public void GenerateDatafile_Empty_Null()
+        {
+            string iso = string.Empty;
+            Datafile? actual = BaseProcessor.GenerateDatafile(iso);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void GenerateDatafile_Invalid_Null()
+        {
+            string iso = "INVALID";
+            Datafile? actual = BaseProcessor.GenerateDatafile(iso);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void GenerateDatafile_Valid_Filled()
+        {
+            string iso = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay", "test.iso");
+            var actual = BaseProcessor.GenerateDatafile(iso);
+
+            Assert.NotNull(actual);
+            Assert.NotNull(actual.Game);
+            var game = Assert.Single(actual.Game);
+            Assert.NotNull(game.Rom);
+            var rom = Assert.Single(game.Rom);
+            Assert.Equal("9", rom.Size);
+            Assert.Equal("560b9f59", rom.CRC);
+            Assert.Equal("edbb6676247e65c2245dd4883ed9fc24", rom.MD5);
+            Assert.Equal("1b33ad54d78085be5ecb1cf1b3e9da821e708075", rom.SHA1);
+        }
+
+        #endregion
+
         #region GetPIC
 
         [Fact]
@@ -272,4 +310,4 @@ FILE ""track (Track 2).bin"" BINARY
 
         #endregion
     }
-}
+}

MPF.Processors.Test/CleanRipTests.cs

@@ -7,17 +7,111 @@ namespace MPF.Processors.Test
 {
     public class CleanRipTests
     {
+        #region DetermineMediaType
+
+        [Fact]
+        public void DetermineMediaType_GC_Empty_GC()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoGameCubeGameDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Wii_Null_Wii()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new CleanRip(RedumpSystem.NintendoWii);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoWiiOpticalDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Other_Null_Null()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new CleanRip(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_GC_Invalid_GC()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoGameCubeGameDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Wii_Invalid_Wii()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new CleanRip(RedumpSystem.NintendoWii);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoWiiOpticalDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Other_Invalid_Invalid()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new CleanRip(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_GC_Valid_GC()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
+            string outputFilename = "test";
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoGameCubeGameDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Wii_Valid_Wii()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
+            string outputFilename = "test";
+            var processor = new CleanRip(RedumpSystem.NintendoWii);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.NintendoWiiOpticalDisc, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Other_Valid_Valid()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
+            string outputFilename = "test";
+            var processor = new CleanRip(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        #endregion
+
         #region GetOutputFiles
 
         [Fact]
-        public void GetOutputFiles_Null_Empty()
+        public void GetOutputFiles_Null_Populated()
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, null);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Empty(actual);
+            var actual = processor.GetOutputFiles(null, outputDirectory, outputFilename);
+            Assert.Equal(3, actual.Count);
         }
 
         [Fact]
@@ -25,9 +119,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(3, actual.Count);
         }
 
@@ -36,9 +130,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.NintendoGameCubeGameDisc, outputDirectory, outputFilename);
             Assert.Equal(3, actual.Count);
         }
 
@@ -47,21 +141,21 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.NintendoWiiOpticalDisc);
+            var processor = new CleanRip(RedumpSystem.NintendoWii);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.NintendoWiiOpticalDisc, outputDirectory, outputFilename);
             Assert.Equal(3, actual.Count);
         }
 
         [Fact]
-        public void GetOutputFiles_Other_Empty()
+        public void GetOutputFiles_Other_Populated()
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.ApertureCard);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Empty(actual);
+            var actual = processor.GetOutputFiles(MediaType.ApertureCard, outputDirectory, outputFilename);
+            Assert.Equal(3, actual.Count);
         }
 
         #endregion
@@ -73,8 +167,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.FoundAllFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(3, actual.Count);
         }
 
@@ -83,8 +177,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
             string outputFilename = "test.iso";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.FoundAllFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -97,8 +191,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.FoundAnyFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.False(actual);
         }
 
@@ -107,8 +201,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
             string outputFilename = "test.iso";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.FoundAnyFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -117,8 +211,8 @@ namespace MPF.Processors.Test
         {
             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);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.FoundAnyFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -131,8 +225,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GenerateArtifacts(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -141,8 +235,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
             string outputFilename = "test.iso";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GenerateArtifacts(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(2, actual.Count);
         }
 
@@ -155,8 +249,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetDeleteableFilePaths(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -165,8 +259,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
             string outputFilename = "test.iso";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetDeleteableFilePaths(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -179,8 +273,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetZippableFilePaths(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -189,13 +283,37 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
             string outputFilename = "test.iso";
-            var processor = new CleanRip(RedumpSystem.NintendoGameCube, MediaType.DVD);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetZippableFilePaths(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(2, actual.Count);
         }
 
         #endregion
 
+        #region GetPreservedFilePaths
+
+        [Fact]
+        public void GetPreservedFilePaths_Invalid_Empty()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetPreservedFilePaths(MediaType.DVD, outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void GetPreservedFilePaths_Valid_Empty()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "CleanRip", "DVD");
+            string outputFilename = "test.iso";
+            var processor = new CleanRip(RedumpSystem.NintendoGameCube);
+            var actual = processor.GetPreservedFilePaths(MediaType.DVD, outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
+        #endregion
+
         #region GenerateCleanripDatafile
 
         [Fact]
@@ -328,4 +446,4 @@ namespace MPF.Processors.Test
 
         #endregion
     }
-}
+}

MPF.Processors.Test/DiscImageCreatorTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using SabreTools.Models.Logiqx;
+using SabreTools.Data.Models.Logiqx;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
@@ -10,6 +10,70 @@ namespace MPF.Processors.Test
     // TODO: Add tests around remaining helper methods
     public class DiscImageCreatorTests
     {
+        #region DetermineMediaType
+
+        [Fact]
+        public void DetermineMediaType_Null_Null()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Invalid_Null()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_BD_Filled()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "BluRay");
+            string outputFilename = "test";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.BluRay, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_CD_Filled()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
+            string outputFilename = "test";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.CDROM, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_DVD_Filled()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "DVD");
+            string outputFilename = "test";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.DVD, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_HDDVD_Filled()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "HDDVD");
+            string outputFilename = "test";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.HDDVD, actual);
+        }
+
+        #endregion
+
         #region GetOutputFiles
 
         [Fact]
@@ -17,9 +81,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, null);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(null, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -28,9 +92,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(26, actual.Count);
         }
 
@@ -39,9 +103,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.GDROM);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.GDROM, outputDirectory, outputFilename);
             Assert.Equal(10, actual.Count);
         }
 
@@ -50,9 +114,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.DVD);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.DVD, outputDirectory, outputFilename);
             Assert.Equal(16, actual.Count);
         }
 
@@ -61,9 +125,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.NintendoGameCubeGameDisc);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.NintendoGameCubeGameDisc, outputDirectory, outputFilename);
             Assert.Equal(16, actual.Count);
         }
 
@@ -72,9 +136,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.NintendoWiiOpticalDisc);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.NintendoWiiOpticalDisc, outputDirectory, outputFilename);
             Assert.Equal(16, actual.Count);
         }
 
@@ -83,9 +147,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.HDDVD);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.HDDVD, outputDirectory, outputFilename);
             Assert.Equal(15, actual.Count);
         }
 
@@ -94,9 +158,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.BluRay);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(15, actual.Count);
         }
 
@@ -105,9 +169,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.FloppyDisk);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.FloppyDisk, outputDirectory, outputFilename);
             Assert.Equal(4, actual.Count);
         }
 
@@ -116,9 +180,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.HardDisk);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.HardDisk, outputDirectory, outputFilename);
             Assert.Equal(4, actual.Count);
         }
 
@@ -127,9 +191,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.ApertureCard);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.ApertureCard, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -142,9 +206,9 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
-            Assert.Equal(17, actual.Count);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAllFiles(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Equal(14, actual.Count);
         }
 
         [Fact]
@@ -152,8 +216,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
             string outputFilename = "test.cue";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAllFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -166,8 +230,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.False(actual);
         }
 
@@ -176,8 +240,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
             string outputFilename = "test.cue";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -186,8 +250,8 @@ namespace MPF.Processors.Test
         {
             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);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.FoundAnyFiles(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -200,8 +264,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GenerateArtifacts(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -210,8 +274,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
             string outputFilename = "test.cue";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GenerateArtifacts(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(21, actual.Count);
         }
 
@@ -224,8 +288,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetDeleteableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -234,8 +298,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
             string outputFilename = "test.cue";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetDeleteableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Equal(2, actual.Count);
         }
 
@@ -248,8 +312,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetZippableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -258,11 +322,35 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
             string outputFilename = "test.cue";
-            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible, MediaType.CDROM);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
-            Assert.Equal(23, actual.Count);
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetZippableFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Equal(24, actual.Count);
         }
 
+        #region GetPreservedFilePaths
+
+        [Fact]
+        public void GetPreservedFilePaths_Invalid_Empty()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetPreservedFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Empty(actual);
+        }
+
+        [Fact]
+        public void GetPreservedFilePaths_Valid_Filled()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM");
+            string outputFilename = "test.cue";
+            var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);
+            var actual = processor.GetPreservedFilePaths(MediaType.CDROM, outputDirectory, outputFilename);
+            Assert.Single(actual);
+        }
+
+        #endregion
+
         #endregion
 
         #region GetCommandFilePathAndVersion
@@ -338,7 +426,7 @@ namespace MPF.Processors.Test
         public void GetDiscType_Empty_Null()
         {
             string disc = string.Empty;
-            bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
+            bool actual = DiscImageCreator.GetDiscType(disc, out _);
             Assert.False(actual);
         }
 
@@ -346,20 +434,50 @@ namespace MPF.Processors.Test
         public void GetDiscType_Invalid_Null()
         {
             string disc = "INVALID";
-            bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
+            bool actual = DiscImageCreator.GetDiscType(disc, out _);
             Assert.False(actual);
         }
 
         [Fact]
-        public void GetDiscType_Valid_Filled()
+        public void GetDiscType_BD_Filled()
         {
-            string? expected = "CD-ROM, GD-ROM, DVD-ROM, BD-ROM";
+            string? expected = "BDO";
+            string disc = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "BluRay", "test_disc.txt");
+            bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
+            Assert.True(actual);
+            Assert.Equal(expected, discTypeOrBookType);
+        }
+
+        [Fact]
+        public void GetDiscType_CD_Filled()
+        {
+            string? expected = "CD-ROM";
             string disc = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "CDROM", "test_disc.txt");
             bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
             Assert.True(actual);
             Assert.Equal(expected, discTypeOrBookType);
         }
 
+        [Fact]
+        public void GetDiscType_DVD_Filled()
+        {
+            string? expected = "DVD-ROM";
+            string disc = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "DVD", "test_disc.txt");
+            bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
+            Assert.True(actual);
+            Assert.Equal(expected, discTypeOrBookType);
+        }
+
+        [Fact]
+        public void GetDiscType_HDDVD_Filled()
+        {
+            string? expected = "HD DVD-ROM";
+            string disc = Path.Combine(Environment.CurrentDirectory, "TestData", "DiscImageCreator", "HDDVD", "test_disc.txt");
+            bool actual = DiscImageCreator.GetDiscType(disc, out string? discTypeOrBookType);
+            Assert.True(actual);
+            Assert.Equal(expected, discTypeOrBookType);
+        }
+
         #endregion
 
         #region GetDVDProtection
@@ -1071,7 +1189,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GetXGDAuxHashInfo_Invalid_Null()
         {
-            Datafile? suppl = new Datafile();
+            Datafile? suppl = new();
             bool actual = DiscImageCreator.GetXGDAuxHashInfo(suppl,
                 out string? dmihash,
                 out string? pfihash,
@@ -1086,7 +1204,7 @@ namespace MPF.Processors.Test
         [Fact]
         public void GetXGDAuxHashInfo_Valid_Filled()
         {
-            Datafile? suppl = new Datafile
+            Datafile? suppl = new()
             {
                 Game =
                 [
@@ -1177,4 +1295,4 @@ namespace MPF.Processors.Test
 
         #endregion
     }
-}
+}

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -24,13 +24,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <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.6" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
+        <PackageReference Include="SabreTools.RedumpLib" Version="[1.9.0]" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.25.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" />
@@ -39,7 +39,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

MPF.Processors.Test/OutputFileTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using MPF.Processors.OutputFiles;
 using Xunit;
 
 namespace MPF.Processors.Test
@@ -15,6 +16,7 @@ namespace MPF.Processors.Test
         [InlineData(OutputFileFlags.Binary, false)]
         [InlineData(OutputFileFlags.Deleteable, false)]
         [InlineData(OutputFileFlags.Zippable, false)]
+        [InlineData(OutputFileFlags.Preserve, false)]
         public void IsRequiredTest(OutputFileFlags flags, bool expected)
         {
             var of = new OutputFile("file", flags, "key");
@@ -33,6 +35,7 @@ namespace MPF.Processors.Test
         [InlineData(OutputFileFlags.Binary, true)]
         [InlineData(OutputFileFlags.Deleteable, false)]
         [InlineData(OutputFileFlags.Zippable, false)]
+        [InlineData(OutputFileFlags.Preserve, false)]
         public void IsArtifactTest(OutputFileFlags flags, bool expected)
         {
             var of = new OutputFile("file", flags, "key");
@@ -51,6 +54,7 @@ namespace MPF.Processors.Test
         [InlineData(OutputFileFlags.Binary, true)]
         [InlineData(OutputFileFlags.Deleteable, false)]
         [InlineData(OutputFileFlags.Zippable, false)]
+        [InlineData(OutputFileFlags.Preserve, false)]
         public void IsBinaryArtifactTest(OutputFileFlags flags, bool expected)
         {
             var of = new OutputFile("file", flags, "key");
@@ -69,6 +73,7 @@ namespace MPF.Processors.Test
         [InlineData(OutputFileFlags.Binary, false)]
         [InlineData(OutputFileFlags.Deleteable, true)]
         [InlineData(OutputFileFlags.Zippable, false)]
+        [InlineData(OutputFileFlags.Preserve, false)]
         public void IsDeleteableTest(OutputFileFlags flags, bool expected)
         {
             var of = new OutputFile("file", flags, "key");
@@ -87,6 +92,7 @@ namespace MPF.Processors.Test
         [InlineData(OutputFileFlags.Binary, false)]
         [InlineData(OutputFileFlags.Deleteable, false)]
         [InlineData(OutputFileFlags.Zippable, true)]
+        [InlineData(OutputFileFlags.Preserve, true)]
         public void IsZippableTest(OutputFileFlags flags, bool expected)
         {
             var of = new OutputFile("file", flags, "key");
@@ -98,6 +104,25 @@ namespace MPF.Processors.Test
             Assert.Equal(expected, rof.IsZippable);
         }
 
+        [Theory]
+        [InlineData(OutputFileFlags.None, false)]
+        [InlineData(OutputFileFlags.Required, false)]
+        [InlineData(OutputFileFlags.Artifact, false)]
+        [InlineData(OutputFileFlags.Binary, false)]
+        [InlineData(OutputFileFlags.Deleteable, false)]
+        [InlineData(OutputFileFlags.Zippable, false)]
+        [InlineData(OutputFileFlags.Preserve, true)]
+        public void IsPreservedTest(OutputFileFlags flags, bool expected)
+        {
+            var of = new OutputFile("file", flags, "key");
+            var cof = new CustomOutputFile("file", flags, "key", File.Exists);
+            var rof = new RegexOutputFile("file", flags, "key");
+
+            Assert.Equal(expected, of.IsPreserved);
+            Assert.Equal(expected, cof.IsPreserved);
+            Assert.Equal(expected, rof.IsPreserved);
+        }
+
         #endregion
 
         #region Exists
@@ -210,4 +235,4 @@ namespace MPF.Processors.Test
 
         #endregion
     }
-}
+}

MPF.Processors.Test/PS3CFWTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using SabreTools.Models.Logiqx;
 using SabreTools.RedumpLib.Data;
 using Xunit;
 
@@ -8,17 +7,51 @@ namespace MPF.Processors.Test
 {
     public class PS3CFWTests
     {
+        #region DetermineMediaType
+
+        [Fact]
+        public void DetermineMediaType_Null_BluRay()
+        {
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.BluRay, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Invalid_BluRay()
+        {
+            string? outputDirectory = null;
+            string outputFilename = "INVALID";
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.BluRay, actual);
+        }
+
+        [Fact]
+        public void DetermineMediaType_Valid_BluRay()
+        {
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
+            string outputFilename = "test";
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.DetermineMediaType(outputDirectory, outputFilename);
+            Assert.Equal(MediaType.BluRay, actual);
+        }
+
+        #endregion
+
         #region GetOutputFiles
 
         [Fact]
-        public void GetOutputFiles_Null_Empty()
+        public void GetOutputFiles_Null_Populated()
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, null);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Empty(actual);
+            var actual = processor.GetOutputFiles(null, outputDirectory, outputFilename);
+            Assert.Equal(4, actual.Count);
         }
 
         [Fact]
@@ -26,21 +59,21 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
+            var actual = processor.GetOutputFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(4, actual.Count);
         }
 
         [Fact]
-        public void GetOutputFiles_Other_Empty()
+        public void GetOutputFiles_Other_Populated()
         {
             string? outputDirectory = null;
             string outputFilename = "test";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.ApertureCard);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
 
-            var actual = processor.GetOutputFiles(outputDirectory, outputFilename);
-            Assert.Empty(actual);
+            var actual = processor.GetOutputFiles(MediaType.ApertureCard, outputDirectory, outputFilename);
+            Assert.Equal(4, actual.Count);
         }
 
         #endregion
@@ -52,8 +85,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.FoundAllFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(3, actual.Count);
         }
 
@@ -62,8 +95,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
             string outputFilename = "test.iso";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.FoundAllFiles(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.FoundAllFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -76,8 +109,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.FoundAnyFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.False(actual);
         }
 
@@ -86,8 +119,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
             string outputFilename = "test.iso";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.FoundAnyFiles(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.FoundAnyFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -96,8 +129,8 @@ namespace MPF.Processors.Test
         {
             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);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.FoundAnyFiles(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.True(actual);
         }
 
@@ -110,8 +143,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GenerateArtifacts(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -120,8 +153,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
             string outputFilename = "test.iso";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GenerateArtifacts(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GenerateArtifacts(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(2, actual.Count);
         }
 
@@ -134,8 +167,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetDeleteableFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -144,8 +177,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
             string outputFilename = "test.iso";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GetDeleteableFilePaths(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetDeleteableFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -158,8 +191,8 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = null;
             string outputFilename = string.Empty;
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetZippableFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Empty(actual);
         }
 
@@ -168,48 +201,35 @@ namespace MPF.Processors.Test
         {
             string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
             string outputFilename = "test.iso";
-            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3, MediaType.BluRay);
-            var actual = processor.GetZippableFilePaths(outputDirectory, outputFilename);
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetZippableFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
             Assert.Equal(2, actual.Count);
         }
 
         #endregion
 
-        #region GeneratePS3CFWDatafile
+        #region GetPreservedFilePaths
 
         [Fact]
-        public void GeneratePS3CFWDatafile_Empty_Null()
+        public void GetPreservedFilePaths_Invalid_Empty()
         {
-            string iso = string.Empty;
-            Datafile? actual = PS3CFW.GeneratePS3CFWDatafile(iso);
-            Assert.Null(actual);
+            string? outputDirectory = null;
+            string outputFilename = string.Empty;
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetPreservedFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
+            Assert.Empty(actual);
         }
 
         [Fact]
-        public void GeneratePS3CFWDatafile_Invalid_Null()
+        public void GetPreservedFilePaths_Valid_Empty()
         {
-            string iso = "INVALID";
-            Datafile? actual = PS3CFW.GeneratePS3CFWDatafile(iso);
-            Assert.Null(actual);
-        }
-
-        [Fact]
-        public void GeneratePS3CFWDatafile_Valid_Filled()
-        {
-            string iso = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay", "test.iso");
-            var actual = PS3CFW.GeneratePS3CFWDatafile(iso);
-
-            Assert.NotNull(actual);
-            Assert.NotNull(actual.Game);
-            var game = Assert.Single(actual.Game);
-            Assert.NotNull(game.Rom);
-            var rom = Assert.Single(game.Rom);
-            Assert.Equal("9", rom.Size);
-            Assert.Equal("560b9f59", rom.CRC);
-            Assert.Equal("edbb6676247e65c2245dd4883ed9fc24", rom.MD5);
-            Assert.Equal("1b33ad54d78085be5ecb1cf1b3e9da821e708075", rom.SHA1);
+            string? outputDirectory = Path.Combine(Environment.CurrentDirectory, "TestData", "PS3CFW", "BluRay");
+            string outputFilename = "test.iso";
+            var processor = new PS3CFW(RedumpSystem.SonyPlayStation3);
+            var actual = processor.GetPreservedFilePaths(MediaType.BluRay, outputDirectory, outputFilename);
+            Assert.Empty(actual);
         }
 
         #endregion
     }
-}
+}