Bump version to 2.6

This also does a replacement for all instances of `?? "";` with `?? string.Empty;`, which is more correct.

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Aaru"]
-	path = Aaru
-	url = https://github.com/aaru-dps/Aaru.git

.vscode/launch.json

@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/MPF/bin/Debug/netcoreapp3.1/MPF.dll",
+            "program": "${workspaceFolder}/MPF.Check/bin/Debug/net6.0/MPF.Check.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/MPF",
+            "cwd": "${workspaceFolder}/MPF.Check",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",
             "stopAtEntry": false

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "omnisharp.projectLoadTimeout": 480
+}

.vscode/tasks.json

@@ -3,25 +3,22 @@
     "tasks": [
         {
             "label": "build",
-            "command": "dotnet",
+            "command": "msbuild",
             "type": "process",
             "args": [
-                "build",
-                "${workspaceFolder}/MPF/MPF.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "${workspaceFolder}/MPF.sln",
+                "-property:RuntimeIdentifiers=win7-x64"
             ],
             "problemMatcher": "$msCompile"
         },
         {
             "label": "publish",
-            "command": "dotnet",
+            "command": "msbuild",
             "type": "process",
             "args": [
-                "publish",
                 "${workspaceFolder}/MPF/MPF.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
+                "-target:Publish",
+                "-property:RuntimeIdentifiers=win7-x64"
             ],
             "problemMatcher": "$msCompile"
         },

CHANGELIST.md

@@ -1,4 +1,199 @@
+### 2.6 (2023-07-xx)
+
+- Update README
+- Add warning to login tab
+- Pull hardware info from redumper log (fuzz6001)
+- Increase the version of AppVeyor (fuzz6001)
+- Add Windows 7 note to README
+- Update redumper to build 113
+- Split MMI invocation in drive listing
+- Update README
+- Add Hasbro iON
+- Get the write offset from the latest redumper (fuzz6001)
+- Update redumper to build 115
+- Update to DIC 20230401
+- Add DIC `.` notice to README
+- Resync with Redump
+- Update redumper to build 118
+- Clarify non-Redump systems
+- Add UltraCade
+- Re-enable BD33 and BD66
+- Add PIC models for BD (unused)
+- Handle PIC based on disc type
+- UMDs always have "2 layers"
+- Add dumping program selection to main UI
+- Update to DIC 20230413
+- Comment out `.` handling for DIC
+- Ensure dumping program box can enable/disable
+- Disable special SmartE handling for DIC
+- Remove path from PS1/PS2 serial
+- Make TOC file optional for CD/GD
+- Add datafile models
+- Add datafile helper method
+- Start migrating to datafile serialization
+- Prepare for future DIC changes
+- Add suppl support to Xbox
+- Support single digit subs
+- Fix info tool hash finding
+- Fix missing size for ISO data
+- Attempt to more accurately parse layerbreaks
+- Fix upcoming suppl DAT parsing
+- Ensure blank lines don't interfere
+- De-indent ringcode data
+- Be more specific with runtime identifiers
+- Fix subdump output path in AV config
+- Fix subdump mkdir path in AV config
+- Single file packing for .NET 6 again
+- Add missing BD disc type identifier string
+- Truncate PIC data for PS4/PS5
+- Add internal theme support with class
+- Add PIC identifier to SubmissionInfo
+- Fix other media type method
+- Fix non-zero offset text
+- Add executable listing for XSX
+- Update redumper to build 151
+- Add more safety to DAT generation
+- Get write offset from redumper 119 (fuzz6001)
+- Update hardware information pull from redumper (fuzz6001)
+- Add MCD/SS header support for Redumper
+- Fix MCD region(s) parsing
+- Update to DIC 20230606
+- Update redumper to build 166
+- Unblock Redumper DVD support
+- Support Redumper DVD layerbreak
+- Add placeholder and TODOs for Redumper
+- Add TODO with notes to Redumper
+- Fix 2-layer DVD support in Redumper
+- Fix VSCode build
+- Fix Redumper DAT/layer parsing
+- Update Redumper PS1 output parsing
+- Fix previous commit, clean up helpers
+- Update redumper to build 173
+- Initial support for Redumper CSS outputs
+- Hook up CSS output for testing
+- Update redumper to build 174
+- Add support for redumper CD synonyms
+- Adjust CSS title key parsing
+- Fix non-reading loop
+- Normalize Redumper CSS outputs
+- Normalize multi-instance site tags
+- Add missing Aaru error log to zip
+- Check Redumper dat section for completeness
+- Update redumper to build 176
+- UMDs are Sony discs
+- Strip colons from Redumper disc key
+- Use `HashSet` for disc or book type
+- Add ordering to disc or book type
+- Update redumper to build 183
+- Parse and format Redumper CD multisession data
+- New layerbreak takes precedence
+- Reduce pulled information for Xbox and X360
+- Ensure we found the tags we're skipping
+- Omit pulling universal hash
+- Update Nuget packages to newest stable
+
+### 2.5 (2023-03-12)
+
+- Add _drive file to zip for UIC
+- Add Xbox Series X and PS5 to list, fix Acorn
+- Add Xbox Series X short name to list
+- Remove windows from test target
+- Remove .NET 6.0 from tests, add TODO
+- Add .NET 6.0 to tests, remove msbuild args
+- Add HD-DVD to speed definitions
+- Add PS3 internal serial and version parsing (tjanas)
+- Update Nuget packages to newest stable
+- Simplify path selection in UI
+- Fix broken normalization test
+- Update drive info before dumping
+- Update redumper strings
+- Add new parameter and mode validation
+- Add redumper to the UI
+- Update redumper to build 81
+- Fix incorrect naming in Options window
+- Initial attempt at parsing redumper outputs
+- Update README
+- Reenable write offset for all CDs
+- Add missing redumper output file
+- Force a filename for redumper
+- Fix incorrect SetParameters
+- Fix a couple redumper things
+- Update AppVeyor version
+- Output security sectors to info
+- Remove x86 requirement for build
+- Fix XGD media type outputs
+- Fix typo in ToInternalProgram
+- Fix redumper error count parsing
+- Update to Aaru v5.3.2 LTS
+- Update options loader with sane defaults
+- Fix AppVeyor pathing
+- Skip during detection
+- Address some UI concerns
+- Tweak AppVeyor, show Check 6.0 builds
+- More strict when custom parameters editing
+- Use msbuild for .NET Framework 4.8
+- Update nuget packages
+- ReadAllText not ReadAllLines
+- Add drive format (fs) to log
+- Go back to pre .NET 7 Aaru
+- Be smarter about old paths
+- Fix relative paths for DIC
+- Add nicer failure message
+- Update to DIC 20230201
+- Use relative path output for DIC
+- Remove usage of Aaru
+- Remove Aaru as submodule
+- Fix Aaru removal
+- Enable .NET 6 Windows builds
+- Update Redumper to build_106
+- Reformat CICM for old .NET versions
+- Attempt to handle no drives
+- Handle no drives better
+- Handle no drives betterer
+- Packaging requires `-windows` for framework
+- Fix other `-windows` places for .NET 6
+- Fix typo in DICMultiSectorReadValue
+- Semi-unify drive finding
+- Introduce cross-platform MMI
+- Remove System.Management
+- Add Redumper Universal Hash support
+- Fix Redumper write offset support
+- Add Redumper non-zero data start
+- Use media size for type detection on .NET 6
+- Trim PIC for PS3
+- Get the version of redumper (fuzz6001)
+- Update VSCode config files
+- Can't publish single file for UI
+- Handle missing extension gracefully
+- Fix incorrect option slider display
+- Handle undetected discs on refresh
+- Originally intended behaviour of the Update Label button (IcySon55)
+- Update to BurnOutSharp 2.7.0
+- Get error count from recent redumper log (fuzz6001)
+- Minor cosmetic changes
+- Set saner defaults for dumping speeds
+- Attempt to support Windows 7
+- Add `win7-x64` to identifier list
+- Remove unsupported identifiers
+- Add identifiers in more places
+- Move drive finding inside of the try/catch
+- Update to DIC 20230309
+- Fix errant forward slashes
+- Add TOC back as optional file
+- Fix Redumper path generation
+- Use and trim quotes for Redumper
+- Fix incorrect image name setting
+- Ensure Redumper parameters are set
+- Ensure min values are taken care of
+- Update parameters with `=` handling
+- Ensure drive and speed are set
+- Handle quotes embedded
+- Return list of missing files for Redumper
+- Readd accidentally deleted line
+- Detect EOF during the search for error counts (fuzz6001)
+
 ### 2.4 (2022-10-26)
+
 - Update to DIC 20211001
 - Fix Redump disc title pulling
 - Add /mr default flag options
@@ -178,6 +373,7 @@
 - Fix offset formatting (fuzz6001)
 
 ### 2.3 (2022-02-05)
+
 - Start overhauling Redump information pulling, again
 - Add internal structure for special site codes
 - Add new tabs for special site information
@@ -262,6 +458,7 @@
 - Adjust paths for DIC just before dumping
 
 ### 2.2 (2021-12-30)
+
 - Fix Saturn header finding
 - Add Pocket PC support
 - Add HD-DVD-Video support
@@ -313,6 +510,7 @@
 - Add safety around volume labels
 
 ### 2.1 (2021-07-22)
+
 - Enum, no more
 - Sony works backward
 - Add experimental dark mode
@@ -342,6 +540,7 @@
 - Update to BurnOutSharp 1.7.0
 
 ### 2.0 (2021-04-23)
+
 - Rename DICUI to Media Preservation Frontend (MPF)
 - Add handling for BEh drive _mainInfo.txt changes
 - Fix multiline regex fields during info pulling
@@ -396,6 +595,7 @@
 - Update to BurnOutSharp 1.6.1
 
 ### 1.18 (2020-11-10)
+
 - Add more information extraction and generation for Aaru
 - Remove instances of CD Check from copy protection (again, sorry)
 - Fix multiline submission info outputs
@@ -420,6 +620,7 @@
 - Added HD-DVD-Video detection
 
 ### 1.17.1 (2020-09-14)
+
 - Shuffled some shared, internal UI variables
 - Synced WPF and Avalonia UI internals
 - Made the disc information window less prone to bugs
@@ -427,6 +628,7 @@
 - Added support for old(?) DIC flags: `/fix` and `/re`
 
 ### 1.17 (2020-09-12)
+
 - Updated to Aaru version 5.1
 - Updated to BurnOutSharp version 1.4.0
 - Updated to DIC version 20200716

MPF.Check/MPF.Check.csproj

@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <Title>MPF Check</Title>
     <AssemblyName>MPF.Check</AssemblyName>
     <Description>Validator for various dumping programs</Description>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.3.4" GeneratePathProperty="true">
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
@@ -42,6 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\MPF.Core\MPF.Core.csproj" />
     <ProjectReference Include="..\MPF.Library\MPF.Library.csproj" />
     <ProjectReference Include="..\RedumpLib\RedumpLib.csproj" />
   </ItemGroup>

MPF.Check/Program.cs

@@ -24,7 +24,7 @@ namespace MPF.Check
                 return;
 
             // Loop through and process options
-            (Options options, string path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2);
+            (Core.Data.Options options, string path, int startIndex) = OptionsLoader.LoadFromArguments(args, startIndex: 2);
 
             // Make new Progress objects
             var resultProgress = new Progress<Result>();
@@ -59,7 +59,7 @@ namespace MPF.Check
                 if (!string.IsNullOrWhiteSpace(path))
                     drive = Drive.Create(null, path);
 
-                var env = new DumpEnvironment(options, "", filepath, drive, knownSystem, mediaType, null);
+                var env = new DumpEnvironment(options, filepath, drive, knownSystem, mediaType, internalProgram: null, parameters: null);
 
                 // Finally, attempt to do the output dance
                 var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress).ConfigureAwait(false).GetAwaiter().GetResult();

MPF.Core/Converters/EnumConverter.cs

@@ -73,56 +73,6 @@ namespace MPF.Core.Converters
                     return null;
             }
         }
-#else
-        /// <summary>
-        /// Convert Aaru media type to a MediaType
-        /// </summary>
-        /// <param name="type">Aaru.CommonTypes.MediaType value to check</param>
-        /// <returns>MediaType if possible, null on error</returns>
-        public static MediaType? MediaTypeToMediaType(this Aaru.CommonTypes.MediaType? type)
-        {
-            if (type == null)
-                return null;
-
-            return (int)type switch
-            {
-                // Generics
-                >= 10 and <= 39 => MediaType.CDROM,
-                >= 40 and <= 50 => MediaType.DVD,
-                >= 51 and <= 59 => MediaType.HDDVD,
-                >= 60 and <= 69 => MediaType.BluRay,
-
-                // Specialty
-                112 => MediaType.CDROM,
-                113 => MediaType.CDROM,
-                114 => MediaType.DVD,
-                115 => MediaType.DVD,
-                116 => MediaType.BluRay,
-                117 => MediaType.BluRay,
-                118 => MediaType.UMD,
-                120 => MediaType.BluRay,
-                150 => MediaType.CDROM,
-                151 => MediaType.CDROM,
-                152 => MediaType.GDROM,
-                153 => MediaType.GDROM,
-                155 => MediaType.CDROM, // MilCD... is this GD-ROM?
-                171 => MediaType.CDROM,
-                172 => MediaType.CDROM,
-                173 => MediaType.CDROM,
-                174 => MediaType.CDROM,
-                175 => MediaType.CDROM,
-                176 => MediaType.CDROM,
-                177 => MediaType.CDROM,
-                178 => MediaType.DVD,
-                179 => MediaType.CDROM,
-                453 => MediaType.NintendoGameCubeGameDisc,
-                463 => MediaType.NintendoWiiOpticalDisc,
-                464 => MediaType.NintendoWiiUOpticalDisc,
-                >= 770 and <= 799 => MediaType.BluRay,
-
-                _ => null,
-            };
-        }
 #endif
 
         #endregion
@@ -148,7 +98,6 @@ namespace MPF.Core.Converters
 
                 if (!LongNameMethods.TryGetValue(sourceType, out MethodInfo method))
                 {
-                    
                     method = typeof(RedumpLib.Data.Extensions).GetMethod("LongName", new[] { typeof(Nullable<>).MakeGenericType(sourceType) });
                     if (method == null)
                         method = typeof(EnumConverter).GetMethod("LongName", new[] { typeof(Nullable<>).MakeGenericType(sourceType) });
@@ -186,7 +135,7 @@ namespace MPF.Core.Converters
                 case InternalProgram.DiscImageCreator:
                     return "DiscImageCreator";
                 case InternalProgram.Redumper:
-                    return "Redumper";
+                    return "redumper";
 
                 #endregion
 
@@ -235,7 +184,7 @@ namespace MPF.Core.Converters
                     return InternalProgram.DiscImageCreator;
                 case "dd":
                     return InternalProgram.DD;
-                case "rd:":
+                case "rd":
                 case "redumper":
                     return InternalProgram.Redumper;
 

MPF.Core/Data/Constants.cs

@@ -19,6 +19,7 @@ namespace MPF.Core.Data
         // Private lists of known drive speed ranges
         private static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
         private static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
+        private static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
         private static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
         private static IReadOnlyList<int> Unknown { get; } = new List<int> { 1 };
 
@@ -35,10 +36,11 @@ namespace MPF.Core.Data
                 case MediaType.GDROM:
                     return CD;
                 case MediaType.DVD:
-                case MediaType.HDDVD:
                 case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     return DVD;
+                case MediaType.HDDVD:
+                    return HDDVD;
                 case MediaType.BluRay:
                     return BD;
                 default:

MPF.Core/Data/Drive.cs

@@ -2,17 +2,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Microsoft.Management.Infrastructure;
+using Microsoft.Management.Infrastructure.Generic;
 using MPF.Core.Converters;
 using MPF.Core.Utilities;
 using RedumpLib.Data;
 #if NETFRAMEWORK
-using System.Management;
 using IMAPI2;
-#else
-using Aaru.CommonTypes.Enums;
-using Aaru.Core.Media.Info;
-using Aaru.Decoders.SCSI.MMC;
-using Aaru.Devices;
 #endif
 
 namespace MPF.Core.Data
@@ -149,6 +145,12 @@ namespace MPF.Core.Data
                 this.TotalSize = driveInfo.TotalSize;
                 this.VolumeLabel = driveInfo.VolumeLabel;
             }
+            else
+            {
+                this.DriveFormat = string.Empty;
+                this.TotalSize = default;
+                this.VolumeLabel = string.Empty;
+            }
         }
 
         #region Public Functionality
@@ -170,7 +172,83 @@ namespace MPF.Core.Data
         /// </summary>
         /// <returns></returns>
         public (MediaType?, string) GetMediaType()
-            => GetMediaType(this.Name, this.InternalDriveType);
+        {
+            // Take care of the non-optical stuff first
+            // TODO: See if any of these can be more granular, like Optical is
+            if (this.InternalDriveType == Data.InternalDriveType.Floppy)
+                return (MediaType.FloppyDisk, null);
+            else if (this.InternalDriveType == Data.InternalDriveType.HardDisk)
+                return (MediaType.HardDisk, null);
+            else if (this.InternalDriveType == Data.InternalDriveType.Removable)
+                return (MediaType.FlashDrive, null);
+#if NET6_0_OR_GREATER
+            else
+                return GetMediaTypeFromSize();
+#endif
+
+            // Get the current drive information
+            string deviceId = null;
+            bool loaded = false;
+            try
+            {
+                // Get the device ID first
+                CimSession session = CimSession.Create(null);
+                var collection = session.QueryInstances("root\\CIMV2", "WQL", $"SELECT * FROM Win32_CDROMDrive WHERE Id = '{this.Letter}:\'");
+
+                foreach (CimInstance instance in collection)
+                {
+                    CimKeyedCollection<CimProperty> properties = instance.CimInstanceProperties;
+                    deviceId = (string)properties["DeviceID"]?.Value;
+                    loaded = (bool)properties["MediaLoaded"]?.Value;
+                }
+
+                // If we got no valid device, we don't care and just return
+                if (deviceId == null)
+                    return (null, "Device could not be found");
+                else if (!loaded)
+                    return (null, "Device is not reporting media loaded");
+
+#if NETFRAMEWORK
+
+                MsftDiscMaster2 discMaster = new MsftDiscMaster2();
+                deviceId = deviceId.ToLower().Replace('\\', '#').Replace('/', '#');
+                string id = null;
+                foreach (var disc in discMaster)
+                {
+                    if (disc.ToString().Contains(deviceId))
+                        id = disc.ToString();
+                }
+
+                // If we couldn't find the drive, we don't care and return
+                if (id == null)
+                    return (null, "Device ID could not be found");
+
+                // Create the required objects for reading from the drive
+                MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
+                recorder.InitializeDiscRecorder(id);
+                MsftDiscFormat2Data dataWriter = new MsftDiscFormat2Data();
+
+                // If the recorder is not supported, just return
+                if (!dataWriter.IsRecorderSupported(recorder))
+                    return (null, "IMAPI2 recorder not supported");
+
+                // Otherwise, set the recorder to get information from
+                dataWriter.Recorder = recorder;
+
+                var media = dataWriter.CurrentPhysicalMediaType;
+                return (media.IMAPIToMediaType(), null);
+
+#else
+
+                return (null, "IMAPI2 recorder not supported");
+
+#endif
+            }
+            catch (Exception ex)
+            {
+                return (null, ex.Message);
+            }
+        }
 
         /// <summary>
         /// Get the current system from drive
@@ -216,7 +294,7 @@ namespace MPF.Core.Data
             {
                 return RedumpSystem.MattelFisherPriceiXL;
             }
-            
+
             // Microsoft Xbox 360
             try
             {
@@ -379,7 +457,7 @@ namespace MPF.Core.Data
             }
             catch { }
 
-#endregion
+            #endregion
 
             // Default return
             return defaultValue;
@@ -491,7 +569,19 @@ namespace MPF.Core.Data
 
         #region Helpers
 
-#if NETFRAMEWORK
+        /// <summary>
+        /// Get the media type for a device path based on size
+        /// </summary>
+        /// <returns>MediaType, null on error</returns>
+        private (MediaType?, string) GetMediaTypeFromSize()
+        {
+            if (this.TotalSize >= 0 && this.TotalSize < 800_000_000 && this.DriveFormat == "CDFS")
+                return (MediaType.CDROM, null);
+            else if (this.TotalSize >= 400_000_000 && this.TotalSize <= 8_540_000_000 && this.DriveFormat == "UDF")
+                return (MediaType.DVD, null);
+            else
+                return (MediaType.BluRay, null);
+        }
 
         /// <summary>
         /// Get all current attached Drives
@@ -511,26 +601,38 @@ namespace MPF.Core.Data
                 desiredDriveTypes.Add(DriveType.Removable);
             }
 
-            // Get all supported drive types
-            var drives = DriveInfo.GetDrives()
-                .Where(d => desiredDriveTypes.Contains(d.DriveType))
-                .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
-                .ToList();
+            // TODO: Reduce reliance on `DriveInfo`
+            // https://github.com/aaru-dps/Aaru/blob/5164a154e2145941472f2ee0aeb2eff3338ecbb3/Aaru.Devices/Windows/ListDevices.cs#L66
 
-            // Get the floppy drives and set the flag from removable
+            // Create an output drive list
+            List<Drive> drives = new List<Drive>();
+
+            // Get all standard supported drive types
             try
             {
-                ManagementObjectSearcher searcher =
-                    new ManagementObjectSearcher("root\\CIMV2",
-                    "SELECT * FROM Win32_LogicalDisk");
+                drives = DriveInfo.GetDrives()
+                    .Where(d => desiredDriveTypes.Contains(d.DriveType))
+                    .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
+                    .ToList();
+            }
+            catch
+            {
+                return drives;
+            }
 
-                var collection = searcher.Get();
-                foreach (ManagementObject queryObj in collection)
+            // Find and update all floppy drives
+            try
+            {
+                CimSession session = CimSession.Create(null);
+                var collection = session.QueryInstances("root\\CIMV2", "WQL", "SELECT * FROM Win32_LogicalDisk");
+
+                foreach (CimInstance instance in collection)
                 {
-                    uint? mediaType = (uint?)queryObj["MediaType"];
+                    CimKeyedCollection<CimProperty> properties = instance.CimInstanceProperties;
+                    uint? mediaType = properties["MediaType"]?.Value as uint?;
                     if (mediaType != null && ((mediaType > 0 && mediaType < 11) || (mediaType > 12 && mediaType < 22)))
                     {
-                        char devId = queryObj["DeviceID"].ToString()[0];
+                        char devId = (properties["Caption"].Value as string)[0];
                         drives.ForEach(d => { if (d.Letter == devId) { d.InternalDriveType = Data.InternalDriveType.Floppy; } });
                     }
                 }
@@ -543,317 +645,6 @@ namespace MPF.Core.Data
             return drives;
         }
 
-        /// <summary>
-        /// Get the media type for a device path using the Aaru libraries
-        /// </summary>
-        /// <param name="devicePath">Path to the device</param>
-        /// <param name="internalDriveType">Current internal drive type</param>
-        /// <returns>MediaType, null on error</returns>
-        private static (MediaType?, string) GetMediaType(string devicePath, InternalDriveType? internalDriveType)
-        {
-            char driveLetter = devicePath == null || !devicePath.Any() ? '\0' : devicePath[0];
-
-            // Take care of the non-optical stuff first
-            // TODO: See if any of these can be more granular, like Optical is
-            if (internalDriveType == Data.InternalDriveType.Floppy)
-                return (MediaType.FloppyDisk, null);
-            else if (internalDriveType == Data.InternalDriveType.HardDisk)
-                return (MediaType.HardDisk, null);
-            else if (internalDriveType == Data.InternalDriveType.Removable)
-                return (MediaType.FlashDrive, null);
-
-            // Get the current drive information
-            string deviceId = null;
-            bool loaded = false;
-            try
-            {
-                // Get the device ID first
-                var searcher = new ManagementObjectSearcher(
-                    "root\\CIMV2",
-                    $"SELECT * FROM Win32_CDROMDrive WHERE Id = '{driveLetter}:\'");
-
-                foreach (ManagementObject queryObj in searcher.Get())
-                {
-                    deviceId = (string)queryObj["DeviceID"];
-                    loaded = (bool)queryObj["MediaLoaded"];
-                }
-
-                // If we got no valid device, we don't care and just return
-                if (deviceId == null)
-                    return (null, "Device could not be found");
-                else if (!loaded)
-                    return (null, "Device is not reporting media loaded");
-
-                MsftDiscMaster2 discMaster = new MsftDiscMaster2();
-                deviceId = deviceId.ToLower().Replace('\\', '#').Replace('/', '#');
-                string id = null;
-                foreach (var disc in discMaster)
-                {
-                    if (disc.ToString().Contains(deviceId))
-                        id = disc.ToString();
-                }
-
-                // If we couldn't find the drive, we don't care and return
-                if (id == null)
-                    return (null, "Device ID could not be found");
-
-                // Create the required objects for reading from the drive
-                MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
-                recorder.InitializeDiscRecorder(id);
-                MsftDiscFormat2Data dataWriter = new MsftDiscFormat2Data();
-
-                // If the recorder is not supported, just return
-                if (!dataWriter.IsRecorderSupported(recorder))
-                    return (null, "IMAPI2 recorder not supported");
-
-                // Otherwise, set the recorder to get information from
-                dataWriter.Recorder = recorder;
-
-                var media = dataWriter.CurrentPhysicalMediaType;
-                return (media.IMAPIToMediaType(), null);
-            }
-            catch (Exception ex)
-            {
-                return (null, ex.Message);
-            }
-        }
-
-#else
-
-        /// <summary>
-        /// Get all devices attached converted to Drive objects
-        /// </summary>
-        /// <param name="ignoreFixedDrives">True to ignore fixed drives from population, false otherwise</param>
-        /// <returns>List of drives, null on error</returns>
-        private static List<Drive> GetDriveList(bool ignoreFixedDrives)
-        {
-            DeviceInfo[] deviceInfos = Device.ListDevices();
-            if (deviceInfos == null)
-                return null;
-
-            var drives = new List<Drive>();
-            foreach (DeviceInfo deviceInfo in deviceInfos)
-            {
-                if (deviceInfo.Path == null)
-                    continue;
-
-                if (!deviceInfo.Supported)
-                    continue;
-
-                var drive = GetDriveFromDevice(deviceInfo.Path, ignoreFixedDrives);
-                if (drive == null)
-                    continue;
-
-                drives.Add(drive);
-            }
-
-            return drives;
-        }
-
-        /// <summary>
-        /// Generate a Drive object from a single device
-        /// </summary>
-        /// <param name="devicePath">Path to the device</param>
-        /// <param name="ignoreFixedDrives">True to ignore fixed drives from population, false otherwise</param>
-        /// <returns>Drive object for the device, null on error</returns>
-        private static Drive GetDriveFromDevice(string devicePath, bool ignoreFixedDrives)
-        {
-            if (devicePath.Length == 2 &&
-               devicePath[1] == ':' &&
-               devicePath[0] != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            string windowsLocalDevicePath = devicePath;
-            if (windowsLocalDevicePath.StartsWith("\\\\.\\"))
-                windowsLocalDevicePath = windowsLocalDevicePath.Substring("\\\\.\\".Length);
-
-            var dev = Device.Create(devicePath, out _);
-            if (dev == null || dev.Error)
-                return null;
-
-            var devInfo = new Aaru.Core.Devices.Info.DeviceInfo(dev);
-            if (devInfo.MmcConfiguration != null)
-            {
-                Features.SeparatedFeatures ftr = Features.Separate(devInfo.MmcConfiguration);
-                if (ftr.Descriptors != null && ftr.Descriptors.Any(d => d.Code == 0x0000))
-                {
-                    var desc = ftr.Descriptors.First(d => d.Code == 0x0000);
-                    bool isOptical = IsOptical(desc.Data);
-                    if (isOptical)
-                        return Create(Data.InternalDriveType.Optical, windowsLocalDevicePath);
-                    else if (!ignoreFixedDrives)
-                        return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-                }
-            }
-
-            if (!ignoreFixedDrives)
-            {
-                switch (dev.Type)
-                {
-                    case DeviceType.MMC:
-                        return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-
-                    case DeviceType.SecureDigital:
-                        return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-                }
-
-                if (dev.IsUsb)
-                    return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-
-                if (dev.IsFireWire)
-                    return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-
-                if (dev.IsPcmcia)
-                    return Create(Data.InternalDriveType.Removable, windowsLocalDevicePath);
-            }
-
-            dev.Close();
-            return null;
-        }
-
-        /// <summary>
-        /// Get the media type for a device path using the Aaru libraries
-        /// </summary>
-        /// <param name="devicePath">Path to the device</param>
-        /// <param name="internalDriveType">Current internal drive type</param>
-        /// <returns>MediaType, null on error</returns>
-        /// <remarks>
-        /// TODO: Get the device type for devices with set media types
-        /// </remarks>
-        private static (MediaType?, string) GetMediaType(string devicePath, InternalDriveType? internalDriveType)
-        {
-            if (devicePath.Length == 2 &&
-               devicePath[1] == ':' &&
-               devicePath[0] != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            var dev = Device.Create(devicePath, out _);
-            if (dev == null || dev.Error)
-                return (null, "Device could not be accessed");
-
-            switch (dev.Type)
-            {
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI:
-                    ScsiInfo scsiInfo = new ScsiInfo(dev);
-                    var mediaType = EnumConverter.MediaTypeToMediaType(scsiInfo?.MediaType);
-                    if (mediaType == null)
-                        return (mediaType, "Could not determine media type");
-                    else
-                        return (mediaType, null);
-            }
-
-            return (null, "Device does not support media type finding");
-        }
-
-        /// <summary>
-        /// Determine if a drive is optical or not
-        /// </summary>
-        /// <param name="featureBytes">Bytes representing the field to check</param>
-        /// <returns>True if the drive is optical, false otherwise</returns>
-        private static bool IsOptical(byte[] featureBytes)
-        {
-            var supportedMediaTypes = OpticalMediaSupport(featureBytes);
-            if (supportedMediaTypes == null || !supportedMediaTypes.Any())
-                return false;
-
-            if (supportedMediaTypes.Contains(MediaType.CDROM))
-                return true;
-            else if (supportedMediaTypes.Contains(MediaType.DVD))
-                return true;
-            else if (supportedMediaTypes.Contains(MediaType.BluRay))
-                return true;
-            else if (supportedMediaTypes.Contains(MediaType.HDDVD))
-                return true;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Get supported media types for a drive
-        /// </summary>
-        /// <param name="featureBytes">Bytes representing the field to check</param>
-        /// <returns>List of supported media types, null on error</returns>
-        private static List<MediaType> OpticalMediaSupport(byte[] featureBytes)
-        {
-            Feature_0000? feature = Features.Decode_0000(featureBytes);
-
-            if (!feature.HasValue)
-                return null;
-
-            var supportedMediaTypes = new List<MediaType>();
-            foreach (Profile prof in feature.Value.Profiles)
-            {
-                switch (prof.Number)
-                {
-                    // Values we don't care about for Optical
-                    case ProfileNumber.Reserved:
-                    case ProfileNumber.NonRemovable:
-                    case ProfileNumber.Removable:
-                    case ProfileNumber.MOErasable:
-                    case ProfileNumber.OpticalWORM:
-                    case ProfileNumber.ASMO:
-                    case ProfileNumber.Unconforming:
-                        break;
-
-                    // Every supported optical profile
-                    case ProfileNumber.CDROM:
-                    case ProfileNumber.CDR:
-                    case ProfileNumber.CDRW:
-                        supportedMediaTypes.Add(MediaType.CDROM);
-                        break;
-
-                    case ProfileNumber.DVDROM:
-                    case ProfileNumber.DVDRSeq:
-                    case ProfileNumber.DVDRAM:
-                    case ProfileNumber.DVDRWRes:
-                    case ProfileNumber.DVDRWSeq:
-                    case ProfileNumber.DVDRDLSeq:
-                    case ProfileNumber.DVDRDLJump:
-                    case ProfileNumber.DVDRWDL:
-                    case ProfileNumber.DVDDownload:
-                    case ProfileNumber.DVDRWPlus:
-                    case ProfileNumber.DVDRPlus:
-                    case ProfileNumber.DVDRWDLPlus:
-                    case ProfileNumber.DVDRDLPlus:
-                        supportedMediaTypes.Add(MediaType.DVD);
-                        break;
-
-                    // TODO: Add DDCD as media type
-                    case ProfileNumber.DDCDROM:
-                    case ProfileNumber.DDCDR:
-                    case ProfileNumber.DDCDRW:
-                        supportedMediaTypes.Add(MediaType.DVD);
-                        break;
-
-                    case ProfileNumber.BDROM:
-                    case ProfileNumber.BDRSeq:
-                    case ProfileNumber.BDRRdm:
-                    case ProfileNumber.BDRE:
-                        supportedMediaTypes.Add(MediaType.BluRay);
-                        break;
-
-                    case ProfileNumber.HDDVDROM:
-                    case ProfileNumber.HDDVDR:
-                    case ProfileNumber.HDDVDRAM:
-                    case ProfileNumber.HDDVDRW:
-                    case ProfileNumber.HDDVDRDL:
-                    case ProfileNumber.HDDVDRWDL:
-                    case ProfileNumber.HDBURNROM:
-                    case ProfileNumber.HDBURNR:
-                    case ProfileNumber.HDBURNRW:
-                        supportedMediaTypes.Add(MediaType.HDDVD);
-                        break;
-                }
-            }
-
-            return supportedMediaTypes.Distinct().ToList();
-        }
-
-#endif
-
         #endregion
     }
 }

MPF.Core/Data/Options.cs

@@ -44,7 +44,7 @@ namespace MPF.Core.Data
         /// </summary>
         public string RedumperPath
         {
-            get { return GetStringSetting(_settings, "RedumperPath", "Programs\\RedumperPath\\redumper.exe"); }
+            get { return GetStringSetting(_settings, "RedumperPath", "Programs\\Redumper\\redumper.exe"); }
             set { _settings["RedumperPath"] = value; }
         }
 
@@ -87,6 +87,15 @@ namespace MPF.Core.Data
             set { _settings["CheckForUpdatesOnStartup"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Fast update label - Skips disc checks and updates path only
+        /// </summary>
+        public bool FastUpdateLabel
+        {
+            get { return GetBooleanSetting(_settings, "FastUpdateLabel", false); }
+            set { _settings["FastUpdateLabel"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Default output path for dumps
         /// </summary>
@@ -132,7 +141,7 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedCD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedCD", 72); }
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedCD", 24); }
             set { _settings["PreferredDumpSpeedCD"] = value.ToString(); }
         }
 
@@ -141,16 +150,25 @@ namespace MPF.Core.Data
         /// </summary>
         public int PreferredDumpSpeedDVD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedDVD", 24); }
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedDVD", 16); }
             set { _settings["PreferredDumpSpeedDVD"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Default HD-DVD dumping speed
+        /// </summary>
+        public int PreferredDumpSpeedHDDVD
+        {
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedHDDVD", 8); }
+            set { _settings["PreferredDumpSpeedHDDVD"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Default BD dumping speed
         /// </summary>
         public int PreferredDumpSpeedBD
         {
-            get { return GetInt32Setting(_settings, "PreferredDumpSpeedBD", 16); }
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedBD", 8); }
             set { _settings["PreferredDumpSpeedBD"] = value.ToString(); }
         }
 
@@ -222,7 +240,7 @@ namespace MPF.Core.Data
         public int DICMultiSectorReadValue
         {
             get { return GetInt32Setting(_settings, "DICMultiSectorReadValue", 0); }
-            set { _settings["DICMultiSectorRead"] = value.ToString(); }
+            set { _settings["DICMultiSectorReadValue"] = value.ToString(); }
         }
 
         /// <summary>
@@ -286,6 +304,37 @@ namespace MPF.Core.Data
 
         #endregion
 
+        #region Redumper
+
+        /// <summary>
+        /// Enable debug output while dumping by default
+        /// </summary>
+        public bool RedumperEnableDebug
+        {
+            get { return GetBooleanSetting(_settings, "RedumperEnableDebug", false); }
+            set { _settings["RedumperEnableDebug"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Enable verbose output while dumping by default
+        /// </summary>
+        public bool RedumperEnableVerbose
+        {
+            get { return GetBooleanSetting(_settings, "RedumperEnableVerbose", false); }
+            set { _settings["RedumperEnableVerbose"] = value.ToString(); }
+        }
+
+        /// <summary>
+        /// Default number of rereads
+        /// </summary>
+        public int RedumperRereadCount
+        {
+            get { return GetInt32Setting(_settings, "RedumperRereadCount", 20); }
+            set { _settings["RedumperRereadCount"] = value.ToString(); }
+        }
+
+        #endregion
+
         #region Extra Dumping Options
 
         /// <summary>

MPF.Core/Data/PICDiscInformation.cs

@@ -0,0 +1,38 @@
+namespace MPF.Core.Data
+{
+    /// <summary>
+    /// Disc Information and Emergency Brake data shall be read from the PIC zone. DI units that
+    /// contain physical information shall be returned.Emergency Brake data shall be returned.The
+    /// information shall be collected from the layer specified in the Layer field of the CDB. If any data
+    /// can be returned, 4 100 bytes shall be returned.
+    /// </summary>
+    /// <see href="https://www.t10.org/ftp/t10/document.05/05-206r0.pdf"/>
+    /// <see href="https://github.com/aaru-dps/Aaru.Decoders/blob/devel/Bluray/DI.cs"/>
+    public class PICDiscInformation
+    {
+        #region Fields
+
+        /// <summary>
+        /// 2048 bytes for BD-ROM, 3584 bytes for BD-R/RE
+        /// </summary>
+        /// <remarks>Big-endian format</remarks>
+        public ushort DataStructureLength { get; set; }
+
+        /// <summary>
+        /// Should be 0x00
+        /// </summary>
+        public byte Reserved0 { get; set; }
+
+        /// <summary>
+        /// Should be 0x00
+        /// </summary>
+        public byte Reserved1 { get; set; }
+
+        /// <summary>
+        /// Disc information and emergency brake units
+        /// </summary>
+        public PICDiscInformationUnit[] Units { get; set; }
+
+        #endregion
+    }
+}

MPF.Core/Data/PICDiscInformationUnit.cs

@@ -0,0 +1,114 @@
+namespace MPF.Core.Data
+{
+    /// <see href="https://www.t10.org/ftp/t10/document.05/05-206r0.pdf"/>
+    /// <see href="https://github.com/aaru-dps/Aaru.Decoders/blob/devel/Bluray/DI.cs"/>
+    public class PICDiscInformationUnit
+    {
+        #region Fields
+
+        #region Header
+
+        /// <summary>
+        /// Disc Information Identifier "DI"
+        /// Emergency Brake Identifier "EB"
+        /// </summary>
+        public string DiscInformationIdentifier { get; set; }
+
+        /// <summary>
+        /// Disc Information Format
+        /// </summary>
+        public byte DiscInformationFormat { get; set; }
+
+        /// <summary>
+        /// Number of DI units in each DI block
+        /// </summary>
+        public byte NumberOfUnitsInBlock { get; set; }
+
+        /// <summary>
+        /// Should be 0x00
+        /// </summary>
+        public byte Reserved0 { get; set; }
+
+        /// <summary>
+        /// DI unit Sequence Number
+        /// </summary>
+        public byte SequenceNumber { get; set; }
+
+        /// <summary>
+        /// Number of bytes in use in this DI unit
+        /// </summary>
+        public byte BytesInUse { get; set; }
+
+        /// <summary>
+        /// Should be 0x00
+        /// </summary>
+        public byte Reserved1 { get; set; }
+
+        #endregion
+
+        // TODO: Write models for the dependent contents, if possible
+        #region Body
+
+        /// <summary>
+        /// Disc Type Identifier
+        /// = "BDO" for BD-ROM
+        /// = "BDU" for BD-ROM Ultra
+        /// = "BDW" for BD-RE
+        /// = "BDR" for BD-R
+        /// </summary>
+        public string DiscTypeIdentifier { get; set; }
+
+        /// <summary>
+        /// Disc Size/Class/Version
+        /// </summary>
+        public byte DiscSizeClassVersion { get; set; }
+
+        /// <summary>
+        /// DI Unit Format dependent contents
+        /// </summary>
+        /// <remarks>52 bytes for BD-ROM, 100 bytes for BD-R/RE</remarks>
+        public byte[] FormatDependentContents { get; set; }
+
+        #endregion
+
+        #region Trailer (BD-R/RE only)
+
+        /// <summary>
+        /// Disc Manufacturer ID
+        /// </summary>
+        /// <remarks>6 bytes</remarks>
+        public byte[] DiscManufacturerID { get; set; }
+
+        /// <summary>
+        /// Media Type ID
+        /// </summary>
+        /// <remarks>3 bytes</remarks>
+        public byte[] MediaTypeID { get; set; }
+
+        /// <summary>
+        /// Time Stamp
+        /// </summary>
+        public ushort TimeStamp { get; set; }
+
+        /// <summary>
+        /// Product Revision Number
+        /// </summary>
+        public byte ProductRevisionNumber { get; set; }
+
+        #endregion
+
+        #endregion
+
+        #region Constants
+
+        public const string DiscTypeIdentifierROM = "BDO";
+
+        public const string DiscTypeIdentifierROMUltra = "BDU";
+
+        public const string DiscTypeIdentifierReWritable = "BDW";
+
+        public const string DiscTypeIdentifierRecordable = "BDR";
+
+        #endregion
+    }
+}

MPF.Core/MPF.Core.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
@@ -45,20 +45,10 @@
     <ProjectReference Include="..\RedumpLib\RedumpLib.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
-    <ProjectReference Include="..\Aaru\CICMMetadata\CICMMetadataEditor\CICMMetadataEditor\CICMMetadataEditor.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <ProjectReference Include="..\Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.Core\Aaru.Core.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.Devices\Aaru.Devices.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
-    <PackageReference Include="System.Management" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
 

MPF.Core/Utilities/EnumExtensions.cs

@@ -72,6 +72,7 @@ namespace MPF.Core.Utilities
                 case RedumpSystem.SonyPlayStation3:
                 case RedumpSystem.SonyPlayStation4:
                 //case RedumpSystem.SonyPlayStation5:
+                case RedumpSystem.SonyPlayStationPortable:
                     return true;
                 default:
                     return false;
@@ -94,6 +95,7 @@ namespace MPF.Core.Utilities
                 case RedumpSystem.AtariJaguarCDInteractiveMultimediaSystem:
                 case RedumpSystem.AudioCD:
                 case RedumpSystem.DVDAudio:
+                case RedumpSystem.HasbroiONEducationalGamingSystem:
                 case RedumpSystem.HasbroVideoNow:
                 case RedumpSystem.HasbroVideoNowColor:
                 case RedumpSystem.HasbroVideoNowJr:

MPF.Core/Utilities/OptionsLoader.cs

@@ -14,8 +14,16 @@ namespace MPF.Core.Utilities
         /// </summary>
         public static (Options, string, int) LoadFromArguments(string[] args, int startIndex = 0)
         {
-            // Create the output values
-            var options = new Options();
+            // Create the output values with defaults
+            var options = new Options()
+            {
+                RedumpUsername = null,
+                RedumpPassword = null,
+                InternalProgram = InternalProgram.NONE,
+                OutputSubmissionJSON = false,
+                CompressLogFiles = false,
+            };
+
             string parsedPath = null;
 
             // These values require multiple parts to be active

MPF.Core/Utilities/Tools.cs

@@ -161,8 +161,15 @@ namespace MPF.Core.Utilities
         /// </summary>
         public static string GetCurrentVersion()
         {
-            var assemblyVersion = Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
-            return assemblyVersion.InformationalVersion;
+            try
+            {
+                var assemblyVersion = Attribute.GetCustomAttribute(Assembly.GetEntryAssembly(), typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
+                return assemblyVersion.InformationalVersion;
+            }
+            catch (Exception ex)
+            {
+                return ex.ToString();
+            }
         }
 
         /// <summary>

MPF.CueSheets/MPF.CueSheets.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Library/DumpEnvironment.cs

@@ -19,14 +19,9 @@ namespace MPF.Library
         #region Output paths
 
         /// <summary>
-        /// Base output directory to write files to
+        /// Base output file path to write files to
         /// </summary>
-        public string OutputDirectory { get; private set; }
-
-        /// <summary>
-        /// Base output filename for output
-        /// </summary>
-        public string OutputFilename { get; private set; }
+        public string OutputPath { get; private set; }
 
         #endregion
 
@@ -47,10 +42,15 @@ namespace MPF.Library
         /// </summary>
         public MediaType? Type { get; private set; }
 
+        /// <summary>
+        /// Currently selected dumping program
+        /// </summary>
+        public InternalProgram InternalProgram { get; private set; }
+
         /// <summary>
         /// Options object representing user-defined options
         /// </summary>
-        public Options Options { get; private set; }
+        public Core.Data.Options Options { get; private set; }
 
         /// <summary>
         /// Parameters object representing what to send to the internal program
@@ -87,30 +87,31 @@ namespace MPF.Library
         /// Constructor for a full DumpEnvironment object from user information
         /// </summary>
         /// <param name="options"></param>
-        /// <param name="outputDirectory"></param>
-        /// <param name="outputFilename"></param>
+        /// <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 outputDirectory,
-            string outputFilename,
+        public DumpEnvironment(Core.Data.Options options,
+            string outputPath,
             Drive drive,
             RedumpSystem? system,
             MediaType? type,
+            InternalProgram? internalProgram,
             string parameters)
         {
             // Set options object
             this.Options = options;
 
             // Output paths
-            (this.OutputDirectory, this.OutputFilename) = InfoTool.NormalizeOutputPaths(outputDirectory, outputFilename);
+            this.OutputPath = InfoTool.NormalizeOutputPaths(outputPath);
 
             // UI information
             this.Drive = drive;
             this.System = system ?? options.DefaultSystem;
             this.Type = type ?? MediaType.NONE;
+            this.InternalProgram = internalProgram ?? options.InternalProgram;
             
             // Dumping program
             SetParameters(parameters);
@@ -127,20 +128,32 @@ namespace MPF.Library
             if (this.Parameters.InternalProgram != InternalProgram.DiscImageCreator)
                 return;
 
-            // Replace all instances in the output directory
-            this.OutputDirectory = this.OutputDirectory.Replace('.', '_');
+            try
+            {
+                // Normalize the output path
+                string outputPath = InfoTool.NormalizeOutputPaths(this.OutputPath);
 
-            // Currently, only periods in directories matter
-            // Leave the following code commented in case filename handling breaks again
+                // Replace all instances in the output directory
+                string outputDirectory = Path.GetDirectoryName(outputPath);
+                outputDirectory = outputDirectory.Replace(".", "_");
 
-            // Replace all instances in the output filename, except the extension
-            //string tempFilename = Path.GetFileNameWithoutExtension(this.OutputFilename)
-            //    .Replace('.', '_');
-            //string tempExtension = Path.GetExtension(this.OutputFilename)?.TrimStart('.');
-            //this.OutputFilename = $"{tempFilename}.{tempExtension}";
+                // Replace all instances in the output filename
+                string outputFilename = Path.GetFileNameWithoutExtension(outputPath);
+                outputFilename = outputFilename.Replace(".", "_");
 
-            // Assign the path to the filename as well for dumping
-            ((Modules.DiscImageCreator.Parameters)this.Parameters).Filename = Path.Combine(this.OutputDirectory, this.OutputFilename);
+                // Get the extension for recreating the path
+                string outputExtension = Path.GetExtension(outputPath).TrimStart('.');
+
+                // Rebuild the output path
+                if (!string.IsNullOrWhiteSpace(outputExtension))
+                    this.OutputPath = Path.Combine(outputDirectory, $"{outputFilename}.{outputExtension}");
+                else
+                    this.OutputPath = Path.Combine(outputDirectory, outputFilename);
+
+                // Assign the path to the filename as well for dumping
+                ((Modules.DiscImageCreator.Parameters)this.Parameters).Filename = this.OutputPath;
+            }
+            catch { }
         }
 
         /// <summary>
@@ -149,7 +162,7 @@ namespace MPF.Library
         /// <param name="parameters">String representation of the parameters</param>
         public void SetParameters(string parameters)
         {
-            switch (Options.InternalProgram)
+            switch (this.InternalProgram)
             {
                 // Dumping support
                 case InternalProgram.Aaru:
@@ -165,7 +178,7 @@ namespace MPF.Library
                     break;
 
                 case InternalProgram.Redumper:
-                    this.Parameters = new Modules.DD.Parameters(parameters) { ExecutablePath = Options.RedumperPath };
+                    this.Parameters = new Modules.Redumper.Parameters(parameters) { ExecutablePath = Options.RedumperPath };
                     break;
 
                 // Verification support only
@@ -207,28 +220,27 @@ namespace MPF.Library
                     return null;
 
                 // Set the proper parameters
-                string filename = OutputDirectory + Path.DirectorySeparatorChar + OutputFilename;
-                switch (Options.InternalProgram)
+                switch (this.InternalProgram)
                 {
                     case InternalProgram.Aaru:
-                        Parameters = new Modules.Aaru.Parameters(System, Type, Drive.Letter, filename, driveSpeed, Options);
+                        Parameters = new Modules.Aaru.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
                         break;
 
                     case InternalProgram.DD:
-                        Parameters = new Modules.DD.Parameters(System, Type, Drive.Letter, filename, driveSpeed, Options);
+                        Parameters = new Modules.DD.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
                         break;
 
                     case InternalProgram.DiscImageCreator:
-                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, filename, driveSpeed, Options);
+                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
                         break;
 
                     case InternalProgram.Redumper:
-                        Parameters = new Modules.Redumper.Parameters(System, Type, Drive.Letter, filename, driveSpeed, Options);
+                        Parameters = new Modules.Redumper.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
                         break;
 
                     // This should never happen, but it needs a fallback
                     default:
-                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, filename, driveSpeed, Options);
+                        Parameters = new Modules.DiscImageCreator.Parameters(System, Type, Drive.Letter, this.OutputPath, driveSpeed, Options);
                         break;
                 }
 
@@ -279,10 +291,10 @@ namespace MPF.Library
             }
 
             // Execute internal tool
-            progress?.Report(Result.Success($"Executing {Options.InternalProgram}... {(Options.ToolsInSeparateWindow ? "please wait!" : "see log for output!")}"));
-            Directory.CreateDirectory(OutputDirectory);
+            progress?.Report(Result.Success($"Executing {this.InternalProgram}... {(Options.ToolsInSeparateWindow ? "please wait!" : "see log for output!")}"));
+            Directory.CreateDirectory(Path.GetDirectoryName(this.OutputPath));
             await Task.Run(() => Parameters.ExecuteInternalProgram(Options.ToolsInSeparateWindow));
-            progress?.Report(Result.Success($"{Options.InternalProgram} has finished!"));
+            progress?.Report(Result.Success($"{this.InternalProgram} has finished!"));
 
             // Execute additional tools
             progress?.Report(Result.Success("Running any additional tools... see log for output!"));
@@ -313,8 +325,12 @@ namespace MPF.Library
         {
             resultProgress?.Report(Result.Success("Gathering submission information... please wait!"));
 
+            // Get the output directory and filename separately
+            string outputDirectory = Path.GetDirectoryName(this.OutputPath);
+            string outputFilename = Path.GetFileName(this.OutputPath);
+
             // Check to make sure that the output had all the correct files
-            (bool foundFiles, List<string> missingFiles) = InfoTool.FoundAllFiles(this.OutputDirectory, this.OutputFilename, this.Parameters, false);
+            (bool foundFiles, List<string> missingFiles) = InfoTool.FoundAllFiles(outputDirectory, outputFilename, this.Parameters, false);
             if (!foundFiles)
             {
                 resultProgress?.Report(Result.Failure($"There were files missing from the output:\n{string.Join("\n", missingFiles)}"));
@@ -324,8 +340,7 @@ namespace MPF.Library
             // Extract the information from the output files
             resultProgress?.Report(Result.Success("Extracting output information from output files..."));
             SubmissionInfo submissionInfo = await InfoTool.ExtractOutputInformation(
-                this.OutputDirectory,
-                this.OutputFilename,
+                this.OutputPath,
                 this.Drive,
                 this.System,
                 this.Type,
@@ -343,7 +358,7 @@ namespace MPF.Library
             }
 
             // Reset the drive automatically if configured to
-            if (Options.InternalProgram == InternalProgram.DiscImageCreator && Options.DICResetDriveAfterDump)
+            if (this.InternalProgram == InternalProgram.DiscImageCreator && Options.DICResetDriveAfterDump)
             {
                 resultProgress?.Report(Result.Success($"Resetting drive {Drive.Letter}"));
                 await ResetDrive();
@@ -378,7 +393,7 @@ namespace MPF.Library
 
             // Write the text output
             resultProgress?.Report(Result.Success("Writing information to !submissionInfo.txt..."));
-            (bool txtSuccess, string txtResult) = InfoTool.WriteOutputData(this.OutputDirectory, formattedValues);
+            (bool txtSuccess, string txtResult) = InfoTool.WriteOutputData(outputDirectory, formattedValues);
             if (txtSuccess)
                 resultProgress?.Report(Result.Success(txtResult));
             else
@@ -388,7 +403,7 @@ namespace MPF.Library
             if (Options.ScanForProtection && Options.OutputSeparateProtectionFile)
             {
                 resultProgress?.Report(Result.Success("Writing protection to !protectionInfo.txt..."));
-                bool scanSuccess = InfoTool.WriteProtectionData(this.OutputDirectory, submissionInfo);
+                bool scanSuccess = InfoTool.WriteProtectionData(outputDirectory, submissionInfo);
                 if (scanSuccess)
                     resultProgress?.Report(Result.Success("Writing complete!"));
                 else
@@ -399,7 +414,7 @@ namespace MPF.Library
             if (Options.OutputSubmissionJSON)
             {
                 resultProgress?.Report(Result.Success($"Writing information to !submissionInfo.json{(Options.IncludeArtifacts ? ".gz" : string.Empty)}..."));
-                bool jsonSuccess = InfoTool.WriteOutputData(this.OutputDirectory, submissionInfo, Options.IncludeArtifacts);
+                bool jsonSuccess = InfoTool.WriteOutputData(outputDirectory, submissionInfo, Options.IncludeArtifacts);
                 if (jsonSuccess)
                     resultProgress?.Report(Result.Success("Writing complete!"));
                 else
@@ -410,7 +425,7 @@ namespace MPF.Library
             if (Options.CompressLogFiles)
             {
                 resultProgress?.Report(Result.Success("Compressing log files..."));
-                (bool compressSuccess, string compressResult) = InfoTool.CompressLogFiles(this.OutputDirectory, this.OutputFilename, this.Parameters);
+                (bool compressSuccess, string compressResult) = InfoTool.CompressLogFiles(outputDirectory, outputFilename, this.Parameters);
                 if (compressSuccess)
                     resultProgress?.Report(Result.Success(compressResult));
                 else
@@ -491,12 +506,11 @@ namespace MPF.Library
                 return Result.Failure("Error! Current configuration is not supported!");
 
             // Fix the output paths, just in case
-            (OutputDirectory, OutputFilename) = InfoTool.NormalizeOutputPaths(OutputDirectory, OutputFilename);
+            this.OutputPath = InfoTool.NormalizeOutputPaths(this.OutputPath);
 
             // Validate that the output path isn't on the dumping drive
-            string fullOutputPath = Path.GetFullPath(Path.Combine(OutputDirectory, OutputFilename));
-            if (fullOutputPath[0] == Drive.Letter)
-                return Result.Failure($"Error! Cannot output to same drive that is being dumped!");
+            if (this.OutputPath[0] == Drive.Letter)
+                return Result.Failure("Error! Cannot output to same drive that is being dumped!");
 
             // Validate that the required program exists
             if (!File.Exists(Parameters.ExecutablePath))
@@ -505,7 +519,7 @@ namespace MPF.Library
             // Validate that the dumping drive doesn't contain the executable
             string fullExecutablePath = Path.GetFullPath(Parameters.ExecutablePath);
             if (fullExecutablePath[0] == Drive.Letter)
-                return Result.Failure("$Error! Cannot dump same drive that executable resides on!");
+                return Result.Failure("Error! Cannot dump same drive that executable resides on!");
 
             // Validate that the current configuration is supported
             return Tools.GetSupportStatus(System, Type);

MPF.Library/InfoTool.cs

@@ -26,8 +26,7 @@ namespace MPF.Library
         /// <summary>
         /// Extract all of the possible information from a given input combination
         /// </summary>
-        /// <param name="outputDirectory">Output folder to write to</param>
-        /// <param name="outputFilename">Output filename to use as the base path</param>
+        /// <param name="outputPath">Output path to write to</param>
         /// <param name="drive">Drive object representing the current drive</param>
         /// <param name="system">Currently selected system</param>
         /// <param name="mediaType">Currently selected media type</param>
@@ -37,12 +36,11 @@ namespace MPF.Library
         /// <param name="protectionProgress">Optional protection progress callback</param>
         /// <returns>SubmissionInfo populated based on outputs, null on error</returns>
         public static async Task<SubmissionInfo> ExtractOutputInformation(
-            string outputDirectory,
-            string outputFilename,
+            string outputPath,
             Drive drive,
             RedumpSystem? system,
             MediaType? mediaType,
-            Options options,
+            Core.Data.Options options,
             BaseParameters parameters,
             IProgress<Result> resultProgress = null,
             IProgress<ProtectionProgress> protectionProgress = null)
@@ -51,11 +49,16 @@ namespace MPF.Library
             if (!system.MediaTypes().Contains(mediaType))
                 return null;
 
+            // Split the output path for easier use
+            string outputDirectory = Path.GetDirectoryName(outputPath);
+            string outputFilename = Path.GetFileName(outputPath);
+
             // Check that all of the relevant files are there
             (bool foundFiles, List<string> missingFiles) = FoundAllFiles(outputDirectory, outputFilename, parameters, false);
             if (!foundFiles)
             {
                 resultProgress.Report(Result.Failure($"There were files missing from the output:\n{string.Join("\n", missingFiles)}"));
+                resultProgress.Report(Result.Failure($"This may indicate an issue with the hardware or media, including unsupported devices.\nPlease see dumping program documentation for more details."));
                 return null;
             }
 
@@ -196,26 +199,15 @@ namespace MPF.Library
                     break;
 
                 case MediaType.UMD:
-                    // If we have a single-layer disc
-                    if (info.SizeAndChecksums.Layerbreak == default)
-                    {
-                        info.CommonDiscInfo.Layer0MasteringRing = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0MasteringSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0ToolstampMasteringCode = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0MouldSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                    }
-                    // If we have a dual-layer disc
-                    else
-                    {
-                        info.CommonDiscInfo.Layer0MasteringRing = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0MasteringSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0ToolstampMasteringCode = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer0MouldSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    // Both single- and dual-layer discs have two "layers" for the ring
+                    info.CommonDiscInfo.Layer0MasteringRing = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0MasteringSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0ToolstampMasteringCode = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer0MouldSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
 
-                        info.CommonDiscInfo.Layer1MasteringRing = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer1MasteringSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                        info.CommonDiscInfo.Layer1ToolstampMasteringCode = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
-                    }
+                    info.CommonDiscInfo.Layer1MasteringRing = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer1MasteringSID = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
+                    info.CommonDiscInfo.Layer1ToolstampMasteringCode = options.AddPlaceholders ? Template.RequiredIfExistsValue : string.Empty;
 
                     info.SizeAndChecksums.CRC32 = info.SizeAndChecksums.CRC32 ?? (options.AddPlaceholders ? Template.RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
                     info.SizeAndChecksums.MD5 = info.SizeAndChecksums.MD5 ?? (options.AddPlaceholders ? Template.RequiredValue + " [Not automatically generated for UMD]" : string.Empty);
@@ -327,6 +319,16 @@ namespace MPF.Library
 
                     break;
 
+                case RedumpSystem.MicrosoftXboxSeriesXS:
+                    string xboxSeriesXMsxcPath = Path.Combine($"{drive.Letter}:\\", "MSXC");
+                    if (drive != null && Directory.Exists(xboxSeriesXMsxcPath))
+                    {
+                        info.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename] = string.Join("\n",
+                            Directory.GetFiles(xboxSeriesXMsxcPath, "*", SearchOption.TopDirectoryOnly).Select(Path.GetFileName));
+                    }
+
+                    break;
+
                 case RedumpSystem.NamcoSegaNintendoTriforce:
                     info.CommonDiscInfo.EXEDateBuildDate = options.AddPlaceholders ? Template.RequiredValue : string.Empty;
                     break;
@@ -464,7 +466,7 @@ namespace MPF.Library
         /// <param name="options">Options object that determines what to scan</param>
         /// <param name="progress">Optional progress callback</param>
         /// <returns>Detected copy protection(s) if possible, null on error</returns>
-        private static async Task<(string, Dictionary<string, List<string>>)> GetCopyProtection(Drive drive, Options options, IProgress<ProtectionProgress> progress = null)
+        private static async Task<(string, Dictionary<string, List<string>>)> GetCopyProtection(Drive drive, Core.Data.Options options, IProgress<ProtectionProgress> progress = null)
         {
             if (options.ScanForProtection && drive != null)
             {
@@ -494,7 +496,7 @@ namespace MPF.Library
                 return BitConverter.ToString(bytes).Replace("-", string.Empty);
             }
 
-            return string.Join("\n", File.ReadAllLines(filename));
+            return File.ReadAllText(filename);
         }
 
         /// <summary>
@@ -644,7 +646,7 @@ namespace MPF.Library
         /// <param name="info">Information object that should contain normalized values</param>
         /// <param name="options">Options object representing user-defined options</param>
         /// <returns>List of strings representing each line of an output file, null on error</returns>
-        public static (List<string>, string) FormatOutputData(SubmissionInfo info, Options options)
+        public static (List<string>, string) FormatOutputData(SubmissionInfo info, Core.Data.Options options)
         {
             // Check to see if the inputs are valid
             if (info == null)
@@ -665,6 +667,7 @@ namespace MPF.Library
                 AddIfExists(output, Template.SystemField, info.CommonDiscInfo.System.LongName(), 1);
                 AddIfExists(output, Template.MediaTypeField, GetFixedMediaType(
                         info.CommonDiscInfo.Media.ToMediaType(),
+                        info.SizeAndChecksums.PICIdentifier,
                         info.SizeAndChecksums.Size,
                         info.SizeAndChecksums.Layerbreak,
                         info.SizeAndChecksums.Layerbreak2,
@@ -679,81 +682,82 @@ namespace MPF.Library
                 AddIfExists(output, Template.DiscSerialField, info.CommonDiscInfo.Serial, 1);
 
                 // All ringcode information goes in an indented area
-                output.Add(""); output.Add("\tRingcode Information:");
+                output.Add(""); output.Add("\tRingcode Information:"); output.Add("");
 
                 // If we have a triple-layer disc
                 if (info.SizeAndChecksums.Layerbreak3 != default)
                 {
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2);
-                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 0);
+                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 0);
 
-                    AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2);
-                    AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2);
-                    AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2);
-                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2);
+                    AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 0);
+                    AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 0);
+                    AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 0);
+                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 0);
 
-                    AddIfExists(output, "Layer 2 " + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 2);
-                    AddIfExists(output, "Layer 2 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 2);
-                    AddIfExists(output, "Layer 2 " + Template.ToolstampField, info.CommonDiscInfo.Layer2ToolstampMasteringCode, 2);
+                    AddIfExists(output, "Layer 2 " + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 0);
+                    AddIfExists(output, "Layer 2 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 0);
+                    AddIfExists(output, "Layer 2 " + Template.ToolstampField, info.CommonDiscInfo.Layer2ToolstampMasteringCode, 0);
 
-                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer3MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer3MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer3ToolstampMasteringCode, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer3MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer3MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 3 (Inner) " : "Layer 3 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer3ToolstampMasteringCode, 0);
                 }
                 // If we have a triple-layer disc
                 else if (info.SizeAndChecksums.Layerbreak2 != default)
                 {
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2);
-                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 0);
+                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 0);
 
-                    AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2);
-                    AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2);
-                    AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2);
-                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2);
+                    AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 0);
+                    AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 0);
+                    AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 0);
+                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 0);
 
-                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer2ToolstampMasteringCode, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 2 (Inner) " : "Layer 2 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer2ToolstampMasteringCode, 0);
                 }
                 // If we have a dual-layer disc
                 else if (info.SizeAndChecksums.Layerbreak != default)
                 {
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2);
-                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 0 (Outer) " : "Layer 0 (Inner) ") + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 0);
+                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 0);
 
-                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2);
-                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2);
-                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2);
+                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 0);
+                    AddIfExists(output, (reverseOrder ? "Layer 1 (Inner) " : "Layer 1 (Outer) ") + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 0);
+                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 0);
                 }
                 // If we have a single-layer disc
                 else
                 {
-                    AddIfExists(output, "Data Side " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2);
-                    AddIfExists(output, "Data Side " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2);
-                    AddIfExists(output, "Data Side " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2);
-                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2);
+                    AddIfExists(output, "Data Side " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 0);
+                    AddIfExists(output, "Data Side " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 0);
+                    AddIfExists(output, "Data Side " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 0);
+                    AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 0);
 
-                    AddIfExists(output, "Label Side " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2);
-                    AddIfExists(output, "Label Side " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2);
-                    AddIfExists(output, "Label Side " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2);
-                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2);
-                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2);
+                    AddIfExists(output, "Label Side " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 0);
+                    AddIfExists(output, "Label Side " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 0);
+                    AddIfExists(output, "Label Side " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 0);
+                    AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 0);
+                    AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 0);
                 }
 
+                output.Add("");
                 AddIfExists(output, Template.BarcodeField, info.CommonDiscInfo.Barcode, 1);
                 AddIfExists(output, Template.EXEDateBuildDate, info.CommonDiscInfo.EXEDateBuildDate, 1);
                 AddIfExists(output, Template.ErrorCountField, info.CommonDiscInfo.ErrorsCount, 1);
@@ -778,7 +782,7 @@ namespace MPF.Library
                 // AddIfExists(output, Template.RegionalParentField, info.RegionalParent.ToString());
 
                 // Extras section
-                if (info.Extras.PVD != null || info.Extras.PIC != null || info.Extras.BCA != null)
+                if (info.Extras.PVD != null || info.Extras.PIC != null || info.Extras.BCA != null || info.Extras.SecuritySectorRanges != null)
                 {
                     output.Add(""); output.Add("Extras:");
                     AddIfExists(output, Template.PVDField, info.Extras.PVD?.Trim(), 1);
@@ -832,11 +836,9 @@ namespace MPF.Library
                     output.Add(""); output.Add("Size & Checksum:");
 
                     // Gross hack because of automatic layerbreaks in Redump
-                    if ((info.CommonDiscInfo.Media != DiscType.BD25
-                            && info.CommonDiscInfo.Media != DiscType.BD50
-                            && info.CommonDiscInfo.Media != DiscType.BD100
-                            && info.CommonDiscInfo.Media != DiscType.BD128)
-                        || (!options.EnableRedumpCompatibility))
+                    if (!options.EnableRedumpCompatibility
+                        || (info.CommonDiscInfo.Media.ToMediaType() != MediaType.BluRay
+                            && !info.CommonDiscInfo.System.IsXGD()))
                     {
                         AddIfExists(output, Template.LayerbreakField, (info.SizeAndChecksums.Layerbreak == default ? null : info.SizeAndChecksums.Layerbreak.ToString()), 1);
                     }
@@ -882,12 +884,14 @@ namespace MPF.Library
         /// Get the adjusted name of the media based on layers, if applicable
         /// </summary>
         /// <param name="mediaType">MediaType to get the proper name for</param>
+        /// <param name="picIdentifier">PIC identifier string (BD only)</param>
         /// <param name="size">Size of the current media</param>
         /// <param name="layerbreak">First layerbreak value, as applicable</param>
         /// <param name="layerbreak2">Second layerbreak value, as applicable</param>
         /// <param name="layerbreak3">Third layerbreak value, as applicable</param>
         /// <returns>String representation of the media, including layer specification</returns>
-        public static string GetFixedMediaType(MediaType? mediaType, long size, long layerbreak, long layerbreak2, long layerbreak3)
+        /// TODO: Figure out why we have this and NormalizeDiscType as well
+        public static string GetFixedMediaType(MediaType? mediaType, string picIdentifier, long size, long layerbreak, long layerbreak2, long layerbreak3)
         {
             switch (mediaType)
             {
@@ -902,12 +906,16 @@ namespace MPF.Library
                         return $"{mediaType.LongName()}-128";
                     else if (layerbreak2 != default)
                         return $"{mediaType.LongName()}-100";
-                    //else if (layerbreak != default && size > 53_687_063_712)
-                    //    return $"{mediaType.LongName()}-66";
+                    else if (layerbreak != default && picIdentifier == PICDiscInformationUnit.DiscTypeIdentifierROMUltra)
+                        return $"{mediaType.LongName()}-66";
+                    else if (layerbreak != default && size > 53_687_063_712)
+                        return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default)
                         return $"{mediaType.LongName()}-50";
-                    //else if (size > 26_843_531_856)
-                    //    return $"{mediaType.LongName()}-33";
+                    else if (picIdentifier == PICDiscInformationUnit.DiscTypeIdentifierROMUltra)
+                        return $"{mediaType.LongName()}-33";
+                    else if (size > 26_843_531_856)
+                        return $"{mediaType.LongName()}-33";
                     else
                         return $"{mediaType.LongName()}-25";
 
@@ -1603,21 +1611,25 @@ namespace MPF.Library
             switch (info.CommonDiscInfo.Media)
             {
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     if (info.SizeAndChecksums.Layerbreak3 != default)
                         info.CommonDiscInfo.Media = DiscType.BD128;
                     else if (info.SizeAndChecksums.Layerbreak2 != default)
                         info.CommonDiscInfo.Media = DiscType.BD100;
-                    //else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
-                    //    info.CommonDiscInfo.Media = DiscType.BD66;
+                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.PICIdentifier == PICDiscInformationUnit.DiscTypeIdentifierROMUltra)
+                        info.CommonDiscInfo.Media = DiscType.BD66;
+                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 50_050_629_632)
+                        info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default)
                         info.CommonDiscInfo.Media = DiscType.BD50;
-                    //else if (info.SizeAndChecksums.Size > 26_843_531_856)
-                    //    info.CommonDiscInfo.Media = DiscType.BD33;
+                    else if (info.SizeAndChecksums.PICIdentifier == PICDiscInformationUnit.DiscTypeIdentifierROMUltra)
+                        info.CommonDiscInfo.Media = DiscType.BD33;
+                    else if (info.SizeAndChecksums.Size > 25_025_314_816)
+                        info.CommonDiscInfo.Media = DiscType.BD33;
                     else
                         info.CommonDiscInfo.Media = DiscType.BD25;
                     break;
@@ -1655,57 +1667,33 @@ namespace MPF.Library
         /// <summary>
         /// Normalize a split set of paths
         /// </summary>
-        /// <param name="directory">Directory name to normalize</param>
-        /// <param name="filename">Filename to normalize</param>
-        public static (string, string) NormalizeOutputPaths(string directory, string filename)
+        /// <param name="path">Path value to normalize</param>
+        public static string NormalizeOutputPaths(string path)
         {
+            // The easy way
             try
             {
-                // Cache if we had a directory separator or not
-                bool endedWithDirectorySeparator = directory.EndsWith(Path.DirectorySeparatorChar.ToString())
-                    || directory.EndsWith(Path.AltDirectorySeparatorChar.ToString());
+                // Trim quotes from the path
+                path = path.Trim('"');
 
-                // Combine the path to make things separate easier
-                string combinedPath = Path.Combine(directory, filename);
+                // Try getting the combined path and returning that directly
+                string fullPath = Path.GetFullPath(path);
+                string fullDirectory = Path.GetDirectoryName(fullPath);
+                string fullFile = Path.GetFileName(fullPath);
 
-                // If we have have a blank path, just return
-                if (string.IsNullOrWhiteSpace(combinedPath))
-                    return (directory, filename);
-
-                // Now get the normalized paths
-                directory = Path.GetDirectoryName(combinedPath);
-                filename = Path.GetFileName(combinedPath);
-
-                // Take care of extra path characters
-                directory = new StringBuilder(directory)
-                    .Replace(':', '_', 0, directory.LastIndexOf(':') == -1 ? 0 : directory.LastIndexOf(':'))
-                    .ToString();
-
-                // Sanitize the directory path
-                directory = directory.Replace('?', '_');
+                // Remove invalid path characters
                 foreach (char c in Path.GetInvalidPathChars())
-                    directory = directory.Replace(c, '_');
+                    fullDirectory = fullDirectory.Replace(c, '_');
 
-                // Sanitize the filename
-                filename = filename.Replace('?', '_');
+                // Remove invalid filename characters
                 foreach (char c in Path.GetInvalidFileNameChars())
-                    filename = filename.Replace(c, '_');
+                    fullFile = fullFile.Replace(c, '_');
 
-                // If we had a directory separator at the end before, add it again
-                if (endedWithDirectorySeparator)
-                    directory += Path.DirectorySeparatorChar;
-
-                // If we have a root directory, sanitize
-                if (Directory.Exists(directory))
-                {
-                    var possibleRootDir = new DirectoryInfo(directory);
-                    if (possibleRootDir.Parent == null)
-                        directory = directory.Replace($"{Path.DirectorySeparatorChar}{Path.DirectorySeparatorChar}", $"{Path.DirectorySeparatorChar}");
-                }
+                return Path.Combine(fullDirectory, fullFile);
             }
             catch { }
 
-            return (directory, filename);
+            return path;
         }
 
         #endregion
@@ -2060,12 +2048,35 @@ namespace MPF.Library
                         if (!commentLine.Contains(siteCode.ShortName()))
                             continue;
 
+                        // Skip certain site codes because of data issues
+                        switch (siteCode)
+                        {
+                            // Audio CD
+                            case SiteCode.UniversalHash:
+                                foundTag = true;
+                                continue;
+
+                            // Xbox and X360
+                            case SiteCode.DMIHash:
+                            case SiteCode.PFIHash:
+                            case SiteCode.SSHash:
+                            case SiteCode.SSVersion:
+                            case SiteCode.XMID:
+                            case SiteCode.XeMID:
+                                foundTag = true;
+                                continue;
+                        }
+
                         // Cache the current site code
                         lastSiteCode = siteCode;
 
                         // If we don't already have this site code, add it to the dictionary
                         if (!info.CommonDiscInfo.CommentsSpecialFields.ContainsKey(siteCode))
                             info.CommonDiscInfo.CommentsSpecialFields[siteCode] = $"(VERIFY THIS) {commentLine.Replace(siteCode.ShortName(), string.Empty).Trim()}";
+                        
+                        // Otherwise, append the value to the existing key
+                        else
+                            info.CommonDiscInfo.CommentsSpecialFields[siteCode] += $", {commentLine.Replace(siteCode.ShortName(), string.Empty).Trim()}";
 
                         // A subset of tags can be multiline
                         addToLast = IsMultiLine(siteCode);
@@ -2206,9 +2217,9 @@ namespace MPF.Library
         /// <param name="info">Existing SubmissionInfo object to fill</param>
         /// <param name="resultProgress">Optional result progress callback</param>
 #if NET48 || NETSTANDARD2_1
-        private static bool FillFromRedump(Options options, SubmissionInfo info, IProgress<Result> resultProgress = null)
+        private static bool FillFromRedump(Core.Data.Options options, SubmissionInfo info, IProgress<Result> resultProgress = null)
 #else
-        private async static Task<bool> FillFromRedump(Options options, SubmissionInfo info, IProgress<Result> resultProgress = null)
+        private async static Task<bool> FillFromRedump(Core.Data.Options options, SubmissionInfo info, IProgress<Result> resultProgress = null)
 #endif
         {
             // Set the current dumper based on username
@@ -2244,9 +2255,13 @@ namespace MPF.Library
 
                 // Loop through all of the hashdata to find matching IDs
                 resultProgress?.Report(Result.Success("Finding disc matches on Redump..."));
-                string[] splitData = info.TracksAndWriteOffsets.ClrMameProData.Split('\n');
+                string[] splitData = info.TracksAndWriteOffsets.ClrMameProData.TrimEnd('\n').Split('\n');
                 foreach (string hashData in splitData)
                 {
+                    // Catch any errant blank lines
+                    if (string.IsNullOrWhiteSpace(hashData))
+                        continue;
+
 #if NET48 || NETSTANDARD2_1
                     (bool singleFound, List<int> foundIds) = ValidateSingleTrack(wc, info, hashData, resultProgress);
 #else
@@ -2347,7 +2362,9 @@ namespace MPF.Library
             text = text.Replace("PFI:", ((SiteCode?)SiteCode.PFIHash).ShortName());
             text = text.Replace("SS:", ((SiteCode?)SiteCode.SSHash).ShortName());
             text = text.Replace("SSv1:", ((SiteCode?)SiteCode.SSHash).ShortName());
+            text = text.Replace("<b>SSv1</b>:", ((SiteCode?)SiteCode.SSHash).ShortName());
             text = text.Replace("SSv2:", ((SiteCode?)SiteCode.SSHash).ShortName());
+            text = text.Replace("<b>SSv2</b>:", ((SiteCode?)SiteCode.SSHash).ShortName());
             text = text.Replace("SS version:", ((SiteCode?)SiteCode.SSVersion).ShortName());
             text = text.Replace("XeMID:", ((SiteCode?)SiteCode.XeMID).ShortName());
             text = text.Replace("XMID:", ((SiteCode?)SiteCode.XMID).ShortName());
@@ -2587,6 +2604,10 @@ namespace MPF.Library
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.VolumeLabel, tags[SiteCode.VolumeLabel]));
             if (tags.ContainsKey(SiteCode.Multisession))
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.Multisession, tags[SiteCode.Multisession]));
+            if (tags.ContainsKey(SiteCode.UniversalHash))
+                sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.UniversalHash, tags[SiteCode.UniversalHash]));
+            if (tags.ContainsKey(SiteCode.RingNonZeroDataStart))
+                sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.RingNonZeroDataStart, tags[SiteCode.RingNonZeroDataStart]));
 
             if (tags.ContainsKey(SiteCode.XMID))
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.XMID, tags[SiteCode.XMID]));

MPF.Library/MPF.Library.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <AssemblyName>MPF.Library</AssemblyName>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
@@ -28,10 +28,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.3.4" GeneratePathProperty="true">
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />

MPF.Library/Protection.cs

@@ -4,9 +4,8 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using BinaryObjectScanner.Protection;
 using BurnOutSharp;
-using BurnOutSharp.ProtectionType;
-using MPF.Core.Data;
 using psxt001z;
 
 namespace MPF.Library
@@ -20,7 +19,7 @@ namespace MPF.Library
         /// <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>>, string)> RunProtectionScanOnPath(string path, Options options, IProgress<ProtectionProgress> progress = null)
+        public static async Task<(Dictionary<string, List<string>>, string)> RunProtectionScanOnPath(string path, Core.Data.Options options, IProgress<ProtectionProgress> progress = null)
         {
             try
             {
@@ -28,7 +27,10 @@ namespace MPF.Library
                 {
                     var scanner = new Scanner(
                         options.ScanArchivesForProtection,
+                        scanContents: true, // Hardcoded value to avoid issues
+                        scanGameEngines: false, // Hardcoded value to avoid issues
                         options.ScanPackersForProtection,
+                        scanPaths: true, // Hardcoded value to avoid issues
                         options.IncludeDebugProtectionInformation,
                         progress);
 

MPF.Modules/Aaru/Parameters.cs

@@ -225,14 +225,16 @@ namespace MPF.Modules.Aaru
                 info.DumpingInfo.ReportedDiscType = fullDiscType;
             }
 
+            // Get the Datafile information
+            Datafile datafile = GenerateDatafile(sidecar, basePath);
+
             // Fill in the hash data
-            info.TracksAndWriteOffsets.ClrMameProData = GenerateDatfile(sidecar, basePath);
+            info.TracksAndWriteOffsets.ClrMameProData = GenerateDatfile(datafile);
 
             switch (this.Type)
             {
                 // TODO: Can this do GD-ROM?
                 case MediaType.CDROM:
-
                     // TODO: Re-enable once PVD generation / finding is fixed
                     // Generate / obtain the PVD
                     //info.Extras.PVD = GeneratePVD(sidecar) ?? "Disc has no PVD";
@@ -243,9 +245,9 @@ namespace MPF.Modules.Aaru
 
                     info.CommonDiscInfo.ErrorsCount = (errorCount == -1 ? "Error retrieving error count" : errorCount.ToString());
 
-                    info.TracksAndWriteOffsets.Cuesheet = GenerateCuesheet(sidecar, basePath) ?? "";
+                    info.TracksAndWriteOffsets.Cuesheet = GenerateCuesheet(sidecar, basePath) ?? string.Empty;
 
-                    string cdWriteOffset = GetWriteOffset(sidecar) ?? "";
+                    string cdWriteOffset = GetWriteOffset(sidecar) ?? string.Empty;
                     info.CommonDiscInfo.RingWriteOffset = cdWriteOffset;
                     info.TracksAndWriteOffsets.OtherWriteOffsets = cdWriteOffset;
                     break;
@@ -254,7 +256,7 @@ namespace MPF.Modules.Aaru
                 case MediaType.HDDVD:
                 case MediaType.BluRay:
                     // Get the individual hash data, as per internal
-                    if (GetISOHashValues(info.TracksAndWriteOffsets.ClrMameProData, out long size, out string crc32, out string md5, out string sha1))
+                    if (GetISOHashValues(datafile, out long size, out string crc32, out string md5, out string sha1))
                     {
                         info.SizeAndChecksums.Size = size;
                         info.SizeAndChecksums.CRC32 = crc32;
@@ -269,7 +271,7 @@ namespace MPF.Modules.Aaru
                     // Deal with the layerbreak
                     string layerbreak = null;
                     if (this.Type == MediaType.DVD)
-                        layerbreak = GetLayerbreak(sidecar) ?? "";
+                        layerbreak = GetLayerbreak(sidecar) ?? string.Empty;
                     else if (this.Type == MediaType.BluRay)
                         layerbreak = info.SizeAndChecksums.Size > 25_025_314_816 ? "25025314816" : null;
 
@@ -301,7 +303,7 @@ namespace MPF.Modules.Aaru
 
                 case RedumpSystem.DVDAudio:
                 case RedumpSystem.DVDVideo:
-                    info.CopyProtection.Protection = GetDVDProtection(sidecar) ?? "";
+                    info.CopyProtection.Protection = GetDVDProtection(sidecar) ?? string.Empty;
                     break;
 
                 case RedumpSystem.KonamiPython2:
@@ -313,7 +315,7 @@ namespace MPF.Modules.Aaru
                         info.CommonDiscInfo.EXEDateBuildDate = pythonTwoDate;
                     }
 
-                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.MicrosoftXbox:
@@ -323,13 +325,13 @@ namespace MPF.Modules.Aaru
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd1PFIHash;
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash;
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd1SSVer;
-                        info.Extras.SecuritySectorRanges = ss ?? "";
+                        info.Extras.SecuritySectorRanges = ss ?? string.Empty;
                     }
 
                     if (GetXboxDMIInfo(sidecar, out string serial, out string version, out Region? region))
                     {
-                        info.CommonDiscInfo.Serial = serial ?? "";
-                        info.VersionAndEditions.Version = version ?? "";
+                        info.CommonDiscInfo.Serial = serial ?? string.Empty;
+                        info.VersionAndEditions.Version = version ?? string.Empty;
                         info.CommonDiscInfo.Region = region;
                     }
 
@@ -342,13 +344,13 @@ namespace MPF.Modules.Aaru
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd23PFIHash;
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash;
                         info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = xgd23SSVer;
-                        info.Extras.SecuritySectorRanges = ss360 ?? "";
+                        info.Extras.SecuritySectorRanges = ss360 ?? string.Empty;
                     }
 
                     if (GetXbox360DMIInfo(sidecar, out string serial360, out string version360, out Region? region360))
                     {
-                        info.CommonDiscInfo.Serial = serial360 ?? "";
-                        info.VersionAndEditions.Version = version360 ?? "";
+                        info.CommonDiscInfo.Serial = serial360 ?? string.Empty;
+                        info.VersionAndEditions.Version = version360 ?? string.Empty;
                         info.CommonDiscInfo.Region = region360;
                     }
                     break;
@@ -373,17 +375,22 @@ namespace MPF.Modules.Aaru
                         info.CommonDiscInfo.EXEDateBuildDate = playstationTwoDate;
                     }
 
-                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? string.Empty;
+                    break;
+
+                case RedumpSystem.SonyPlayStation3:
+                    info.VersionAndEditions.Version = GetPlayStation3Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation3Serial(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation4:
-                    info.VersionAndEditions.Version = GetPlayStation4Version(drive?.Letter) ?? "";
-                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation4Serial(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation4Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation4Serial(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation5:
-                    info.VersionAndEditions.Version = GetPlayStation5Version(drive?.Letter) ?? "";
-                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation5Serial(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation5Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation5Serial(drive?.Letter) ?? string.Empty;
                     break;
             }
 
@@ -1430,6 +1437,8 @@ namespace MPF.Modules.Aaru
                 case MediaType.CDROM:
                     if (File.Exists($"{basePath}.cicm.xml"))
                         logFiles.Add($"{basePath}.cicm.xml");
+                    if (File.Exists($"{basePath}.error.log"))
+                        logFiles.Add($"{basePath}.error.log");
                     if (File.Exists($"{basePath}.ibg"))
                         logFiles.Add($"{basePath}.ibg");
                     if (File.Exists($"{basePath}.log"))
@@ -1448,6 +1457,8 @@ namespace MPF.Modules.Aaru
                 case MediaType.BluRay:
                     if (File.Exists($"{basePath}.cicm.xml"))
                         logFiles.Add($"{basePath}.cicm.xml");
+                    if (File.Exists($"{basePath}.error.log"))
+                        logFiles.Add($"{basePath}.error.log");
                     if (File.Exists($"{basePath}.ibg"))
                         logFiles.Add($"{basePath}.ibg");
                     if (File.Exists($"{basePath}.log"))
@@ -2637,6 +2648,119 @@ namespace MPF.Modules.Aaru
             return datfile;
         }
 
+        /// <summary>
+        /// Generate a CMP XML datfile string based on CICM sidecar data
+        /// </summary>
+        /// <param name="cicmSidecar">CICM Sidecar data generated by Aaru</param>
+        /// <param name="basePath">Base path for determining file names</param>
+        /// <returns>Datafile containing the hash information, null on error</returns>
+        private static Datafile GenerateDatafile(CICMMetadataType cicmSidecar, string basePath)
+        {
+            // If the object is null, we can't get information from it
+            if (cicmSidecar == null)
+                return null;
+
+            // Required variables
+            Datafile datafile = new Datafile();
+            List<Rom> roms = new List<Rom>();
+
+            // Process OpticalDisc, if possible
+            if (cicmSidecar.OpticalDisc != null && cicmSidecar.OpticalDisc.Length > 0)
+            {
+                // Loop through each OpticalDisc in the metadata
+                foreach (OpticalDiscType opticalDisc in cicmSidecar.OpticalDisc)
+                {
+                    // Only capture the first total track count
+                    uint totalTracks = 0;
+                    if (opticalDisc.Tracks != null && opticalDisc.Tracks.Length > 0)
+                        totalTracks = opticalDisc.Tracks[0];
+
+                    // If there are no tracks, we can't get a datfile
+                    if (opticalDisc.Track == null || opticalDisc.Track.Length == 0)
+                        continue;
+
+                    // Loop through each track
+                    foreach (TrackType track in opticalDisc.Track)
+                    {
+                        uint trackNumber = track.Sequence?.TrackNumber ?? 0;
+                        ulong size = track.Size;
+                        string crc32 = string.Empty;
+                        string md5 = string.Empty;
+                        string sha1 = string.Empty;
+
+                        // If we don't have any checksums, we can't get a DAT for this track
+                        if (track.Checksums == null || track.Checksums.Length == 0)
+                            continue;
+
+                        // Extract only relevant checksums
+                        foreach (ChecksumType checksum in track.Checksums)
+                        {
+                            switch (checksum.type)
+                            {
+                                case ChecksumTypeType.crc32:
+                                    crc32 = checksum.Value;
+                                    break;
+                                case ChecksumTypeType.md5:
+                                    md5 = checksum.Value;
+                                    break;
+                                case ChecksumTypeType.sha1:
+                                    sha1 = checksum.Value;
+                                    break;
+                            }
+                        }
+
+                        // Build the track datfile data and append
+                        string trackName = GenerateTrackName(basePath, (int)totalTracks, (int)trackNumber, opticalDisc.DiscType);
+                        roms.Add(new Rom { Name = trackName, Size = size.ToString(), Crc = crc32, Md5 = md5, Sha1 = sha1 });
+                    }
+                }
+            }
+
+            // Process BlockMedia, if possible
+            if (cicmSidecar.BlockMedia != null && cicmSidecar.BlockMedia.Length > 0)
+            {
+                // Loop through each BlockMedia in the metadata
+                foreach (BlockMediaType blockMedia in cicmSidecar.BlockMedia)
+                {
+                    ulong size = blockMedia.Size;
+                    string crc32 = string.Empty;
+                    string md5 = string.Empty;
+                    string sha1 = string.Empty;
+
+                    // If we don't have any checksums, we can't get a DAT for this track
+                    if (blockMedia.Checksums == null || blockMedia.Checksums.Length == 0)
+                        continue;
+
+                    // Extract only relevant checksums
+                    foreach (ChecksumType checksum in blockMedia.Checksums)
+                    {
+                        switch (checksum.type)
+                        {
+                            case ChecksumTypeType.crc32:
+                                crc32 = checksum.Value;
+                                break;
+                            case ChecksumTypeType.md5:
+                                md5 = checksum.Value;
+                                break;
+                            case ChecksumTypeType.sha1:
+                                sha1 = checksum.Value;
+                                break;
+                        }
+                    }
+
+                    // Build the track datfile data and append
+                    string trackName = $"{basePath}.bin";
+                    roms.Add(new Rom { Name = trackName, Size = size.ToString(), Crc = crc32, Md5 = md5, Sha1 = sha1 });
+                }
+            }
+
+            // Assign the roms to a new game
+            datafile.Games = new Game[1];
+            datafile.Games[0] = new Game { Roms = roms.ToArray() };
+
+            return datafile;
+        }
+
         /// <summary>
         /// Generate a track name based on current path and tracks
         /// </summary>

MPF.Modules/BaseParameters.cs

@@ -6,6 +6,9 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Xml.Schema;
+using System.Xml;
+using System.Xml.Serialization;
 using MPF.Core.Data;
 using MPF.Core.Hashing;
 using MPF.Core.Utilities;
@@ -242,7 +245,7 @@ namespace MPF.Modules
         /// </summary>
         /// <param name="parameters">String possibly representing parameters</param>
         /// <returns>True if the parameters were set correctly, false otherwise</returns>
-        protected virtual bool ValidateAndSetParameters(string parameters) => true;
+        protected virtual bool ValidateAndSetParameters(string parameters) => !string.IsNullOrWhiteSpace(parameters);
 
         #endregion
 
@@ -344,7 +347,7 @@ namespace MPF.Modules
                 return BitConverter.ToString(bytes).Replace("-", string.Empty);
             }
 
-            return string.Join("\n", File.ReadAllLines(filename));
+            return File.ReadAllText(filename);
         }
 
         /// <summary>
@@ -622,6 +625,7 @@ namespace MPF.Modules
 
                 string valuePart = commandParts[1];
 
+                this[longFlagString] = true;
                 (string value, long factor) = ExtractFactorFromValue(valuePart);
                 return (sbyte)(sbyte.Parse(value) * factor);
             }
@@ -698,6 +702,7 @@ namespace MPF.Modules
 
                 string valuePart = commandParts[1];
 
+                this[longFlagString] = true;
                 (string value, long factor) = ExtractFactorFromValue(valuePart);
                 return (short)(short.Parse(value) * factor);
             }
@@ -774,6 +779,7 @@ namespace MPF.Modules
 
                 string valuePart = commandParts[1];
 
+                this[longFlagString] = true;
                 (string value, long factor) = ExtractFactorFromValue(valuePart);
                 return (int)(int.Parse(value) * factor);
             }
@@ -850,6 +856,7 @@ namespace MPF.Modules
 
                 string valuePart = commandParts[1];
 
+                this[longFlagString] = true;
                 (string value, long factor) = ExtractFactorFromValue(valuePart);
                 return long.Parse(value) * factor;
             }
@@ -1002,6 +1009,7 @@ namespace MPF.Modules
 
                 string valuePart = commandParts[1];
 
+                this[longFlagString] = true;
                 (string value, long factor) = ExtractFactorFromValue(valuePart);
                 return (byte)(byte.Parse(value) * factor);
             }
@@ -1075,6 +1083,155 @@ namespace MPF.Modules
 
         #region Common Information Extraction
 
+        /// <summary>
+        /// Generate the proper datfile from the input Datafile, if possible
+        /// </summary>
+        /// <param name="datafile">.dat file location</param>
+        /// <returns>Relevant pieces of the datfile, null on error</returns>
+        protected static string GenerateDatfile(Datafile datafile)
+        {
+            // If we don't have a valid datafile, we can't do anything
+            if (datafile?.Games == null || datafile.Games.Length == 0 || datafile.Games[0]?.Roms == null || datafile.Games[0].Roms.Length == 0)
+                return null;
+
+            // Otherwise, reconstruct the hash data with only the required info
+            try
+            {
+                var roms = datafile.Games[0].Roms;
+
+                string datString = string.Empty;
+                for (int i = 0; i < roms.Length; i++)
+                {
+                    var rom = roms[i];
+                    datString += $"<rom name=\"{rom.Name}\" size=\"{rom.Size}\" crc=\"{rom.Crc}\" md5=\"{rom.Md5}\" sha1=\"{rom.Sha1}\" />\n";
+                }
+
+                datString.TrimEnd('\n');
+                return datString;
+            }
+            catch
+            {
+                // We don't care what the exception is right now
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get Datafile from a standard DAT
+        /// </summary>
+        /// <param name="dat">Path to the DAT file to parse</param>
+        /// <returns>Filled Datafile on success, null on error</returns>
+        protected static Datafile GetDatafile(string dat)
+        {
+            // If there's no path, we can't read the file
+            if (string.IsNullOrWhiteSpace(dat))
+                return null;
+
+            // If the file doesn't exist, we can't read it
+            if (!File.Exists(dat))
+                return null;
+
+            try
+            {
+                // Open and read in the XML file
+                XmlReader xtr = XmlReader.Create(dat, new XmlReaderSettings
+                {
+                    CheckCharacters = false,
+                    DtdProcessing = DtdProcessing.Ignore,
+                    IgnoreComments = true,
+                    IgnoreWhitespace = true,
+                    ValidationFlags = XmlSchemaValidationFlags.None,
+                    ValidationType = ValidationType.None,
+                });
+
+                // If the reader is null for some reason, we can't do anything
+                if (xtr == null)
+                    return null;
+
+                XmlSerializer serializer = new XmlSerializer(typeof(Datafile));
+                Datafile obj = serializer.Deserialize(xtr) as Datafile;
+
+                return obj;
+            }
+            catch
+            {
+                // We don't care what the exception is right now
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets disc information from a PIC file
+        /// </summary>
+        /// <param name="pic">Path to a PIC.bin file</param>
+        /// <returns>Filled PICDiscInformation on success, null on error</returns>
+        /// <remarks>This omits the emergency brake information, if it exists</remarks>
+        protected static PICDiscInformation GetDiscInformation(string pic)
+        {
+            try
+            {
+                using (BinaryReader br = new BinaryReader(File.OpenRead(pic)))
+                {
+                    var di = new PICDiscInformation();
+
+                    // Read the initial disc information
+                    di.DataStructureLength = br.ReadUInt16BigEndian();
+                    di.Reserved0 = br.ReadByte();
+                    di.Reserved1 = br.ReadByte();
+
+                    // Create a list for the units
+                    var diUnits = new List<PICDiscInformationUnit>();
+
+                    // Loop and read all available units
+                    for (int i = 0; i < 32; i++)
+                    {
+                        var unit = new PICDiscInformationUnit();
+
+                        // We only accept Disc Information units, not Emergency Brake or other
+                        unit.DiscInformationIdentifier = Encoding.ASCII.GetString(br.ReadBytes(2));
+                        if (unit.DiscInformationIdentifier != "DI")
+                            break;
+
+                        unit.DiscInformationFormat = br.ReadByte();
+                        unit.NumberOfUnitsInBlock = br.ReadByte();
+                        unit.Reserved0 = br.ReadByte();
+                        unit.SequenceNumber = br.ReadByte();
+                        unit.BytesInUse = br.ReadByte();
+                        unit.Reserved1 = br.ReadByte();
+
+                        unit.DiscTypeIdentifier = Encoding.ASCII.GetString(br.ReadBytes(3));
+                        unit.DiscSizeClassVersion = br.ReadByte();
+                        switch (unit.DiscTypeIdentifier)
+                        {
+                            case PICDiscInformationUnit.DiscTypeIdentifierROM:
+                            case PICDiscInformationUnit.DiscTypeIdentifierROMUltra:
+                                unit.FormatDependentContents = br.ReadBytes(52);
+                                break;
+                            case PICDiscInformationUnit.DiscTypeIdentifierReWritable:
+                            case PICDiscInformationUnit.DiscTypeIdentifierRecordable:
+                                unit.FormatDependentContents = br.ReadBytes(100);
+                                unit.DiscManufacturerID = br.ReadBytes(6);
+                                unit.MediaTypeID = br.ReadBytes(3);
+                                unit.TimeStamp = br.ReadUInt16();
+                                unit.ProductRevisionNumber = br.ReadByte();
+                                break;
+                        }
+
+                        diUnits.Add(unit);
+                    }
+
+                    // Assign the units and return
+                    di.Units = diUnits.ToArray();
+                    return di;
+                }
+            }
+            catch
+            {
+                // We don't care what the error was
+                return null;
+            }
+        }
+
         /// <summary>
         /// Get hashes from an input file path
         /// </summary>
@@ -1194,6 +1351,8 @@ namespace MPF.Modules
             if (string.IsNullOrWhiteSpace(hashData))
                 return false;
 
+            // TODO: Use deserialization to Rom instead of Regex
+
             Regex hashreg = new Regex(@"<rom name="".*?"" size=""(.*?)"" crc=""(.*?)"" md5=""(.*?)"" sha1=""(.*?)""");
             Match m = hashreg.Match(hashData);
             if (m.Success)
@@ -1210,6 +1369,92 @@ namespace MPF.Modules
             }
         }
 
+        /// <summary>
+        /// Get the split values for ISO-based media
+        /// </summary>
+        /// <param name="datafile">Datafile represenging the hash data</param>
+        /// <returns>True if extraction was successful, false otherwise</returns>
+        protected static bool GetISOHashValues(Datafile datafile, out long size, out string crc32, out string md5, out string sha1)
+        {
+            size = -1; crc32 = null; md5 = null; sha1 = null;
+
+            if (datafile?.Games == null || datafile.Games.Length == 0 || datafile.Games[0].Roms.Length == 0)
+                return false;
+
+            var rom = datafile.Games[0].Roms[0];
+
+            Int64.TryParse(rom.Size, out size);
+            crc32 = rom.Crc;
+            md5 = rom.Md5;
+            sha1 = rom.Sha1;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Get the layerbreak info associated from the disc information
+        /// </summary>
+        /// <param name="di">Disc information containing unformatted data</param>
+        /// <returns>True if layerbreak info was set, false otherwise</returns>
+        protected static bool GetLayerbreaks(PICDiscInformation di, out long? layerbreak1, out long? layerbreak2, out long? layerbreak3)
+        {
+            // Set the default values
+            layerbreak1 = null; layerbreak2 = null; layerbreak3 = null;
+
+            // If we don't have valid disc information, we can't do anything
+            if (di?.Units == null || di.Units.Length <= 1)
+                return false;
+
+            int ReadFromArrayBigEndian(byte[] bytes, int offset)
+            {
+                var span = new ReadOnlySpan<byte>(bytes, offset, 0x04);
+                byte[] rev = span.ToArray();
+                Array.Reverse(rev);
+                return BitConverter.ToInt32(rev, 0);
+            }
+
+            // Layerbreak 1 (2+ layers)
+            if (di.Units.Length >= 2)
+            {
+                long offset = ReadFromArrayBigEndian(di.Units[0].FormatDependentContents, 0x0C);
+                long value = ReadFromArrayBigEndian(di.Units[0].FormatDependentContents, 0x10);
+                layerbreak1 = value - offset + 2;
+            }
+
+            // Layerbreak 2 (3+ layers)
+            if (di.Units.Length >= 3)
+            {
+                long offset = ReadFromArrayBigEndian(di.Units[1].FormatDependentContents, 0x0C);
+                long value = ReadFromArrayBigEndian(di.Units[1].FormatDependentContents, 0x10);
+                layerbreak2 = layerbreak1 + value - offset + 2;
+            }
+
+            // Layerbreak 3 (4 layers)
+            if (di.Units.Length >= 4)
+            {
+                long offset = ReadFromArrayBigEndian(di.Units[2].FormatDependentContents, 0x0C);
+                long value = ReadFromArrayBigEndian(di.Units[2].FormatDependentContents, 0x10);
+                layerbreak3 = layerbreak2 + value - offset + 2;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Get the PIC identifier from the first disc information unit, if possible
+        /// </summary>
+        /// <param name="di">Disc information containing the data</param>
+        /// <returns>String representing the PIC identifier, null on error</returns>
+        protected static string GetPICIdentifier(PICDiscInformation di)
+        {
+            // If we don't have valid disc information, we can't do anything
+            if (di?.Units == null || di.Units.Length <= 1)
+                return null;
+
+            // We assume the identifier is consistent across all units
+            return di.Units[0].DiscTypeIdentifier;
+        }
+
         /// <summary>
         /// Get the EXE date from a PlayStation disc, if possible
         /// </summary>
@@ -1266,6 +1511,9 @@ namespace MPF.Modules
                     serial = exeName
                         .Replace('_', '-')
                         .Replace(".", string.Empty);
+
+                    // Some games may have the EXE in a subfolder
+                    serial = Path.GetFileName(serial);
                 }
             }
 
@@ -1322,6 +1570,80 @@ namespace MPF.Modules
             return null;
         }
 
+        /// <summary>
+        /// Get the internal serial from a PlayStation 3 disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <returns>Internal disc serial if possible, null on error</returns>
+        protected static string GetPlayStation3Serial(char? driveLetter)
+        {
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return null;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return null;
+
+            // If we can't find PARAM.SFO, we don't have a PlayStation 3 disc
+            string paramSfoPath = Path.Combine(drivePath, "PS3_GAME", "PARAM.SFO");
+            if (!File.Exists(paramSfoPath))
+                return null;
+
+            // Let's try reading PARAM.SFO to find the serial at the end of the file
+            try
+            {
+                using (BinaryReader br = new BinaryReader(File.OpenRead(paramSfoPath)))
+                {
+                    br.BaseStream.Seek(-0x18, SeekOrigin.End);
+                    return new string(br.ReadChars(9));
+                }
+            }
+            catch
+            {
+                // We don't care what the error was
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Get the version from a PlayStation 3 disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <returns>Game version if possible, null on error</returns>
+        protected static string GetPlayStation3Version(char? driveLetter)
+        {
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return null;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return null;
+
+            // If we can't find PARAM.SFO, we don't have a PlayStation 3 disc
+            string paramSfoPath = Path.Combine(drivePath, "PS3_GAME", "PARAM.SFO");
+            if (!File.Exists(paramSfoPath))
+                return null;
+
+            // Let's try reading PARAM.SFO to find the version at the end of the file
+            try
+            {
+                using (BinaryReader br = new BinaryReader(File.OpenRead(paramSfoPath)))
+                {
+                    br.BaseStream.Seek(-0x08, SeekOrigin.End);
+                    return new string(br.ReadChars(5));
+                }
+            }
+            catch
+            {
+                // We don't care what the error was
+                return null;
+            }
+        }
+
         /// <summary>
         /// Get the internal serial from a PlayStation 4 disc, if possible
         /// </summary>

MPF.Modules/CleanRIp/Parameters.cs

@@ -63,10 +63,10 @@ namespace MPF.Modules.CleanRip
         {
             // TODO: Determine if there's a CleanRip version anywhere
             info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
-            info.TracksAndWriteOffsets.ClrMameProData = GetCleanripDatfile(basePath + ".iso", basePath + "-dumpinfo.txt");
+            Datafile datafile = GenerateCleanripDatafile(basePath + ".iso", basePath + "-dumpinfo.txt");
             
             // Get the individual hash data, as per internal
-            if (GetISOHashValues(info.TracksAndWriteOffsets.ClrMameProData, out long size, out string crc32, out string md5, out string sha1))
+            if (GetISOHashValues(datafile, out long size, out string crc32, out string md5, out string sha1))
             {
                 info.SizeAndChecksums.Size = size;
                 info.SizeAndChecksums.CRC32 = crc32;
@@ -131,6 +131,65 @@ namespace MPF.Modules.CleanRip
 
         #region Information Extraction Methods
 
+        /// <summary>
+        /// Get a formatted datfile from the cleanrip output, if possible
+        /// </summary>
+        /// <param name="iso">Path to ISO file</param>
+        /// <param name="dumpinfo">Path to discinfo file</param>
+        /// <returns></returns>
+        private static Datafile GenerateCleanripDatafile(string iso, string dumpinfo)
+        {
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(dumpinfo))
+                return null;
+
+            using (StreamReader sr = File.OpenText(dumpinfo))
+            {
+                long size = new FileInfo(iso).Length;
+                string crc = string.Empty;
+                string md5 = string.Empty;
+                string sha1 = string.Empty;
+
+                try
+                {
+                    // Make sure this file is a dumpinfo
+                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                        return null;
+
+                    // Read all lines and gather dat information
+                    while (!sr.EndOfStream)
+                    {
+                        string line = sr.ReadLine().Trim();
+                        if (line.StartsWith("CRC32"))
+                            crc = line.Substring(7).ToLowerInvariant();
+                        else if (line.StartsWith("MD5"))
+                            md5 = line.Substring(5);
+                        else if (line.StartsWith("SHA-1"))
+                            sha1 = line.Substring(7);
+                    }
+
+                    return new Datafile
+                    {
+                        Games = new Game[]
+                        {
+                            new Game
+                            {
+                                Roms = new Rom[]
+                                {
+                                    new Rom { Name = Path.GetFileName(iso), Size = size.ToString(), Crc = crc, Md5 = md5, Sha1 = sha1 },
+                                }
+                            }
+                        }
+                    };
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return null;
+                }
+            }
+        }
+
         /// <summary>
         /// Get the hex contents of the BCA file
         /// </summary>

MPF.Modules/DD/Parameters.cs

@@ -100,7 +100,7 @@ namespace MPF.Modules.DD
                         info.CommonDiscInfo.EXEDateBuildDate = pythonTwoDate;
                     }
 
-                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation:
@@ -123,17 +123,22 @@ namespace MPF.Modules.DD
                         info.CommonDiscInfo.EXEDateBuildDate = playstationTwoDate;
                     }
 
-                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? string.Empty;
+                    break;
+
+                case RedumpSystem.SonyPlayStation3:
+                    info.VersionAndEditions.Version = GetPlayStation3Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation3Serial(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation4:
-                    info.VersionAndEditions.Version = GetPlayStation4Version(drive?.Letter) ?? "";
-                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation4Serial(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation4Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation4Serial(drive?.Letter) ?? string.Empty;
                     break;
 
                 case RedumpSystem.SonyPlayStation5:
-                    info.VersionAndEditions.Version = GetPlayStation5Version(drive?.Letter) ?? "";
-                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation5Serial(drive?.Letter) ?? "";
+                    info.VersionAndEditions.Version = GetPlayStation5Version(drive?.Letter) ?? string.Empty;
+                    info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = GetPlayStation5Serial(drive?.Letter) ?? string.Empty;
                     break;
             }
         }

MPF.Modules/Datafile.cs

@@ -0,0 +1,73 @@
+using System.Xml.Serialization;
+
+namespace MPF.Modules
+{
+    [XmlRoot("datafile")]
+    public class Datafile
+    {
+        [XmlElement("header")]
+        public Header Header;
+
+        [XmlElement("game")]
+        public Game[] Games;
+    }
+
+    public class Header
+    {
+        [XmlElement("name")]
+        public string Name;
+
+        [XmlElement("description")]
+        public string Description;
+
+        [XmlElement("version")]
+        public string Version;
+
+        [XmlElement("date")]
+        public string Date;
+
+        [XmlElement("author")]
+        public string Author;
+
+        [XmlElement("homepage")]
+        public string Homepage;
+
+        [XmlElement("url")]
+        public string Url;
+    }
+
+    public class Game
+    {
+        [XmlAttribute("name")]
+        public string Name;
+
+        [XmlElement("category")]
+        public string Category;
+
+        [XmlElement("description")]
+        public string Description;
+
+        [XmlElement("rom")]
+        public Rom[] Roms;
+    }
+
+    public class Rom
+    {
+        [XmlAttribute("name")]
+        public string Name;
+
+        [XmlAttribute("size")]
+        public string Size;
+
+        [XmlAttribute("crc")]
+        public string Crc;
+
+        [XmlAttribute("md5")]
+        public string Md5;
+
+        [XmlAttribute("sha1")]
+        public string Sha1;
+
+        // TODO: Add extended hashes here
+    }
+}

MPF.Modules/DiscImageCreator/Constants.cs

@@ -26,6 +26,7 @@ namespace MPF.Modules.DiscImageCreator
         public const string Sub = "sub";
         public const string Swap = "swap";
         public const string Tape = "tape";
+        public const string Version = "/v";
         public const string XBOX = "xbox";
         public const string XBOXSwap = "xboxswap";
         public const string XGD2Swap = "xgd2swap";
@@ -44,13 +45,13 @@ namespace MPF.Modules.DiscImageCreator
         public const string C2Opcode = "/c2";
         public const string CopyrightManagementInformation = "/c";
         public const string D8Opcode = "/d8";
+        public const string DatExpand = "/d";
         public const string DisableBeep = "/q";
         public const string DVDReread = "/rr";
         public const string ExtractMicroSoftCabFile = "/mscf";
         public const string Fix = "/fix";
         public const string ForceUnitAccess = "/f";
         public const string MultiSectorRead = "/mr";
-        public const string MultiSession = "/ms";
         public const string NoFixSubP = "/np";
         public const string NoFixSubQ = "/nq";
         public const string NoFixSubQLibCrypt = "/nl";
@@ -58,6 +59,7 @@ namespace MPF.Modules.DiscImageCreator
         public const string NoFixSubQSecuROM = "/ns";
         public const string NoSkipSS = "/nss";
         public const string PadSector = "/ps";
+        public const string Range = "/ra";
         public const string Raw = "/raw";
         public const string Resume = "/re";
         public const string Reverse = "/r";
@@ -68,7 +70,6 @@ namespace MPF.Modules.DiscImageCreator
         public const string SkipSector = "/sk";
         public const string SubchannelReadLevel = "/s";
         public const string UseAnchorVolumeDescriptorPointer = "/avdp";
-        public const string VerifyAudio = "/vrfy";
         public const string VideoNow = "/vn";
         public const string VideoNowColor = "/vnc";
         public const string VideoNowXP = "/vnx";

MPF.Modules/MPF.Modules.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Modules/Redumper/Constants.cs

@@ -7,11 +7,16 @@ namespace MPF.Modules.Redumper
     {
         public const string NONE = "";
         public const string CD = "cd";
+        public const string DVD = "dvd"; // Synonym for CD
+        public const string BluRay = "bd"; // Synonym for CD
+        public const string SACD = "sacd"; // Synonym for CD
         public const string Dump = "dump";
         public const string Info = "info";
         public const string Protection = "protection";
         public const string Refine = "refine";
         public const string Split = "split";
+        public const string Verify = "verify";
+        public const string DVDKey = "dvdkey";
     }
 
     /// <summary>
@@ -19,32 +24,49 @@ namespace MPF.Modules.Redumper
     /// </summary>
     public static class FlagStrings
     {
-        public const string AudioSilenceThreshold = "--audio-silence-threshold";
-        public const string CDiCorrectOffset = "--cdi-correct-offset";
-        public const string CDiReadyNormalize = "--cdi-ready-normalize";
-        public const string DescrambleNew = "--descramble-new";
-        public const string Drive = "--drive";
-        public const string ForceOffset = "--force-offset";
-        public const string ForceQTOC = "--force-qtoc";
-        public const string ForceSplit = "--force-split";
-        public const string ForceTOC = "--force-toc";
+        // General
         public const string HelpLong = "--help";
         public const string HelpShort = "-h";
-        public const string ISO9660Trim = "--iso9660-trim";
-        public const string ImageName = "--image-name";
-        public const string ImagePath = "--image-path";
-        public const string LeaveUnchanged = "--leave-unchanged";
-        public const string Overwrite = "--overwrite";
-        public const string RefineSubchannel = "--refine-subchannel";
-        public const string Retries = "--retries";
-        public const string RingSize = "--ring-size";
-        public const string Skip = "--skip";
-        public const string SkipFill = "--skip-fill";
-        public const string SkipLeadIn = "--skip-leadin";
-        public const string SkipSize = "--skip-size";
-        public const string Speed = "--speed";
-        public const string StopLBA = "--stop-lba";
-        public const string Unsupported = "--unsupported";
         public const string Verbose = "--verbose";
+        public const string Debug = "--debug";
+        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";
+
+        // Drive Configuration
+        public const string DriveType = "--drive-type";
+        public const string DriveReadOffset = "--drive-read-offset";
+        public const string DriveC2Shift = "--drive-c2-shift";
+        public const string DrivePregapStart = "--drive-pregap-start";
+        public const string DriveReadMethod = "--drive-read-method";
+        public const string DriveSectorOrder = "--drive-sector-order";
+
+        // Drive Specific
+        public const string PlextorLeadinSkip = "--plextor-leadin-skip";
+        public const string PlextorLeadinRetries = "--plextor-leadin-retries";
+        public const string AsusSkipLeadout = "--asus-skip-leadout";
+
+        // Offset
+        public const string ForceOffset = "--force-offset";
+        public const string AudioSilenceThreshold = "--audio-silence-threshold";
+        public const string CorrectOffsetShift = "--correct-offset-shift";
+        public const string OffsetShiftRelocate = "--offset-shift-relocate";
+
+        // Split
+        public const string ForceSplit = "--force-split";
+        public const string LeaveUnchanged = "--leave-unchanged";
+        public const string ForceQTOC = "--force-qtoc";
+        public const string SkipFill = "--skip-fill";
+        public const string ISO9660Trim = "--iso9660-trim";
+
+        // Miscellaneous
+        public const string LBAStart = "--lba-start";
+        public const string LBAEnd = "--lba-end";
+        public const string RefineSubchannel = "--refine-subchannel";
+        public const string Skip = "--skip";
+        public const string DumpReadSize = "--dump-read-size";
     }
 }

MPF.Modules/UmdImageCreator/Parameters.cs

@@ -4,7 +4,6 @@ using System.IO;
 using System.Linq;
 using MPF.Core.Converters;
 using MPF.Core.Data;
-using MPF.Core.Utilities;
 using RedumpLib.Data;
 
 namespace MPF.Modules.UmdImageCreator
@@ -43,6 +42,8 @@ namespace MPF.Modules.UmdImageCreator
                     {
                         if (!File.Exists($"{basePath}_disc.txt"))
                             missingFiles.Add($"{basePath}_disc.txt");
+                        if (!File.Exists($"{basePath}_drive.txt"))
+                            missingFiles.Add($"{basePath}_drive.txt");
                         if (!File.Exists($"{basePath}_mainError.txt"))
                             missingFiles.Add($"{basePath}_mainError.txt");
                         if (!File.Exists($"{basePath}_mainInfo.txt"))
@@ -71,7 +72,7 @@ namespace MPF.Modules.UmdImageCreator
             switch (this.Type)
             {
                 case MediaType.UMD:
-                    info.Extras.PVD = GetPVD(basePath + "_mainInfo.txt") ?? "";
+                    info.Extras.PVD = GetPVD(basePath + "_mainInfo.txt") ?? string.Empty;
 
                     if (GetFileHashes(basePath + ".iso", out long filesize, out string crc32, out string md5, out string sha1))
                     {
@@ -83,9 +84,9 @@ namespace MPF.Modules.UmdImageCreator
 
                     if (GetUMDAuxInfo(basePath + "_disc.txt", out string title, out DiscCategory? umdcat, out string umdversion, out string umdlayer, out long umdsize))
                     {
-                        info.CommonDiscInfo.Title = title ?? "";
+                        info.CommonDiscInfo.Title = title ?? string.Empty;
                         info.CommonDiscInfo.Category = umdcat ?? DiscCategory.Games;
-                        info.VersionAndEditions.Version = umdversion ?? "";
+                        info.VersionAndEditions.Version = umdversion ?? string.Empty;
                         info.SizeAndChecksums.Size = umdsize;
 
                         if (!string.IsNullOrWhiteSpace(umdlayer))
@@ -100,6 +101,8 @@ namespace MPF.Modules.UmdImageCreator
             {
                 if (File.Exists(basePath + "_disc.txt"))
                     info.Artifacts["disc"] = GetBase64(GetFullFile(basePath + "_disc.txt"));
+                if (File.Exists(basePath + "_drive.txt"))
+                    info.Artifacts["drive"] = GetBase64(GetFullFile(basePath + "_drive.txt"));
                 if (File.Exists(basePath + "_mainError.txt"))
                     info.Artifacts["mainError"] = GetBase64(GetFullFile(basePath + "_mainError.txt"));
                 if (File.Exists(basePath + "_mainInfo.txt"))
@@ -118,6 +121,8 @@ namespace MPF.Modules.UmdImageCreator
                 case MediaType.UMD:
                     if (File.Exists($"{basePath}_disc.txt"))
                         logFiles.Add($"{basePath}_disc.txt");
+                    if (File.Exists($"{basePath}_drive.txt"))
+                        logFiles.Add($"{basePath}_drive.txt");
                     if (File.Exists($"{basePath}_mainError.txt"))
                         logFiles.Add($"{basePath}_mainError.txt");
                     if (File.Exists($"{basePath}_mainInfo.txt"))

MPF.Test/Core/Utilities/EnumExtensionsTests.cs

@@ -31,6 +31,7 @@ namespace MPF.Test.Core.Utilities
             RedumpSystem.AtariJaguarCDInteractiveMultimediaSystem,
             RedumpSystem.AudioCD,
             RedumpSystem.DVDAudio,
+            RedumpSystem.HasbroiONEducationalGamingSystem,
             RedumpSystem.HasbroVideoNow,
             RedumpSystem.HasbroVideoNowColor,
             RedumpSystem.HasbroVideoNowJr,
@@ -58,6 +59,7 @@ namespace MPF.Test.Core.Utilities
             RedumpSystem.SonyPlayStation2,
             RedumpSystem.SonyPlayStation3,
             RedumpSystem.SonyPlayStation4,
+            RedumpSystem.SonyPlayStationPortable,
         };
 
         /// <summary>

MPF.Test/Library/DumpEnvironmentTests.cs

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

MPF.Test/Library/InfoToolTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using MPF.Library;
 using RedumpLib.Data;
 using Xunit;
@@ -25,9 +26,9 @@ namespace MPF.Test.Library
         [InlineData(MediaType.DVD, 12345, 1, 2, 3, "DVD-ROM-9")]
         [InlineData(MediaType.BluRay, 0, 0, 0, 0, "BD-ROM-25")]
         [InlineData(MediaType.BluRay, 12345, 0, 0, 0, "BD-ROM-25")]
-        //[InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
+        [InlineData(MediaType.BluRay, 26_843_531_857, 0, 0, 0, "BD-ROM-33")]
         [InlineData(MediaType.BluRay, 12345, 1, 0, 0, "BD-ROM-50")]
-        //[InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
+        [InlineData(MediaType.BluRay, 53_687_063_713, 1, 0, 0, "BD-ROM-66")]
         [InlineData(MediaType.BluRay, 12345, 1, 2, 0, "BD-ROM-100")]
         [InlineData(MediaType.BluRay, 12345, 1, 2, 3, "BD-ROM-128")]
         [InlineData(MediaType.UMD, 0, 0, 0, 0, "UMD-SL")]
@@ -43,24 +44,27 @@ namespace MPF.Test.Library
             long layerbreak3,
             string expected)
         {
-            string actual = InfoTool.GetFixedMediaType(mediaType, size, layerbreak, layerbreak2, layerbreak3);
+            // TODO: Add tests around BDU
+            string actual = InfoTool.GetFixedMediaType(mediaType, null, size, layerbreak, layerbreak2, layerbreak3);
             Assert.Equal(expected, actual);
         }
 
         [Theory]
-        [InlineData(null, null, null, 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 outputDirectory, string outputFilename, string expectedOutputDirectory, string expectedOutputFilename)
+        [InlineData(null, 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)
         {
-            (string actualOutputDirectory, string actualOutputFilename) = InfoTool.NormalizeOutputPaths(outputDirectory, outputFilename);
-            Assert.Equal(expectedOutputDirectory, actualOutputDirectory);
-            Assert.Equal(expectedOutputFilename, actualOutputFilename);
+            if (!string.IsNullOrWhiteSpace(expectedPath))
+                expectedPath = Path.GetFullPath(expectedPath);
+
+            string actualPath = InfoTool.NormalizeOutputPaths(outputPath);
+            Assert.Equal(expectedPath, actualPath);
         }
 
         [Fact]

MPF.Test/MPF.Test.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -35,21 +34,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage" Version="17.3.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="Microsoft.CodeCoverage" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-    <PackageReference Include="xunit.analyzers" Version="1.0.0" />
-    <PackageReference Include="xunit.assert" Version="2.4.2" />
-    <PackageReference Include="xunit.core" Version="2.4.2" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.console" Version="2.4.2">
+    <PackageReference Include="xunit.analyzers" Version="1.2.0" />
+    <PackageReference Include="xunit.assert" Version="2.5.0" />
+    <PackageReference Include="xunit.core" Version="2.5.0" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.5.0" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

MPF.Test/RedumpLib/ExtensionsTests.cs

@@ -18,9 +18,9 @@ namespace MPF.Test.RedumpLib
         private static readonly DiscType?[] _mappableDiscTypes = new DiscType?[]
         {
             DiscType.BD25,
-            //DiscType.BD33,
+            DiscType.BD33,
             DiscType.BD50,
-            //DiscType.BD66,
+            DiscType.BD66,
             DiscType.BD100,
             DiscType.BD128,
             DiscType.CD,

MPF.UI.Core/MPF.UI.Core.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64</RuntimeIdentifiers>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <Title>MPF.UI.Core</Title>
     <AssemblyName>MPF.UI.Core</AssemblyName>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
-    <Version>2.4</Version>
+    <Copyright>Copyright (c)2019-2023</Copyright>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
@@ -20,6 +20,7 @@
     <NrtRevisionFormat>$(Version)-{chash:8}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>false</NrtShowRevision>
+    <UserSecretsId>27abb4ca-bf7a-431e-932f-49153303d5ff</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

MPF.UI.Core/Theme.cs

@@ -0,0 +1,400 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace MPF.UI.Core
+{
+    /// <summary>
+    /// Represents all required mapping values for the UI
+    /// </summary>
+    public class Theme
+    {
+        #region Application-Wide
+
+        /// <summary>
+        /// SolidColorBrush used to paint the active window's border.
+        /// </summary>
+        public SolidColorBrush ActiveBorderBrush { get; set; }
+
+        /// <summary>
+        /// SolidColorBrush that paints the face of a three-dimensional display element.
+        /// </summary>
+        public SolidColorBrush ControlBrush { get; set; }
+
+        /// <summary>
+        /// SolidColorBrush that paints text in a three-dimensional display element.
+        /// </summary>
+        public SolidColorBrush ControlTextBrush { get; set; }
+
+        /// <summary>
+        /// SolidColorBrush that paints disabled text.
+        /// </summary>
+        public SolidColorBrush GrayTextBrush { get; set; }
+
+        /// <summary>
+        /// SolidColorBrush that paints the background of a window's client area.
+        /// </summary>
+        public SolidColorBrush WindowBrush { get; set; }
+
+        /// <summary>
+        /// SolidColorBrush that paints the text in the client area of a window.
+        /// </summary>
+        public SolidColorBrush WindowTextBrush { get; set; }
+
+        #endregion
+
+        #region Button
+
+        /// <summary>
+        /// Brush for the Button.Disabled.Background resource
+        /// </summary>
+        public Brush Button_Disabled_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the Button.MouseOver.Background resource
+        /// </summary>
+        public Brush Button_MouseOver_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the Button.Pressed.Background resource
+        /// </summary>
+        public Brush Button_Pressed_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the Button.Static.Background resource
+        /// </summary>
+        public Brush Button_Static_Background { get; set; }
+
+        #endregion
+
+        #region ComboBox
+
+        /// <summary>
+        /// Brush for the ComboBox.Disabled.Background resource
+        /// </summary>
+        public Brush ComboBox_Disabled_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Disabled.Editable.Background resource
+        /// </summary>
+        public Brush ComboBox_Disabled_Editable_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Disabled.Editable.Button.Background resource
+        /// </summary>
+        public Brush ComboBox_Disabled_Editable_Button_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.MouseOver.Background resource
+        /// </summary>
+        public Brush ComboBox_MouseOver_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.MouseOver.Editable.Background resource
+        /// </summary>
+        public Brush ComboBox_MouseOver_Editable_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.MouseOver.Editable.Button.Background resource
+        /// </summary>
+        public Brush ComboBox_MouseOver_Editable_Button_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Pressed.Background resource
+        /// </summary>
+        public Brush ComboBox_Pressed_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Pressed.Editable.Background resource
+        /// </summary>
+        public Brush ComboBox_Pressed_Editable_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Pressed.Editable.Button.Background resource
+        /// </summary>
+        public Brush ComboBox_Pressed_Editable_Button_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Static.Background resource
+        /// </summary>
+        public Brush ComboBox_Static_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Static.Editable.Background resource
+        /// </summary>
+        public Brush ComboBox_Static_Editable_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the ComboBox.Static.Editable.Button.Background resource
+        /// </summary>
+        public Brush ComboBox_Static_Editable_Button_Background { get; set; }
+
+        #endregion
+
+        #region CustomMessageBox
+
+        /// <summary>
+        /// Brush for the CustomMessageBox.Static.Background resource
+        /// </summary>
+        public Brush CustomMessageBox_Static_Background { get; set; }
+
+        #endregion
+
+        #region MenuItem
+
+        /// <summary>
+        /// Brush for the MenuItem.SubMenu.Background resource
+        /// </summary>
+        public Brush MenuItem_SubMenu_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the MenuItem.SubMenu.Border resource
+        /// </summary>
+        public Brush MenuItem_SubMenu_Border { get; set; }
+
+        #endregion
+
+        #region ProgressBar
+
+        /// <summary>
+        /// Brush for the ProgressBar.Background resource
+        /// </summary>
+        public Brush ProgressBar_Background { get; set; }
+
+        #endregion
+
+        #region ScrollViewer
+
+        /// <summary>
+        /// Brush for the ScrollViewer.ScrollBar.Background resource
+        /// </summary>
+        public Brush ScrollViewer_ScrollBar_Background { get; set; }
+
+        #endregion
+
+        #region TabItem
+
+        /// <summary>
+        /// Brush for the TabItem.Selected.Background resource
+        /// </summary>
+        public Brush TabItem_Selected_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the TabItem.Static.Background resource
+        /// </summary>
+        public Brush TabItem_Static_Background { get; set; }
+
+        /// <summary>
+        /// Brush for the TabItem.Static.Border resource
+        /// </summary>
+        public Brush TabItem_Static_Border { get; set; }
+
+        #endregion
+
+        #region TextBox
+
+        /// <summary>
+        /// Brush for the TextBox.Static.Background resource
+        /// </summary>
+        public Brush TextBox_Static_Background { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Apply the theme to the current application
+        /// </summary>
+        public void Apply()
+        {
+            // Handle application-wide resources
+            Application.Current.Resources[SystemColors.ActiveBorderBrushKey] = this.ActiveBorderBrush;
+            Application.Current.Resources[SystemColors.ControlBrushKey] = this.ControlBrush;
+            Application.Current.Resources[SystemColors.ControlTextBrushKey] = this.ControlTextBrush;
+            Application.Current.Resources[SystemColors.GrayTextBrushKey] = this.GrayTextBrush;
+            Application.Current.Resources[SystemColors.WindowBrushKey] = this.WindowBrush;
+            Application.Current.Resources[SystemColors.WindowTextBrushKey] = this.WindowTextBrush;
+
+            // Handle Button-specific resources
+            Application.Current.Resources["Button.Disabled.Background"] = this.Button_Disabled_Background;
+            Application.Current.Resources["Button.MouseOver.Background"] = this.Button_MouseOver_Background;
+            Application.Current.Resources["Button.Pressed.Background"] = this.Button_Pressed_Background;
+            Application.Current.Resources["Button.Static.Background"] = this.Button_Static_Background;
+
+            // Handle ComboBox-specific resources
+            Application.Current.Resources["ComboBox.Disabled.Background"] = this.ComboBox_Disabled_Background;
+            Application.Current.Resources["ComboBox.Disabled.Editable.Background"] = this.ComboBox_Disabled_Editable_Background;
+            Application.Current.Resources["ComboBox.Disabled.Editable.Button.Background"] = this.ComboBox_Disabled_Editable_Button_Background;
+            Application.Current.Resources["ComboBox.MouseOver.Background"] = this.ComboBox_MouseOver_Background;
+            Application.Current.Resources["ComboBox.MouseOver.Editable.Background"] = this.ComboBox_MouseOver_Editable_Background;
+            Application.Current.Resources["ComboBox.MouseOver.Editable.Button.Background"] = this.ComboBox_MouseOver_Editable_Button_Background;
+            Application.Current.Resources["ComboBox.Pressed.Background"] = this.ComboBox_Pressed_Background;
+            Application.Current.Resources["ComboBox.Pressed.Editable.Background"] = this.ComboBox_Pressed_Editable_Background;
+            Application.Current.Resources["ComboBox.Pressed.Editable.Button.Background"] = this.ComboBox_Pressed_Editable_Button_Background;
+            Application.Current.Resources["ComboBox.Static.Background"] = this.ComboBox_Static_Background;
+            Application.Current.Resources["ComboBox.Static.Editable.Background"] = this.ComboBox_Static_Editable_Background;
+            Application.Current.Resources["ComboBox.Static.Editable.Button.Background"] = this.ComboBox_Static_Editable_Button_Background;
+
+            // Handle CustomMessageBox-specific resources
+            Application.Current.Resources["CustomMessageBox.Static.Background"] = this.CustomMessageBox_Static_Background;
+
+            // Handle MenuItem-specific resources
+            Application.Current.Resources["MenuItem.SubMenu.Background"] = this.MenuItem_SubMenu_Background;
+            Application.Current.Resources["MenuItem.SubMenu.Border"] = this.MenuItem_SubMenu_Border;
+
+            // Handle ProgressBar-specific resources
+            Application.Current.Resources["ProgressBar.Background"] = this.ProgressBar_Background;
+
+            // Handle ScrollViewer-specific resources
+            Application.Current.Resources["ScrollViewer.ScrollBar.Background"] = this.ScrollViewer_ScrollBar_Background;
+
+            // Handle TabItem-specific resources
+            Application.Current.Resources["TabItem.Selected.Background"] = this.TabItem_Selected_Background;
+            Application.Current.Resources["TabItem.Static.Background"] = this.TabItem_Static_Background;
+            Application.Current.Resources["TabItem.Static.Border"] = this.TabItem_Static_Border;
+
+            // Handle TextBox-specific resources
+            Application.Current.Resources["TextBox.Static.Background"] = this.TextBox_Static_Background;
+        }
+    }
+
+    /// <summary>
+    /// Default light-mode theme
+    /// </summary>
+    public class LightModeTheme : Theme
+    {
+        public LightModeTheme()
+        {
+            // Handle application-wide resources
+            this.ActiveBorderBrush = null;
+            this.ControlBrush = null;
+            this.ControlTextBrush = null;
+            this.GrayTextBrush = null;
+            this.WindowBrush = null;
+            this.WindowTextBrush = null;
+
+            // Handle Button-specific resources
+            this.Button_Disabled_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xF4, 0xF4, 0xF4));
+            this.Button_MouseOver_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xBE, 0xE6, 0xFD));
+            this.Button_Pressed_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xC4, 0xE5, 0xF6));
+            this.Button_Static_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xDD, 0xDD, 0xDD));
+
+            // Handle ComboBox-specific resources
+            this.ComboBox_Disabled_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0));
+            this.ComboBox_Disabled_Editable_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+            this.ComboBox_Disabled_Editable_Button_Background = Brushes.Transparent;
+            this.ComboBox_MouseOver_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xEC, 0xF4, 0xFC),
+                Color.FromArgb(0xFF, 0xDC, 0xEC, 0xFC),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.ComboBox_MouseOver_Editable_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+            this.ComboBox_MouseOver_Editable_Button_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xEB, 0xF4, 0xFC),
+                Color.FromArgb(0xFF, 0xDC, 0xEC, 0xFC),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.ComboBox_Pressed_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xDA, 0xEC, 0xFC),
+                Color.FromArgb(0xFF, 0xC4, 0xE0, 0xFC),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.ComboBox_Pressed_Editable_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+            this.ComboBox_Pressed_Editable_Button_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xDA, 0xEB, 0xFC),
+                Color.FromArgb(0xFF, 0xC4, 0xE0, 0xFC),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.ComboBox_Static_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0),
+                Color.FromArgb(0xFF, 0xE5, 0xE5, 0xE5),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.ComboBox_Static_Editable_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+            this.ComboBox_Static_Editable_Button_Background = Brushes.Transparent;
+
+            // Handle CustomMessageBox-specific resources
+            this.CustomMessageBox_Static_Background = null;
+
+            // Handle MenuItem-specific resources
+            this.MenuItem_SubMenu_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0));
+            this.MenuItem_SubMenu_Border = Brushes.DarkGray;
+
+            // Handle ProgressBar-specific resources
+            this.ProgressBar_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xE6, 0xE6, 0xE6));
+
+            // Handle ScrollViewer-specific resources
+            this.ScrollViewer_ScrollBar_Background = Brushes.LightGray;
+
+            // Handle TabItem-specific resources
+            this.TabItem_Selected_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+            this.TabItem_Static_Background = new LinearGradientBrush(
+                Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0),
+                Color.FromArgb(0xFF, 0xE5, 0xE5, 0xE5),
+                new Point(0, 0),
+                new Point(0, 1));
+            this.TabItem_Static_Border = Brushes.DarkGray;
+
+            // Handle TextBox-specific resources
+            this.TextBox_Static_Background = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
+        }
+    }
+
+    /// <summary>
+    /// Default dark-mode theme
+    /// </summary>
+    public class DarkModeTheme : Theme
+    {
+        public DarkModeTheme()
+        {
+            // Setup needed brushes
+            var darkModeBrush = new SolidColorBrush { Color = Color.FromArgb(0xff, 0x20, 0x20, 0x20) };
+
+            // Handle application-wide resources
+            this.ActiveBorderBrush = Brushes.Black;
+            this.ControlBrush = darkModeBrush;
+            this.ControlTextBrush = Brushes.White;
+            this.GrayTextBrush = Brushes.DarkGray;
+            this.WindowBrush = darkModeBrush;
+            this.WindowTextBrush = Brushes.White;
+
+            // Handle Button-specific resources
+            this.Button_Disabled_Background = darkModeBrush;
+            this.Button_MouseOver_Background = darkModeBrush;
+            this.Button_Pressed_Background = darkModeBrush;
+            this.Button_Static_Background = darkModeBrush;
+
+            // Handle ComboBox-specific resources
+            this.ComboBox_Disabled_Background = darkModeBrush;
+            this.ComboBox_Disabled_Editable_Background = darkModeBrush;
+            this.ComboBox_Disabled_Editable_Button_Background = darkModeBrush;
+            this.ComboBox_MouseOver_Background = darkModeBrush;
+            this.ComboBox_MouseOver_Editable_Background = darkModeBrush;
+            this.ComboBox_MouseOver_Editable_Button_Background = darkModeBrush;
+            this.ComboBox_Pressed_Background = darkModeBrush;
+            this.ComboBox_Pressed_Editable_Background = darkModeBrush;
+            this.ComboBox_Pressed_Editable_Button_Background = darkModeBrush;
+            this.ComboBox_Static_Background = darkModeBrush;
+            this.ComboBox_Static_Editable_Background = darkModeBrush;
+            this.ComboBox_Static_Editable_Button_Background = darkModeBrush;
+
+            // Handle CustomMessageBox-specific resources
+            this.CustomMessageBox_Static_Background = darkModeBrush;
+
+            // Handle MenuItem-specific resources
+            this.MenuItem_SubMenu_Background = darkModeBrush;
+            this.MenuItem_SubMenu_Border = Brushes.DarkGray;
+
+            // Handle ProgressBar-specific resources
+            this.ProgressBar_Background = darkModeBrush;
+
+            // Handle ScrollViewer-specific resources
+            this.ScrollViewer_ScrollBar_Background = darkModeBrush;
+
+            // Handle TabItem-specific resources
+            this.TabItem_Selected_Background = darkModeBrush;
+            this.TabItem_Static_Background = darkModeBrush;
+            this.TabItem_Static_Border = Brushes.DarkGray;
+
+            // Handle TextBox-specific resources
+            this.TextBox_Static_Background = darkModeBrush;
+        }
+    }
+}

MPF.UI.Core/ViewModels/DiscInformationViewModel.cs

@@ -322,6 +322,8 @@ namespace MPF.UI.Core.ViewModels
                 Parent.PVD.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.Multisession) != true)
                 Parent.Multisession.Visibility = Visibility.Collapsed;
+            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.RingNonZeroDataStart) != true)
+                Parent.RingNonZeroDataStart.Visibility = Visibility.Collapsed;
             if (string.IsNullOrWhiteSpace(SubmissionInfo?.CopyProtection?.SecuROMData))
                 Parent.SecuROMData.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.SSHash) != true)
@@ -330,6 +332,8 @@ namespace MPF.UI.Core.ViewModels
                 Parent.SecuritySectorRanges.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.SSVersion) != true)
                 Parent.SSVersion.Visibility = Visibility.Collapsed;
+            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.UniversalHash) != true)
+                Parent.UniversalHash.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.VolumeLabel) != true)
                 Parent.VolumeLabel.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.XeMID) != true)
@@ -465,10 +469,14 @@ namespace MPF.UI.Core.ViewModels
                     Parent.Multisession.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PFIHash))
                     Parent.PFIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash];
+                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.RingNonZeroDataStart))
+                    Parent.RingNonZeroDataStart.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.RingNonZeroDataStart];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SSHash))
                     Parent.SSHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SSVersion))
                     Parent.SSVersion.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion];
+                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.UniversalHash))
+                    Parent.UniversalHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.VolumeLabel))
                     Parent.VolumeLabel.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VolumeLabel];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.XeMID))
@@ -581,8 +589,10 @@ namespace MPF.UI.Core.ViewModels
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = Parent.InternalSerialName.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession] = Parent.Multisession.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = Parent.PFIHash.Text;
+            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.RingNonZeroDataStart] = Parent.RingNonZeroDataStart.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = Parent.SSHash.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = Parent.SSVersion.Text;
+            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash] = Parent.UniversalHash.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.VolumeLabel] = Parent.VolumeLabel.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XeMID] = Parent.XeMID.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.XMID] = Parent.XMID.Text;
@@ -661,9 +671,9 @@ namespace MPF.UI.Core.ViewModels
                 case DiscType.HDDVDSL:
                 case DiscType.HDDVDDL:
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                 case DiscType.NintendoGameCubeGameDisc:

MPF.UI.Core/Windows/DiscInformationWindow.xaml

@@ -369,6 +369,7 @@
                             <controls:UserInput x:Name="PVD" Label="PVD" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.PVD, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                            <controls:UserInput x:Name="RingNonZeroDataStart" Label="Ring Non-Zero Data Start" IsReadOnly="True"/>
                             <controls:UserInput x:Name="SecuROMData" Label="SecuROM Data" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.CopyProtection.SecuROMData, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
@@ -377,6 +378,7 @@
                                                 Text="{Binding SubmissionInfo.Extras.SecuritySectorRanges, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
                             <controls:UserInput x:Name="SSVersion" Label="Security Sector Version" IsReadOnly="True"/>
+                            <controls:UserInput x:Name="UniversalHash" Label="Universal Hash (SHA-1)" IsReadOnly="True"/>
                             <controls:UserInput x:Name="VolumeLabel" Label="Volume Label" IsReadOnly="True"/>
                             <controls:UserInput x:Name="XeMID" Label="XeMID" IsReadOnly="True"/>
                             <controls:UserInput x:Name="XMID" Label="XMID" IsReadOnly="True"/>

MPF.sln

@@ -31,44 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.Modules", "MPF.Modules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPF.UI.Core", "MPF.UI.Core\MPF.UI.Core.csproj", "{EA3768DB-694A-4653-82E4-9FF71B8963F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.CommonTypes", "Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj", "{F2B84194-26EB-4227-B1C5-6602517E85AE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Devices", "Aaru\Aaru.Devices\Aaru.Devices.csproj", "{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Console", "Aaru\Aaru.Console\Aaru.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Decoders", "Aaru\Aaru.Decoders\Aaru.Decoders.csproj", "{0BEB3088-B634-4289-AE17-CDF2D25D00D5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Checksums", "Aaru\Aaru.Checksums\Aaru.Checksums.csproj", "{CC48B324-A532-4A45-87A6-6F91F7141E8D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Helpers", "Aaru\Aaru.Helpers\Aaru.Helpers.csproj", "{F8BDF57B-1571-4CD0-84B3-B422088D359A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CICMMetadataEditor", "Aaru\CICMMetadata\CICMMetadataEditor\CICMMetadataEditor\CICMMetadataEditor.csproj", "{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Core", "Aaru\Aaru.Core\Aaru.Core.csproj", "{679659B8-25D0-4279-B632-56EF8F94ADC0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Decryption", "Aaru\Aaru.Decryption\Aaru.Decryption.csproj", "{B38840FC-7A2F-4F68-9508-6DE313E04C6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Archives", "Aaru\Aaru.Archives\Aaru.Archives.csproj", "{282271D0-CCC2-4ED7-BA38-EC06A84BB974}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru\Aaru.Dto\Aaru.Dto.csproj", "{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Database", "Aaru\Aaru.Database\Aaru.Database.csproj", "{EE2CE4AA-1422-4A44-8B46-086E01D9AC08}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filesystems", "Aaru\Aaru.Filesystems\Aaru.Filesystems.csproj", "{D7016DF2-5A5E-4524-B40D-BA2D59576688}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Filters", "Aaru\Aaru.Filters\Aaru.Filters.csproj", "{D571B8EF-903D-4353-BDD5-B834F9F029EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Images", "Aaru\Aaru.Images\Aaru.Images.csproj", "{74032CBC-339B-42F3-AF6F-E96C261F3E6A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Partitions", "Aaru\Aaru.Partitions\Aaru.Partitions.csproj", "{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Settings", "Aaru\Aaru.Settings\Aaru.Settings.csproj", "{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Compression", "Aaru\Aaru.Compression\Aaru.Compression.csproj", "{858398D1-7321-4763-8BAB-56BBFEC74E29}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aaru", "Aaru", "{29ED0535-C038-4CDB-87D8-11F6F33D95CF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MPF", "MPF", "{4160167D-681D-480B-ABC6-06AC869E5769}"
 EndProject
 Global
@@ -113,78 +75,6 @@ Global
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2B84194-26EB-4227-B1C5-6602517E85AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{679659B8-25D0-4279-B632-56EF8F94ADC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B38840FC-7A2F-4F68-9508-6DE313E04C6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B38840FC-7A2F-4F68-9508-6DE313E04C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B38840FC-7A2F-4F68-9508-6DE313E04C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B38840FC-7A2F-4F68-9508-6DE313E04C6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{282271D0-CCC2-4ED7-BA38-EC06A84BB974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{282271D0-CCC2-4ED7-BA38-EC06A84BB974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{282271D0-CCC2-4ED7-BA38-EC06A84BB974}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{282271D0-CCC2-4ED7-BA38-EC06A84BB974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE2CE4AA-1422-4A44-8B46-086E01D9AC08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE2CE4AA-1422-4A44-8B46-086E01D9AC08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE2CE4AA-1422-4A44-8B46-086E01D9AC08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE2CE4AA-1422-4A44-8B46-086E01D9AC08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{858398D1-7321-4763-8BAB-56BBFEC74E29}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -198,24 +88,6 @@ Global
 		{70B1265D-FE49-472A-A83D-0B462152D37A} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{8A4254BD-552F-4238-B8EB-D59AACD768B9} = {4160167D-681D-480B-ABC6-06AC869E5769}
 		{EA3768DB-694A-4653-82E4-9FF71B8963F3} = {4160167D-681D-480B-ABC6-06AC869E5769}
-		{F2B84194-26EB-4227-B1C5-6602517E85AE} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{57BB2341-AB62-48FD-91B8-46F5A2F9ED51} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{CCAA7AFE-C094-4D82-A66D-630DE8A3F545} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{0BEB3088-B634-4289-AE17-CDF2D25D00D5} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{CC48B324-A532-4A45-87A6-6F91F7141E8D} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{F8BDF57B-1571-4CD0-84B3-B422088D359A} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{7BCE5DC7-BA1C-4B59-9AA9-1AB5F81A703C} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{679659B8-25D0-4279-B632-56EF8F94ADC0} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{B38840FC-7A2F-4F68-9508-6DE313E04C6E} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{282271D0-CCC2-4ED7-BA38-EC06A84BB974} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{F4399FF5-9BD0-475A-9EA7-3DAE45291FE2} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{EE2CE4AA-1422-4A44-8B46-086E01D9AC08} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{D7016DF2-5A5E-4524-B40D-BA2D59576688} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{D571B8EF-903D-4353-BDD5-B834F9F029EF} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{74032CBC-339B-42F3-AF6F-E96C261F3E6A} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{DA7AB65D-B5BA-4003-8893-A51BB071BA2F} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{5C4C7BAA-CF60-4233-84ED-39CB2312AF38} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
-		{858398D1-7321-4763-8BAB-56BBFEC74E29} = {29ED0535-C038-4CDB-87D8-11F6F33D95CF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73C62E6A-6584-4D93-83B5-ECB1FBDB469B}

MPF/Constants.cs

@@ -13,11 +13,13 @@ namespace MPF
         // Private lists of known drive speed ranges
         private static IReadOnlyList<int> CD { get; } = new List<int> { 1, 2, 3, 4, 6, 8, 12, 16, 20, 24, 32, 40, 44, 48, 52, 56, 72 };
         private static IReadOnlyList<int> DVD { get; } = CD.Where(s => s <= 24).ToList();
+        private static IReadOnlyList<int> HDDVD { get; } = CD.Where(s => s <= 24).ToList();
         private static IReadOnlyList<int> BD { get; } = CD.Where(s => s <= 16).ToList();
 
         // Create collections for UI based on known drive speeds
         public static DoubleCollection SpeedsForCDAsCollection { get; } = GetDoubleCollectionFromIntList(CD);
         public static DoubleCollection SpeedsForDVDAsCollection { get; } = GetDoubleCollectionFromIntList(DVD);
+        public static DoubleCollection SpeedsForHDDVDAsCollection { get; } = GetDoubleCollectionFromIntList(HDDVD);
         public static DoubleCollection SpeedsForBDAsCollection { get; } = GetDoubleCollectionFromIntList(BD);
         private static DoubleCollection GetDoubleCollectionFromIntList(IReadOnlyList<int> list)
             => new DoubleCollection(list.Select(i => Convert.ToDouble(i)).ToList());

MPF/MPF.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
-    <PlatformTarget>x86</PlatformTarget>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
@@ -11,9 +11,9 @@
     <AssemblyName>MPF</AssemblyName>
     <Description>Frontend for various dumping programs</Description>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
-    <Copyright>Copyright (c)2019-2022</Copyright>
+    <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.4</Version>
+    <Version>2.6</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>
@@ -27,10 +27,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.3.4" GeneratePathProperty="true">
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="2.8.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

MPF/ViewModels/MainViewModel.cs

@@ -15,6 +15,7 @@ using MPF.UI.Core.Windows;
 using RedumpLib.Data;
 using WPFCustomMessageBox;
 using WinForms = System.Windows.Forms;
+using MPF.UI.Core;
 
 namespace MPF.UI.ViewModels
 {
@@ -51,6 +52,11 @@ namespace MPF.UI.ViewModels
         /// </summary>
         public List<RedumpSystemComboBoxItem> Systems { get; set; } = RedumpSystemComboBoxItem.GenerateElements().ToList();
 
+        /// <summary>
+        /// List of available internal programs
+        /// </summary>
+        public List<Element<InternalProgram>> InternalPrograms { get; set; } = new List<Element<InternalProgram>>();
+
         #endregion
 
         #region Private Event Flags
@@ -60,11 +66,6 @@ namespace MPF.UI.ViewModels
         /// </summary>
         private bool _canExecuteSelectionChanged = false;
 
-        /// <summary>
-        /// Indicates if TextChanged events can be executed
-        /// </summary>
-        private bool _canExecuteTextChanged = false;
-
         #endregion
 
         /// <summary>
@@ -166,7 +167,7 @@ namespace MPF.UI.ViewModels
         /// <summary>
         /// Populate media type according to system type
         /// </summary>
-        public void PopulateMediaType()
+        private void PopulateMediaType()
         {
             RedumpSystem? currentSystem = App.Instance.SystemTypeComboBox.SelectedItem as RedumpSystemComboBoxItem;
 
@@ -191,6 +192,27 @@ namespace MPF.UI.ViewModels
             App.Instance.UpdateLayout();
         }
 
+        /// <summary>
+        /// Populate media type according to system type
+        /// </summary>
+        private void PopulateInternalPrograms()
+        {
+            // Get the current internal program
+            InternalProgram internalProgram = App.Options.InternalProgram;
+
+            // Create a static list of supported programs, not everything
+            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, InternalProgram.Redumper, InternalProgram.DD };
+            InternalPrograms = internalPrograms.Select(ip => new Element<InternalProgram>(ip)).ToList();
+            App.Instance.DumpingProgramComboBox.ItemsSource = InternalPrograms;
+
+            // Select the current default dumping program
+            int currentIndex = InternalPrograms.FindIndex(m => m == internalProgram);
+            App.Instance.DumpingProgramComboBox.SelectedIndex = (currentIndex > -1 ? currentIndex : 0);
+
+            // Ensure the UI gets updated
+            App.Instance.UpdateLayout();
+        }
+
         #endregion
 
         #region UI Commands
@@ -249,11 +271,11 @@ namespace MPF.UI.ViewModels
         public void ExitApplication() => Application.Current.Shutdown();
 
         /// <summary>
-        /// Set the output directory from a dialog box
+        /// Set the output path from a dialog box
         /// </summary>
-        public void SetOutputDirectory()
+        public void SetOutputPath()
         {
-            BrowseFolder();
+            BrowseFile();
             EnsureDiscInformation();
         }
 
@@ -435,12 +457,32 @@ namespace MPF.UI.ViewModels
         {
             if (App.Instance.EnableParametersCheckBox.IsChecked == true)
             {
+                App.Instance.SystemTypeComboBox.IsEnabled = false;
+                App.Instance.MediaTypeComboBox.IsEnabled = false;
+
+                App.Instance.OutputPathTextBox.IsEnabled = false;
+                App.Instance.OutputPathBrowseButton.IsEnabled = false;
+
+                App.Instance.MediaScanButton.IsEnabled = false;
+                App.Instance.UpdateVolumeLabel.IsEnabled = false;
+                App.Instance.CopyProtectScanButton.IsEnabled = false;
+
                 App.Instance.ParametersTextBox.IsEnabled = true;
             }
             else
             {
                 App.Instance.ParametersTextBox.IsEnabled = false;
                 ProcessCustomParameters();
+
+                App.Instance.SystemTypeComboBox.IsEnabled = true;
+                App.Instance.MediaTypeComboBox.IsEnabled = true;
+
+                App.Instance.OutputPathTextBox.IsEnabled = true;
+                App.Instance.OutputPathBrowseButton.IsEnabled = true;
+
+                App.Instance.MediaScanButton.IsEnabled = true;
+                App.Instance.UpdateVolumeLabel.IsEnabled = true;
+                App.Instance.CopyProtectScanButton.IsEnabled = true;
             }
         }
 
@@ -485,7 +527,7 @@ namespace MPF.UI.ViewModels
         {
             if (optionsWindow?.OptionsViewModel.SavedSettings == true)
             {
-                App.Options = optionsWindow.OptionsViewModel.Options.Clone() as Options;
+                App.Options = optionsWindow.OptionsViewModel.Options.Clone() as MPF.Core.Data.Options;
                 InitializeUIValues(removeEventHandlers: true, rescanDrives: true);
             }
         }
@@ -517,7 +559,7 @@ namespace MPF.UI.ViewModels
             if (App.Options.EnableDarkMode)
                 EnableDarkMode();
             else
-                DisableDarkMode();
+                EnableLightMode();
 
             // Force the UI to reload after applying the theme
             App.Instance.UpdateLayout();
@@ -542,6 +584,9 @@ namespace MPF.UI.ViewModels
             CacheCurrentDiscType();
             SetCurrentDiscType();
 
+            // Set the dumping program
+            await App.Instance.Dispatcher.InvokeAsync(PopulateInternalPrograms);
+
             // Set the initial environment and UI values
             SetSupportedDriveSpeed();
             Env = DetermineEnvironment();
@@ -555,6 +600,43 @@ namespace MPF.UI.ViewModels
             App.Instance.StartStopButton.IsEnabled = ShouldEnableDumpingButton();
         }
 
+        /// <summary>
+        /// Performs a fast update of the output path while skipping disc checks
+        /// </summary>
+        /// <param name="removeEventHandlers">Whether event handlers need to be removed first</param>
+        private void FastUpdateLabel(bool removeEventHandlers)
+        {
+            // Disable the dumping button
+            App.Instance.StartStopButton.IsEnabled = false;
+
+            // Safely uncheck the parameters box, just in case
+            if (App.Instance.EnableParametersCheckBox.IsChecked == true)
+            {
+                App.Instance.EnableParametersCheckBox.Checked -= EnableParametersCheckBoxClick;
+                App.Instance.EnableParametersCheckBox.IsChecked = false;
+                App.Instance.ParametersTextBox.IsEnabled = false;
+                App.Instance.EnableParametersCheckBox.Checked += EnableParametersCheckBoxClick;
+            }
+
+            // Remove event handlers to ensure ordering
+            if (removeEventHandlers)
+                DisableEventHandlers();
+
+            // Refresh the drive info
+            (App.Instance.DriveLetterComboBox.SelectedItem as Drive)?.RefreshDrive();
+
+            // Set the initial environment and UI values
+            Env = DetermineEnvironment();
+            GetOutputNames(true);
+            EnsureDiscInformation();
+
+            // Enable event handlers
+            EnableEventHandlers();
+
+            // Enable the dumping button, if necessary
+            App.Instance.StartStopButton.IsEnabled = ShouldEnableDumpingButton();
+        }
+
         /// <summary>
         /// Add all event handlers
         /// </summary>
@@ -572,7 +654,7 @@ namespace MPF.UI.ViewModels
             App.Instance.EnableParametersCheckBox.Click += EnableParametersCheckBoxClick;
             App.Instance.MediaScanButton.Click += MediaScanButtonClick;
             App.Instance.UpdateVolumeLabel.Click += UpdateVolumeLabelClick;
-            App.Instance.OutputDirectoryBrowseButton.Click += OutputDirectoryBrowseButtonClick;
+            App.Instance.OutputPathBrowseButton.Click += OutputPathBrowseButtonClick;
             App.Instance.StartStopButton.Click += StartStopButtonClick;
 
             // User Area SelectionChanged
@@ -580,10 +662,10 @@ namespace MPF.UI.ViewModels
             App.Instance.MediaTypeComboBox.SelectionChanged += MediaTypeComboBoxSelectionChanged;
             App.Instance.DriveLetterComboBox.SelectionChanged += DriveLetterComboBoxSelectionChanged;
             App.Instance.DriveSpeedComboBox.SelectionChanged += DriveSpeedComboBoxSelectionChanged;
+            App.Instance.DumpingProgramComboBox.SelectionChanged += DumpingProgramComboBoxSelectionChanged;
 
             // User Area TextChanged
-            App.Instance.OutputFilenameTextBox.TextChanged += OutputFilenameTextBoxTextChanged;
-            App.Instance.OutputDirectoryTextBox.TextChanged += OutputDirectoryTextBoxTextChanged;
+            App.Instance.OutputPathTextBox.TextChanged += OutputPathTextBoxTextChanged;
         }
 
         /// <summary>
@@ -592,7 +674,6 @@ namespace MPF.UI.ViewModels
         private void EnableEventHandlers()
         {
             _canExecuteSelectionChanged = true;
-            EnablePathEventHandlers();
         }
 
         /// <summary>
@@ -601,23 +682,6 @@ namespace MPF.UI.ViewModels
         private void DisableEventHandlers()
         {
             _canExecuteSelectionChanged = false;
-            DisablePathEventHandlers();
-        }
-
-        /// <summary>
-        /// Enable path textbox event handlers
-        /// </summary>
-        private void EnablePathEventHandlers()
-        {
-            _canExecuteTextChanged = true;
-        }
-
-        /// <summary>
-        /// Disable path textbox event handlers
-        /// </summary>
-        private void DisablePathEventHandlers()
-        {
-            _canExecuteTextChanged = false;
         }
 
         /// <summary>
@@ -628,11 +692,11 @@ namespace MPF.UI.ViewModels
             App.Instance.OptionsMenuItem.IsEnabled = false;
             App.Instance.SystemTypeComboBox.IsEnabled = false;
             App.Instance.MediaTypeComboBox.IsEnabled = false;
-            App.Instance.OutputFilenameTextBox.IsEnabled = false;
-            App.Instance.OutputDirectoryTextBox.IsEnabled = false;
-            App.Instance.OutputDirectoryBrowseButton.IsEnabled = false;
+            App.Instance.OutputPathTextBox.IsEnabled = false;
+            App.Instance.OutputPathBrowseButton.IsEnabled = false;
             App.Instance.DriveLetterComboBox.IsEnabled = false;
             App.Instance.DriveSpeedComboBox.IsEnabled = false;
+            App.Instance.DumpingProgramComboBox.IsEnabled = false;
             App.Instance.EnableParametersCheckBox.IsEnabled = false;
             App.Instance.StartStopButton.Content = Interface.StopDumping;
             App.Instance.MediaScanButton.IsEnabled = false;
@@ -648,11 +712,11 @@ namespace MPF.UI.ViewModels
             App.Instance.OptionsMenuItem.IsEnabled = true;
             App.Instance.SystemTypeComboBox.IsEnabled = true;
             App.Instance.MediaTypeComboBox.IsEnabled = true;
-            App.Instance.OutputFilenameTextBox.IsEnabled = true;
-            App.Instance.OutputDirectoryTextBox.IsEnabled = true;
-            App.Instance.OutputDirectoryBrowseButton.IsEnabled = true;
+            App.Instance.OutputPathTextBox.IsEnabled = true;
+            App.Instance.OutputPathBrowseButton.IsEnabled = true;
             App.Instance.DriveLetterComboBox.IsEnabled = true;
             App.Instance.DriveSpeedComboBox.IsEnabled = true;
+            App.Instance.DumpingProgramComboBox.IsEnabled = true;
             App.Instance.EnableParametersCheckBox.IsEnabled = true;
             App.Instance.StartStopButton.Content = Interface.StartDumping;
             App.Instance.MediaScanButton.IsEnabled = true;
@@ -661,80 +725,12 @@ namespace MPF.UI.ViewModels
         }
 
         /// <summary>
-        /// Recolor all UI elements back to normal values
+        /// Recolor all UI elements for light mode
         /// </summary>
-        private void DisableDarkMode()
+        private void EnableLightMode()
         {
-            // Handle application-wide resources
-            Application.Current.Resources[SystemColors.ActiveBorderBrushKey] = null;
-            Application.Current.Resources[SystemColors.ControlBrushKey] = null;
-            Application.Current.Resources[SystemColors.ControlTextBrushKey] = null;
-            Application.Current.Resources[SystemColors.GrayTextBrushKey] = null;
-            Application.Current.Resources[SystemColors.WindowBrushKey] = null;
-            Application.Current.Resources[SystemColors.WindowTextBrushKey] = null;
-
-            // Handle Button-specific resources
-            Application.Current.Resources["Button.Disabled.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xF4, 0xF4, 0xF4));
-            Application.Current.Resources["Button.MouseOver.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xBE, 0xE6, 0xFD));
-            Application.Current.Resources["Button.Pressed.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xC4, 0xE5, 0xF6));
-            Application.Current.Resources["Button.Static.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xDD, 0xDD, 0xDD));
-
-            // Handle ComboBox-specific resources
-            Application.Current.Resources["ComboBox.Disabled.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0));
-            Application.Current.Resources["ComboBox.Disabled.Editable.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-            Application.Current.Resources["ComboBox.Disabled.Editable.Button.Background"] = Brushes.Transparent;
-            Application.Current.Resources["ComboBox.MouseOver.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xEC, 0xF4, 0xFC),
-                Color.FromArgb(0xFF, 0xDC, 0xEC, 0xFC),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["ComboBox.MouseOver.Editable.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-            Application.Current.Resources["ComboBox.MouseOver.Editable.Button.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xEB, 0xF4, 0xFC),
-                Color.FromArgb(0xFF, 0xDC, 0xEC, 0xFC),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["ComboBox.Pressed.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xDA, 0xEC, 0xFC),
-                Color.FromArgb(0xFF, 0xC4, 0xE0, 0xFC),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["ComboBox.Pressed.Editable.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-            Application.Current.Resources["ComboBox.Pressed.Editable.Button.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xDA, 0xEB, 0xFC),
-                Color.FromArgb(0xFF, 0xC4, 0xE0, 0xFC),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["ComboBox.Static.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0),
-                Color.FromArgb(0xFF, 0xE5, 0xE5, 0xE5),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["ComboBox.Static.Editable.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-            Application.Current.Resources["ComboBox.Static.Editable.Button.Background"] = Brushes.Transparent;
-            Application.Current.Resources["TextBox.Static.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-
-            // Handle CustomMessageBox-specific resources
-            Application.Current.Resources["CustomMessageBox.Static.Background"] = null;
-
-            // Handle MenuItem-specific resources
-            Application.Current.Resources["MenuItem.SubMenu.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0));
-            Application.Current.Resources["MenuItem.SubMenu.Border"] = Brushes.DarkGray;
-
-            // Handle ProgressBar-specific resources
-            Application.Current.Resources["ProgressBar.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xE6, 0xE6, 0xE6));
-
-            // Handle ScrollViewer-specific resources
-            Application.Current.Resources["ScrollViewer.ScrollBar.Background"] = Brushes.LightGray;
-
-            // Handle TabItem-specific resources
-            Application.Current.Resources["TabItem.Selected.Background"] = new SolidColorBrush(Color.FromArgb(0xFF, 0xFF, 0xFF, 0xFF));
-            Application.Current.Resources["TabItem.Static.Background"] = new LinearGradientBrush(
-                Color.FromArgb(0xFF, 0xF0, 0xF0, 0xF0),
-                Color.FromArgb(0xFF, 0xE5, 0xE5, 0xE5),
-                new Point(0, 0),
-                new Point(0, 1));
-            Application.Current.Resources["TabItem.Static.Border"] = Brushes.DarkGray;
+            var theme = new LightModeTheme();
+            theme.Apply();
         }
 
         /// <summary>
@@ -742,55 +738,8 @@ namespace MPF.UI.ViewModels
         /// </summary>
         private void EnableDarkMode()
         {
-            // Setup needed brushes
-            var darkModeBrush = new SolidColorBrush { Color = Color.FromArgb(0xff, 0x20, 0x20, 0x20) };
-
-            // Handle application-wide resources
-            Application.Current.Resources[SystemColors.ActiveBorderBrushKey] = Brushes.Black;
-            Application.Current.Resources[SystemColors.ControlBrushKey] = darkModeBrush;
-            Application.Current.Resources[SystemColors.ControlTextBrushKey] = Brushes.White;
-            Application.Current.Resources[SystemColors.GrayTextBrushKey] = Brushes.DarkGray;
-            Application.Current.Resources[SystemColors.WindowBrushKey] = darkModeBrush;
-            Application.Current.Resources[SystemColors.WindowTextBrushKey] = Brushes.White;
-
-            // Handle Button-specific resources
-            Application.Current.Resources["Button.Disabled.Background"] = darkModeBrush;
-            Application.Current.Resources["Button.MouseOver.Background"] = darkModeBrush;
-            Application.Current.Resources["Button.Pressed.Background"] = darkModeBrush;
-            Application.Current.Resources["Button.Static.Background"] = darkModeBrush;
-
-            // Handle ComboBox-specific resources
-            Application.Current.Resources["ComboBox.Disabled.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Disabled.Editable.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Disabled.Editable.Button.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.MouseOver.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.MouseOver.Editable.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.MouseOver.Editable.Button.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Pressed.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Pressed.Editable.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Pressed.Editable.Button.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Static.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Static.Editable.Background"] = darkModeBrush;
-            Application.Current.Resources["ComboBox.Static.Editable.Button.Background"] = darkModeBrush;
-            Application.Current.Resources["TextBox.Static.Background"] = darkModeBrush;
-
-            // Handle CustomMessageBox-specific resources
-            Application.Current.Resources["CustomMessageBox.Static.Background"] = darkModeBrush;
-
-            // Handle MenuItem-specific resources
-            Application.Current.Resources["MenuItem.SubMenu.Background"] = darkModeBrush;
-            Application.Current.Resources["MenuItem.SubMenu.Border"] = Brushes.DarkGray;
-
-            // Handle ProgressBar-specific resources
-            Application.Current.Resources["ProgressBar.Background"] = darkModeBrush;
-
-            // Handle ScrollViewer-specific resources
-            Application.Current.Resources["ScrollViewer.ScrollBar.Background"] = darkModeBrush;
-
-            // Handle TabItem-specific resources
-            Application.Current.Resources["TabItem.Selected.Background"] = darkModeBrush;
-            Application.Current.Resources["TabItem.Static.Background"] = darkModeBrush;
-            Application.Current.Resources["TabItem.Static.Border"] = Brushes.DarkGray;
+            var theme = new DarkModeTheme();
+            theme.Apply();
         }
 
         #endregion
@@ -798,24 +747,36 @@ namespace MPF.UI.ViewModels
         #region Helpers
 
         /// <summary>
-        /// Browse for an output folder
+        /// Browse for an output file path
         /// </summary>
-        private void BrowseFolder()
+        private void BrowseFile()
         {
-            string currentPath = App.Options.DefaultOutputPath;
-            if (string.IsNullOrWhiteSpace(currentPath) || !Directory.Exists(currentPath))
-                currentPath = System.AppDomain.CurrentDomain.BaseDirectory;
+            // Get the current path, if possible
+            string currentPath = App.Instance.OutputPathTextBox.Text;
+            if (string.IsNullOrWhiteSpace(currentPath))
+                currentPath = Path.Combine(App.Options.DefaultOutputPath, "track.bin");
+            if (string.IsNullOrWhiteSpace(currentPath))
+                currentPath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "track.bin");
 
-            WinForms.FolderBrowserDialog folderDialog = new WinForms.FolderBrowserDialog
+            // Get the full path
+            currentPath = Path.GetFullPath(currentPath);
+
+            // Get the directory
+            string directory = Path.GetDirectoryName(currentPath);
+
+            // Get the filename
+            string filename = Path.GetFileName(currentPath);
+
+            WinForms.FileDialog fileDialog = new WinForms.SaveFileDialog
             {
-                ShowNewFolderButton = false,
-                SelectedPath = currentPath,
+                FileName = filename,
+                InitialDirectory = directory,
             };
-            WinForms.DialogResult result = folderDialog.ShowDialog();
+            WinForms.DialogResult result = fileDialog.ShowDialog();
 
             if (result == WinForms.DialogResult.OK)
             {
-                App.Instance.OutputDirectoryTextBox.Text = folderDialog.SelectedPath;
+                App.Instance.OutputPathTextBox.Text = fileDialog.FileName;
             }
         }
 
@@ -844,7 +805,7 @@ namespace MPF.UI.ViewModels
             // If the drive is marked active, try to read from it
             else if (drive.MarkedActive)
             {
-                App.Logger.VerboseLog($"Trying to detect media type for drive {drive.Letter}.. ");
+                App.Logger.VerboseLog($"Trying to detect media type for drive {drive.Letter} [{drive.DriveFormat}].. ");
                 (MediaType? detectedMediaType, string errorMessage) = drive.GetMediaType();
 
                 // If we got an error message, post it to the log
@@ -881,47 +842,25 @@ namespace MPF.UI.ViewModels
         /// <returns>Filled DumpEnvironment instance</returns>
         private DumpEnvironment DetermineEnvironment()
         {
-            // Populate the new environment
-            var env = new DumpEnvironment(App.Options,
-                App.Instance.OutputDirectoryTextBox.Text,
-                App.Instance.OutputFilenameTextBox.Text,
+            return new DumpEnvironment(App.Options,
+                App.Instance.OutputPathTextBox.Text,
                 App.Instance.DriveLetterComboBox.SelectedItem as Drive,
                 App.Instance.SystemTypeComboBox.SelectedItem as RedumpSystemComboBoxItem,
                 App.Instance.MediaTypeComboBox.SelectedItem as Element<MediaType>,
+                App.Instance.DumpingProgramComboBox.SelectedItem as Element<InternalProgram>,
                 App.Instance.ParametersTextBox.Text);
-
-            // Disable automatic reprocessing of the textboxes until we're done
-            DisablePathEventHandlers();
-
-            // Save the current cursor positions
-            int outputDirectorySelectionStart = App.Instance.OutputDirectoryTextBox.SelectionStart;
-            int outputFilenameSelectionStart = App.Instance.OutputFilenameTextBox.SelectionStart;
-
-            // Set the new text
-            App.Instance.OutputDirectoryTextBox.Text = env.OutputDirectory;
-            App.Instance.OutputFilenameTextBox.Text = env.OutputFilename;
-
-            // Set the cursor position back to where it was
-            App.Instance.OutputDirectoryTextBox.SelectionStart = outputDirectorySelectionStart;
-            App.Instance.OutputDirectoryTextBox.SelectionLength = 0;
-            App.Instance.OutputFilenameTextBox.SelectionStart = outputFilenameSelectionStart;
-            App.Instance.OutputFilenameTextBox.SelectionLength = 0;
-
-            // Re-enable automatic reprocessing of textboxes
-            EnablePathEventHandlers();
-
-            // Ensure the UI gets updated
-            App.Instance.UpdateLayout();
-
-            return env;
         }
 
         /// <summary>
-        /// Determine and set the current system type, if Allowed
+        /// Determine and set the current system type, if allowed
         /// </summary>
         private void DetermineSystemType()
         {
-            if (!App.Options.SkipSystemDetection && App.Instance.DriveLetterComboBox.SelectedIndex > -1)
+            if (Drives == null || Drives.Count == 0 || App.Instance.DriveLetterComboBox.SelectedIndex == -1)
+            {
+                App.Logger.VerboseLog("Skipping system type detection because no valid drives found!");
+            }
+            else if (!App.Options.SkipSystemDetection)
             {
                 App.Logger.VerboseLog($"Trying to detect system for drive {Drives[App.Instance.DriveLetterComboBox.SelectedIndex].Letter}.. ");
                 var currentSystem = Drives[App.Instance.DriveLetterComboBox.SelectedIndex]?.GetRedumpSystem(App.Options.DefaultSystem) ?? App.Options.DefaultSystem;
@@ -984,6 +923,12 @@ namespace MPF.UI.ViewModels
         /// <param name="driveChanged">Force an updated name if the drive letter changes</param>
         public void GetOutputNames(bool driveChanged)
         {
+            if (Drives == null || Drives.Count == 0 || App.Instance.DriveLetterComboBox.SelectedIndex == -1)
+            {
+                App.Logger.VerboseLog("Skipping output name building because no valid drives found!");
+                return;
+            }
+
             Drive drive = App.Instance.DriveLetterComboBox.SelectedItem as Drive;
             RedumpSystem? systemType = App.Instance.SystemTypeComboBox.SelectedItem as RedumpSystemComboBoxItem;
             MediaType? mediaType = App.Instance.MediaTypeComboBox.SelectedItem as Element<MediaType>;
@@ -991,33 +936,38 @@ namespace MPF.UI.ViewModels
             // Get the extension for the file for the next two statements
             string extension = Env.Parameters?.GetDefaultExtension(mediaType);
 
-            // Disable automatic reprocessing of the textboxes until we're done
-            DisablePathEventHandlers();
+            // Set the output filename, if it's not already
+            if (string.IsNullOrEmpty(App.Instance.OutputPathTextBox.Text))
+            {
+                string label = drive?.FormattedVolumeLabel ?? systemType.LongName();
+                string directory = App.Options.DefaultOutputPath;
+                string filename = $"{label}{extension ?? ".bin"}";
 
-            // Save the current cursor positions
-            int outputDirectorySelectionStart = App.Instance.OutputDirectoryTextBox.SelectionStart;
-            int outputFilenameSelectionStart = App.Instance.OutputFilenameTextBox.SelectionStart;
+                // If the path ends with the label already
+                if (directory.EndsWith(label, StringComparison.OrdinalIgnoreCase))
+                    directory = Path.GetDirectoryName(directory);
 
-            // Set the output filename, if we changed drives or it's not already
-            if (driveChanged || string.IsNullOrEmpty(App.Instance.OutputFilenameTextBox.Text))
-                App.Instance.OutputFilenameTextBox.Text = (drive?.FormattedVolumeLabel ?? systemType.LongName()) + (extension ?? ".bin");
+                App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
+            }
 
-            // If the extension for the file changed, update that automatically
-            else if (Path.GetExtension(App.Instance.OutputFilenameTextBox.Text) != extension)
-                App.Instance.OutputFilenameTextBox.Text = Path.GetFileNameWithoutExtension(App.Instance.OutputFilenameTextBox.Text) + (extension ?? ".bin");
+            // Set the output filename, if we changed drives
+            else if (driveChanged)
+            {
+                string label = drive?.FormattedVolumeLabel ?? systemType.LongName();
+                string oldFilename = Path.GetFileNameWithoutExtension(App.Instance.OutputPathTextBox.Text);
+                string directory = Path.GetDirectoryName(App.Instance.OutputPathTextBox.Text);
+                string filename = $"{label}{extension ?? ".bin"}";
 
-            // Set the output directory, if we changed drives or it's not already
-            if (driveChanged || string.IsNullOrEmpty(App.Instance.OutputDirectoryTextBox.Text))
-                App.Instance.OutputDirectoryTextBox.Text = Path.Combine(App.Options.DefaultOutputPath, Path.GetFileNameWithoutExtension(App.Instance.OutputFilenameTextBox.Text) ?? string.Empty);
+                // If the previous path included the label
+                if (directory.EndsWith(oldFilename, StringComparison.OrdinalIgnoreCase))
+                    directory = Path.GetDirectoryName(directory);
 
-            // Set the cursor position back to where it was
-            App.Instance.OutputDirectoryTextBox.SelectionStart = outputDirectorySelectionStart;
-            App.Instance.OutputDirectoryTextBox.SelectionLength = 0;
-            App.Instance.OutputFilenameTextBox.SelectionStart = outputFilenameSelectionStart;
-            App.Instance.OutputFilenameTextBox.SelectionLength = 0;
+                // If the path ends with the label already
+                if (directory.EndsWith(label, StringComparison.OrdinalIgnoreCase))
+                    directory = Path.GetDirectoryName(directory);
 
-            // Re-enable automatic reprocessing of textboxes
-            EnablePathEventHandlers();
+                App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
+            }
 
             // Ensure the UI gets updated
             App.Instance.UpdateLayout();
@@ -1047,34 +997,9 @@ namespace MPF.UI.ViewModels
             else
                 Env.Parameters.Speed = App.Instance.DriveSpeedComboBox.SelectedValue as int?;
 
-            // Disable automatic reprocessing of the textboxes until we're done
-            DisablePathEventHandlers();
-
-            // Save the current cursor positions
-            int outputDirectorySelectionStart = App.Instance.OutputDirectoryTextBox.SelectionStart;
-            int outputFilenameSelectionStart = App.Instance.OutputFilenameTextBox.SelectionStart;
-
             string trimmedPath = Env.Parameters.OutputPath?.Trim('"') ?? string.Empty;
-            string outputDirectory = Path.GetDirectoryName(trimmedPath);
-            string outputFilename = Path.GetFileName(trimmedPath);
-            (outputDirectory, outputFilename) = InfoTool.NormalizeOutputPaths(outputDirectory, outputFilename);
-            if (!string.IsNullOrWhiteSpace(outputDirectory))
-                App.Instance.OutputDirectoryTextBox.Text = outputDirectory;
-            else
-                outputDirectory = App.Instance.OutputDirectoryTextBox.Text;
-            if (!string.IsNullOrWhiteSpace(outputFilename))
-                App.Instance.OutputFilenameTextBox.Text = outputFilename;
-            else
-                outputFilename = App.Instance.OutputFilenameTextBox.Text;
-
-            // Set the cursor position back to where it was
-            App.Instance.OutputDirectoryTextBox.SelectionStart = outputDirectorySelectionStart;
-            App.Instance.OutputDirectoryTextBox.SelectionLength = 0;
-            App.Instance.OutputFilenameTextBox.SelectionStart = outputFilenameSelectionStart;
-            App.Instance.OutputFilenameTextBox.SelectionLength = 0;
-
-            // Re-enable automatic reprocessing of textboxes
-            EnablePathEventHandlers();
+            trimmedPath = InfoTool.NormalizeOutputPaths(trimmedPath);
+            App.Instance.OutputPathTextBox.Text = trimmedPath;
 
             MediaType? mediaType = Env.Parameters.GetMediaType();
             int mediaTypeIndex = MediaTypes.FindIndex(m => m == mediaType);
@@ -1109,12 +1034,12 @@ namespace MPF.UI.ViewModels
                 (var protections, string error) = await Protection.RunProtectionScanOnPath(drive.Letter + ":\\", App.Options, progress);
                 string output = Protection.FormatProtections(protections);
 
-                // If SmartE is detected on the current disc, remove `/sf` from the flags for DIC only
-                if (Env.Options.InternalProgram == InternalProgram.DiscImageCreator && output.Contains("SmartE"))
-                {
-                    ((Modules.DiscImageCreator.Parameters)Env.Parameters)[Modules.DiscImageCreator.FlagStrings.ScanFileProtect] = false;
-                    App.Logger.VerboseLogLn($"SmartE detected, removing {Modules.DiscImageCreator.FlagStrings.ScanFileProtect} from parameters");
-                }
+                // If SmartE is detected on the current disc, remove `/sf` from the flags for DIC only -- Disabled until further notice
+                //if (Env.InternalProgram == InternalProgram.DiscImageCreator && output.Contains("SmartE"))
+                //{
+                //    ((Modules.DiscImageCreator.Parameters)Env.Parameters)[Modules.DiscImageCreator.FlagStrings.ScanFileProtect] = false;
+                //    App.Logger.VerboseLogLn($"SmartE detected, removing {Modules.DiscImageCreator.FlagStrings.ScanFileProtect} from parameters");
+                //}
 
                 if (!App.Instance.LogPanel.IsExpanded)
                 {
@@ -1176,11 +1101,13 @@ namespace MPF.UI.ViewModels
                     speed = App.Options.PreferredDumpSpeedCD;
                     break;
                 case MediaType.DVD:
-                case MediaType.HDDVD:
                 case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     speed = App.Options.PreferredDumpSpeedDVD;
                     break;
+                case MediaType.HDDVD:
+                    speed = App.Options.PreferredDumpSpeedHDDVD;
+                    break;
                 case MediaType.BluRay:
                     speed = App.Options.PreferredDumpSpeedBD;
                     break;
@@ -1201,9 +1128,10 @@ namespace MPF.UI.ViewModels
         /// </summary>
         private bool ShouldEnableDumpingButton()
         {
-            return App.Instance.SystemTypeComboBox.SelectedItem as RedumpSystemComboBoxItem != null
-                && Drives != null
+            return Drives != null
                 && Drives.Count > 0
+                && App.Instance.SystemTypeComboBox.SelectedIndex > -1
+                && App.Instance.SystemTypeComboBox.SelectedItem as RedumpSystemComboBoxItem != null
                 && !string.IsNullOrEmpty(App.Instance.ParametersTextBox.Text);
         }
 
@@ -1257,8 +1185,8 @@ namespace MPF.UI.ViewModels
                 // If "No", then we continue with the current known environment
             }
 
-            // Run path adjustments for DiscImageCreator
-            Env.AdjustPathsForDiscImageCreator();
+            // Run path adjustments for DiscImageCreator -- Disabled until further notice
+            //Env.AdjustPathsForDiscImageCreator();
 
             try
             {
@@ -1269,6 +1197,10 @@ namespace MPF.UI.ViewModels
                 // Disable all UI elements apart from dumping button
                 DisableAllUIElements();
 
+                // Refresh the drive, if it wasn't null
+                if (Env.Drive != null)
+                    Env.Drive.RefreshDrive();
+
                 // Output to the label and log
                 App.Instance.StatusLabel.Text = "Starting dumping process... Please wait!";
                 App.Logger.LogLn("Starting dumping process... Please wait!");
@@ -1328,6 +1260,14 @@ namespace MPF.UI.ViewModels
         /// <returns>True if dumping should start, false otherwise</returns>
         private bool ValidateBeforeDumping()
         {
+            // Validate that we have an output path of any sort
+            if (string.IsNullOrWhiteSpace(Env.OutputPath))
+            {
+                MessageBoxResult mbresult = CustomMessageBox.Show("No output path was provided so dumping cannot continue.", "Missing Path", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                App.Logger.LogLn("Dumping aborted!");
+                return false;
+            }
+
             // Validate that the user explicitly wants an inactive drive to be considered for dumping
             if (!Env.Drive.MarkedActive)
             {
@@ -1343,8 +1283,12 @@ namespace MPF.UI.ViewModels
                 }
             }
 
+            // Pre-split the output path
+            string outputDirectory = Path.GetDirectoryName(Env.OutputPath);
+            string outputFilename = Path.GetFileName(Env.OutputPath);
+
             // If a complete dump already exists
-            (bool foundFiles, List<string> _) = InfoTool.FoundAllFiles(Env.OutputDirectory, Env.OutputFilename, Env.Parameters, true);
+            (bool foundFiles, List<string> _) = InfoTool.FoundAllFiles(outputDirectory, outputFilename, Env.Parameters, true);
             if (foundFiles)
             {
                 MessageBoxResult mbresult = CustomMessageBox.Show("A complete dump already exists! Are you sure you want to overwrite?", "Overwrite?", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
@@ -1357,7 +1301,7 @@ namespace MPF.UI.ViewModels
 
             // Validate that at least some space exists
             // TODO: Tie this to the size of the disc, type of disc, etc.
-            string fullPath = Path.GetFullPath(Env.OutputDirectory);
+            string fullPath = Path.GetFullPath(outputDirectory);
             var driveInfo = new DriveInfo(Path.GetPathRoot(fullPath));
             if (driveInfo.AvailableFreeSpace < Math.Pow(2, 30))
             {
@@ -1490,6 +1434,15 @@ namespace MPF.UI.ViewModels
                 EnsureDiscInformation();
         }
 
+        /// <summary>
+        /// Handler for DumpingProgramComboBox SelectionChanged event
+        /// </summary>
+        private void DumpingProgramComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_canExecuteSelectionChanged)
+                EnsureDiscInformation();
+        }
+
         /// <summary>
         /// Handler for EnableParametersCheckBox Click event
         /// </summary>
@@ -1512,28 +1465,16 @@ namespace MPF.UI.ViewModels
         }
 
         /// <summary>
-        /// Handler for OutputDirectoryBrowseButton Click event
+        /// Handler for OutputPathBrowseButton Click event
         /// </summary>
-        private void OutputDirectoryBrowseButtonClick(object sender, RoutedEventArgs e) =>
-            SetOutputDirectory();
+        private void OutputPathBrowseButtonClick(object sender, RoutedEventArgs e) =>
+            SetOutputPath();
 
         /// <summary>
-        /// Handler for OutputFilenameTextBox TextInput event
+        /// Handler for OutputPathTextBox TextChanged event
         /// </summary>
-        private void OutputDirectoryTextBoxTextChanged(object sender, TextChangedEventArgs e)
-        {
-            if (_canExecuteTextChanged)
-                EnsureDiscInformation();
-        }
-
-        /// <summary>
-        /// Handler for OutputFilenameTextBox TextInput event
-        /// </summary>
-        private void OutputFilenameTextBoxTextChanged(object sender, TextChangedEventArgs e)
-        {
-            if (_canExecuteTextChanged)
-                EnsureDiscInformation();
-        }
+        private void OutputPathTextBoxTextChanged(object sender, TextChangedEventArgs e)
+            => EnsureDiscInformation();
 
         /// <summary>
         /// Handler for StartStopButton Click event
@@ -1556,7 +1497,12 @@ namespace MPF.UI.ViewModels
         private void UpdateVolumeLabelClick(object sender, RoutedEventArgs e)
         {
             if (_canExecuteSelectionChanged)
-                InitializeUIValues(removeEventHandlers: true, rescanDrives: false);
+            {
+                if (App.Options.FastUpdateLabel)
+                    FastUpdateLabel(removeEventHandlers: true);
+                else
+                    InitializeUIValues(removeEventHandlers: true, rescanDrives: false);
+            }
         }
 
         #endregion

MPF/ViewModels/OptionsViewModel.cs

@@ -105,7 +105,7 @@ namespace MPF.UI.ViewModels
         /// </summary>
         private static List<Element<InternalProgram>> PopulateInternalPrograms()
         {
-            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, /*InternalProgram.Redumper,*/ InternalProgram.DD };
+            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, InternalProgram.Redumper, InternalProgram.DD };
             return internalPrograms.Select(ip => new Element<InternalProgram>(ip)).ToList();
         }
 
@@ -209,9 +209,9 @@ namespace MPF.UI.ViewModels
             return success;
         }
 
-#endregion
+        #endregion
 
-#region UI Functionality
+        #region UI Functionality
 
         /// <summary>
         /// Create an open folder dialog box
@@ -240,9 +240,9 @@ namespace MPF.UI.ViewModels
         private System.Windows.Controls.TextBox TextBoxForPathSetting(string name) =>
             Parent.FindName(name + "TextBox") as System.Windows.Controls.TextBox;
 
-#endregion
+        #endregion
 
-#region Event Handlers
+        #region Event Handlers
 
         /// <summary>
         /// Handler for generic Click event
@@ -273,6 +273,6 @@ namespace MPF.UI.ViewModels
             _ = await TestRedumpLogin();
 #endif
 
-#endregion
+        #endregion
     }
 }

MPF/Windows/MainWindow.xaml

@@ -136,16 +136,13 @@
                     </ComboBox>
                     <ComboBox x:Name="MediaTypeComboBox" Grid.Row="0" Grid.Column="1" Height="22" Width="140" HorizontalAlignment="Right" Style="{DynamicResource CustomComboBoxStyle}" />
 
-                    <Label x:Name="OutputFilenameLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="Output Filename"/>
-                    <TextBox x:Name="OutputFilenameTextBox" Grid.Row="1" Grid.Column="1" Height="22" VerticalContentAlignment="Center" />
-
-                    <Label x:Name="OutputDirectoryLabel" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Output Directory"/>
-                    <TextBox x:Name="OutputDirectoryTextBox" Grid.Row="2" Grid.Column="1" Height="22" Width="345" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
-                    <Button x:Name="OutputDirectoryBrowseButton" Grid.Row="2" Grid.Column="1" Height="22" Width="50" HorizontalAlignment="Right" Content="Browse"
+                    <Label x:Name="OutputPathLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="Output Path"/>
+                    <TextBox x:Name="OutputPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" Width="345" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
+                    <Button x:Name="OutputPathBrowseButton" Grid.Row="1" Grid.Column="1" Height="22" Width="50" HorizontalAlignment="Right" Content="Browse"
                             Style="{DynamicResource CustomButtonStyle}"/>
 
-                    <Label x:Name="DriveLetterLabel" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="Drive Letter"/>
-                    <ComboBox x:Name="DriveLetterComboBox" Grid.Row="3" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}">
+                    <Label x:Name="DriveLetterLabel" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Drive Letter"/>
+                    <ComboBox x:Name="DriveLetterComboBox" Grid.Row="2" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Letter}" />
@@ -153,9 +150,12 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <Label x:Name="DriveSpeedLabel" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Content="Drive Speed"/>
-                    <ComboBox x:Name="DriveSpeedComboBox" Grid.Row="4" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}" />
+                    <Label x:Name="DriveSpeedLabel" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="Drive Speed"/>
+                    <ComboBox x:Name="DriveSpeedComboBox" Grid.Row="3" Grid.Column="1" Height="22" Width="60" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}" />
 
+                    <Label x:Name="DumpingProgramLabel" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Content="Dumping Program"/>
+                    <ComboBox x:Name="DumpingProgramComboBox" Grid.Row="4" Grid.Column="1" Height="22" Width="250" HorizontalAlignment="Left" Style="{DynamicResource CustomComboBoxStyle}" />
+                    
                     <Label x:Name="ParametersLabel" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="Parameters"/>
                     <TextBox x:Name="ParametersTextBox" Grid.Row="5" Grid.Column="1" Height="22" Width="370" HorizontalAlignment="Left" IsEnabled="False" VerticalContentAlignment="Center" />
                     <CheckBox x:Name="EnableParametersCheckBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Right" IsChecked="False" />

MPF/Windows/OptionsWindow.xaml

@@ -70,12 +70,15 @@
                         <CheckBox VerticalAlignment="Center" Content="Enable Dark Mode"
                             IsChecked="{Binding Options.EnableDarkMode}"
                             ToolTip="(Experimental) Enable dark mode across the entire application" Margin="0,4"
-                            />
-
+                        />
                         <CheckBox VerticalAlignment="Center" Content="Check for Updates on Startup"
                                   IsChecked="{Binding Options.CheckForUpdatesOnStartup}"
                                   ToolTip="Check for updates when the application starts" Margin="0,4"
                         />
+                        <CheckBox VerticalAlignment="Center" Content="Fast Update Label"
+                                  IsChecked="{Binding Options.FastUpdateLabel}"
+                                  ToolTip="Bypasses disc checks to quickly update the output path. Use with caution!" Margin="0,4"
+                        />
                     </UniformGrid>
                 </TabItem>
                 
@@ -92,6 +95,7 @@
                             <RowDefinition/>
                             <RowDefinition/>
                             <RowDefinition/>
+                            <RowDefinition/>
                         </Grid.RowDefinitions>
 
                         <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Aaru Path" />
@@ -109,13 +113,18 @@
                         <Button x:Name="DDPathButton" Grid.Row="2" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
 
-                        <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Dumping Program" />
-                        <ComboBox x:Name="InternalProgramComboBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                        <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Redumper Path" />
+                        <TextBox x:Name="RedumperPathTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.RedumperPath}" VerticalContentAlignment="Center" />
+                        <Button x:Name="RedumperPathButton" Grid.Row="3" Grid.Column="2" Height="22" Width="22" Content="..."
+                                Style="{DynamicResource CustomButtonStyle}" />
+
+                        <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Dumping Program" />
+                        <ComboBox x:Name="InternalProgramComboBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
                                   ItemsSource="{Binding InternalPrograms}" Style="{DynamicResource CustomComboBoxStyle}" />
 
-                        <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path" />
-                        <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.DefaultOutputPath}" VerticalContentAlignment="Center" />
-                        <Button x:Name="DefaultOutputPathButton" Grid.Row="4" Grid.Column="2" Height="22" Width="22" Content="..."
+                        <Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path" />
+                        <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Options.DefaultOutputPath}" VerticalContentAlignment="Center" />
+                        <Button x:Name="DefaultOutputPathButton" Grid.Row="5" Grid.Column="2" Height="22" Width="22" Content="..."
                                 Style="{DynamicResource CustomButtonStyle}" />
                     </Grid>
                 </TabItem>
@@ -162,7 +171,7 @@
                                     ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0"
                                     />
 
-                                <CheckBox VerticalAlignment="Center" Content="Protection File"
+                                <CheckBox VerticalAlignment="Center" Content="Output Protection File"
                                     IsChecked="{Binding Options.OutputSeparateProtectionFile}" IsEnabled="{Binding Options.ScanForProtection}"
                                     ToolTip="Output protection information to a separate file" Margin="0,4,0,0"
                                     />
@@ -226,27 +235,35 @@
                                     <RowDefinition />
                                     <RowDefinition />
                                     <RowDefinition />
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
                                 
-                                <Label Grid.Row="0" Grid.Column="0" Content="CD-ROM" />
+                                <Label Grid.Row="0" Grid.Column="0" Content="CD" />
                                 <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static local:Constants.SpeedsForCDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedCD}" />
                                 <TextBox x:Name="DumpSpeedCDTextBox" Grid.Row="0" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
                                     Text="{Binding ElementName=DumpSpeedCDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
-                                <Label Grid.Row="1" Grid.Column="0" Content="DVD-ROM" />
+                                <Label Grid.Row="1" Grid.Column="0" Content="DVD" />
                                 <Slider x:Name="DumpSpeedDVDSlider" Grid.Row="1" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static local:Constants.SpeedsForDVDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedDVD}"  />
                                 <TextBox x:Name="DumpSpeedDVDTextBox" Grid.Row="1" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
                                    Text="{Binding ElementName=DumpSpeedDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
-                                <Label Grid.Row="2" Grid.Column="0" Content="BD-ROM" />
-                                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="2" Grid.Column="1" Minimum="1" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                <Label Grid.Row="2" Grid.Column="0" Content="HD-DVD" />
+                                <Slider x:Name="DumpSpeedHDDVDSlider" Grid.Row="2" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                                    Ticks="{Binding Source={x:Static local:Constants.SpeedsForHDDVDAsCollection}}"
+                                    Value="{Binding Options.PreferredDumpSpeedHDDVD}"  />
+                                <TextBox x:Name="DumpSpeedHDDVDTextBox" Grid.Row="2" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
+                                   Text="{Binding ElementName=DumpSpeedHDDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
+
+                                <Label Grid.Row="3" Grid.Column="0" Content="BD" />
+                                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="3" Grid.Column="1" Minimum="1" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static local:Constants.SpeedsForBDAsCollection}}"
                                     Value="{Binding Options.PreferredDumpSpeedBD}"  />
-                                <TextBox x:Name="DumpSpeedBDTextBox" Grid.Row="2" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
+                                <TextBox x:Name="DumpSpeedBDTextBox" Grid.Row="3" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
                                    Text="{Binding ElementName=DumpSpeedBDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
                             </Grid>
                         </GroupBox>
@@ -352,6 +369,26 @@
                     </UniformGrid>
                 </TabItem>
 
+                <TabItem Header="Redumper" Style="{DynamicResource CustomTabItemStyle}">
+                    <UniformGrid Columns="2" Rows="2">
+                        <CheckBox VerticalAlignment="Center" Content="Enable Debug Output"
+                            IsChecked="{Binding Options.RedumperEnableDebug}"
+                            ToolTip="Enable debug output in logs" Margin="0,4"
+                            />
+
+                        <CheckBox VerticalAlignment="Center" Content="Enable Verbose Output"
+                            IsChecked="{Binding Options.RedumperEnableVerbose}"
+                            ToolTip="Enable verbose output in logs" Margin="0,4"
+                            />
+                        
+                        <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                        <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
+                            Text="{Binding Options.RedumperRereadCount}"
+                            ToolTip="Specifies how many rereads are attempted on read error"
+                            />
+                    </UniformGrid>
+                </TabItem>
+
                 <TabItem Header="Logging" Style="{DynamicResource CustomTabItemStyle}">
                     <UniformGrid Columns="2">
                         <CheckBox VerticalAlignment="Center" Content="Verbose Logging"
@@ -379,7 +416,7 @@
                 <TabItem Header="Login Info" Style="{DynamicResource CustomTabItemStyle}">
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump Credentials">
-                            <UniformGrid Columns="5" Rows="1">
+                            <UniformGrid Columns="5">
                                 <Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
                                 <TextBox x:Name="RedumpUsernameTextBox" Height="22" HorizontalAlignment="Stretch"
                                     Text="{Binding Options.RedumpUsername}" />
@@ -391,6 +428,12 @@
                                         Style="{DynamicResource CustomButtonStyle}" />
                             </UniformGrid>
                         </GroupBox>
+
+                        <Label>
+                            <Label.Content>
+                                <TextBlock TextWrapping="Wrap"><Bold Foreground="Red">WARNING:</Bold> If you choose to enable validation and information retrieval, you are responsible for ensuring that all data populated matches your actual media. Some information may be marked to check for validity as a reminder, but all information should be subject to the same scrutiny.</TextBlock>
+                            </Label.Content>
+                        </Label>
                     </StackPanel>
                 </TabItem>
             </TabControl>

README.md

@@ -13,17 +13,34 @@ For those who would rather use the most recent stable build, download the latest
 
 For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/MPF/build/artifacts)
 
-## System Requirements
+## Media Preservation Frontend (MPF)
 
-Even though this is written in C#, this program can only be used on Windows systems due to one of the base programs, DiscImageCreator, being Windows-only. There is some preliminary support for Linux underway, and we will try to integrate with that when the time comes.
+MPF is the main, UI-centric application of the MPF suite. This program allows users to use DiscImageCreator, Aaru, Redumper, or dd for Windows in a more user-friendly way. Each backend dumping program is supported as fully as possible to ensure that all information is captured on output. There are many customization options and quality of life settings that can be access through the Options menu.
 
-- Windows 7 (newest version of Windows recommended) or Mono-compatible Linux environment (MPF.Check only)
-- .NET Framework 4.8 or .NET Core 3.1 Runtimes (.NET Core 3.1 is mostly functional due to a dependency issues but may be unstable in some situations)
-- 1 GB of free RAM
+### System Requirements
+
+- Windows 8.1 (x86 or x64) or newer
+    - Users who wish to use MPF on Windows 7 need to disable strong name validation due to `Microsoft.Management.Infrastructure` being unsigned. Add the following registry keys (accurate at time of writing):
+    ```
+        [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\*,31bf3856ad364e35]
+        [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\*,31bf3856ad364e35]
+    ```
+    - Alternatively, look at this [StackOverflow question](https://stackoverflow.com/questions/403731/strong-name-validation-failed) for more information.
+
+- .NET Framework 4.8 or .NET 6.0 Runtimes (.NET 6.0 is mostly functional due to a dependency issues but may be unstable in some situations)
 - As much hard drive space as the amount of discs you will be dumping (20+ GB recommended)
 
 Ensure that your operating system is as up-to-date as possible, since some features may rely on those updates.
 
+## Media Preservation Frontend Checker (MPF.Check)
+
+MPF.Check is a commandline-only program that allows users to generate submission information from their personal rips. This program supports the outputs from DiscImageCreator, Aaru, Redumper, dd for Windows, Cleanrip, and UmdImageCreator. Running this program without any parameters will display the help text, including all supported parameters.
+
+### System Requirements
+
+- Windows 8.1 (x86 or x64) or newer, GNU/Linux x64, or OSX x64
+- .NET Framework 4.8 (Windows or `mono` only) or .NET 6.0 Runtimes
+
 ## Information
 
 For all additional information, including information about the individual components included in the project and what dumping programs are supported, please see [the wiki](https://github.com/SabreTools/MPF/wiki) for more details.
@@ -36,7 +53,6 @@ A list of all changes in each stable release and current WIP builds can now be f
 
 MPF uses some external libraries to assist with additional information gathering after the dumping process.
 
-- **Aaru** - Device and media type retrieval - [GitHub](https://github.com/aaru-dps/Aaru)
 - **BurnOutSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/BurnOutSharp)
 - **UnshieldSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/UnshieldSharp)
 - **WPFCustomMessageBox.thabse** - Custom message boxes in UI - [GitHub](https://github.com/thabse/WPFCustomMessageBox)

RedumpLib/Data/Enumerations.cs

@@ -56,14 +56,14 @@ namespace RedumpLib.Data
         [HumanReadable(LongName = "BD-25")]
         BD25,
 
-        //[HumanReadable(LongName = "BD-33")]
-        //BD33,
+        [HumanReadable(LongName = "BD-33")]
+        BD33,
 
         [HumanReadable(LongName = "BD-50")]
         BD50,
 
-        //[HumanReadable(LongName = "BD-66")]
-        //BD66,
+        [HumanReadable(LongName = "BD-66")]
+        BD66,
 
         [HumanReadable(LongName = "BD-100")]
         BD100,
@@ -1948,6 +1948,9 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Fujitsu FM Towns Marty")]
         FujitsuFMTownsMarty,
 
+        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Hasbro iON Educational Gaming System")]
+        HasbroiONEducationalGamingSystem,
+
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Hasbro VideoNow", ShortName = "hvn", IsBanned = true, HasCues = true, HasDat = true)]
         HasbroVideoNow,
 
@@ -1966,6 +1969,9 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Mattel HyperScan", ShortName = "hs", HasCues = true, HasDat = true)]
         MattelHyperScan,
 
+        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Memorex Visual Information System", ShortName = "vis", HasCues = true, HasDat = true)]
+        MemorexVisualInformationSystem,
+
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Microsoft Xbox", ShortName = "xbox", HasCues = true, HasDat = true)]
         MicrosoftXbox,
 
@@ -1975,12 +1981,9 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Microsoft Xbox One", ShortName = "xboxone", IsBanned = true, HasDat = true)]
         MicrosoftXboxOne,
 
-        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Microsoft Xbox Series X/S")]
+        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Microsoft Xbox Series X", ShortName = "xboxsx", IsBanned = true, HasDat = true)]
         MicrosoftXboxSeriesXS,
 
-        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Memorex Visual Information System", ShortName = "vis", HasCues = true, HasDat = true)]
-        MemorexVisualInformationSystem,
-
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "NEC PC Engine CD & TurboGrafx CD", ShortName = "pce", HasCues = true, HasDat = true)]
         NECPCEngineCDTurboGrafxCD,
 
@@ -2035,7 +2038,7 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Sony PlayStation 4", ShortName = "ps4", IsBanned = true, HasDat = true)]
         SonyPlayStation4,
 
-        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Sony PlayStation 5")]
+        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Sony PlayStation 5", ShortName = "ps5", IsBanned = true, HasDat = true)]
         SonyPlayStation5,
 
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Sony PlayStation Portable", ShortName = "psp", HasDat = true)]
@@ -2210,10 +2213,10 @@ namespace RedumpLib.Data
 
         #region Computers
 
-        [System(Category = SystemCategory.Computer, LongName = "Acorn Archimedes", ShortName = "archcd", HasCues = true, HasDat = true)]
+        [System(Category = SystemCategory.Computer, LongName = "Acorn Archimedes", ShortName = "arch", HasCues = true, HasDat = true)]
         AcornArchimedes,
 
-        [System(Category = SystemCategory.Computer, LongName = "Apple Macintosh", ShortName = "mac", HasCues = true, HasDat = true)]
+        [System(Category = SystemCategory.Computer, LongName = "Apple Macintosh", ShortName = "mac", HasCues = true, HasDat = true, HasLsd = true, HasSbi = true)]
         AppleMacintosh,
 
         [System(Category = SystemCategory.Computer, LongName = "Commodore Amiga CD", ShortName = "acd", HasCues = true, HasDat = true)]
@@ -2283,6 +2286,9 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.Arcade, Available = false, LongName = "Incredible Technologies PC-based Systems")]
         IncredibleTechnologiesVarious,
 
+        [System(Category = SystemCategory.Arcade, Available = false, LongName = "JVL iTouch")]
+        JVLiTouch,
+
         [System(Category = SystemCategory.Arcade, LongName = "Konami e-Amusement", ShortName = "kea", HasCues = true, HasDat = true)]
         KonamieAmusement,
 
@@ -2298,7 +2304,7 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.Arcade, Available = false, LongName = "Konami Python 2")]
         KonamiPython2,
 
-        [System(Category = SystemCategory.Arcade, LongName = "Konami System 573", ShortName = "ks573")]
+        [System(Category = SystemCategory.Arcade, LongName = "Konami System 573", ShortName = "ks573", HasCues = true, HasDat = true)]
         KonamiSystem573,
 
         [System(Category = SystemCategory.Arcade, LongName = "Konami System GV", ShortName = "ksgv", HasCues = true, HasDat = true)]
@@ -2400,6 +2406,9 @@ namespace RedumpLib.Data
         [System(Category = SystemCategory.Arcade, Available = false, LongName = "Tsunami TsuMo Multi-Game Motion System")]
         TsunamiTsuMoMultiGameMotionSystem,
 
+        [System(Category = SystemCategory.Arcade, Available = false, LongName = "UltraCade PC-based Systems")]
+        UltraCade,
+
         // End of arcade section delimiter
         MarkerArcadeEnd,
 
@@ -3630,6 +3639,10 @@ namespace RedumpLib.Data
         [HumanReadable(ShortName = "[T:PPN]", LongName = "<b>PPN</b>:")]
         PPN,
 
+        // TODO: This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Ring non-zero data start</b>:", LongName = "<b>Ring non-zero data start</b>:")]
+        RingNonZeroDataStart,
+
         [HumanReadable(ShortName = "[T:RD]", LongName = "<b>Rolling Demos</b>:")]
         RollingDemos,
 
@@ -3666,6 +3679,10 @@ namespace RedumpLib.Data
         [HumanReadable(ShortName = "[T:UID]", LongName = "<b>Ubisoft ID</b>:")]
         UbisoftID,
 
+        // TODO: This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Universal Hash (SHA-1)</b>:", LongName = "<b>Universal Hash (SHA-1)</b>:")]
+        UniversalHash,
+
         [HumanReadable(ShortName = "[T:VID]", LongName = "<b>Valve ID</b>:")]
         ValveID,
 

RedumpLib/Data/Extensions.cs

@@ -62,6 +62,11 @@ namespace RedumpLib.Data
                     types.Add(MediaType.FloppyDisk);
                     break;
 
+                // http://videogamekraken.com/ion-educational-gaming-system-by-hasbro
+                case RedumpSystem.HasbroiONEducationalGamingSystem:
+                    types.Add(MediaType.CDROM);
+                    break;
+
                 // https://en.wikipedia.org/wiki/VideoNow
                 case RedumpSystem.HasbroVideoNow:
                     types.Add(MediaType.CDROM);
@@ -372,6 +377,12 @@ namespace RedumpLib.Data
                     types.Add(MediaType.DVD);
                     break;
 
+                // UNKNOWN
+                case RedumpSystem.JVLiTouch:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
+
                 // https://en.wikipedia.org/wiki/E-Amusement
                 case RedumpSystem.KonamieAmusement:
                     types.Add(MediaType.CDROM);
@@ -514,6 +525,7 @@ namespace RedumpLib.Data
                     types.Add(MediaType.DVD);
                     break;
 
+                // UNKNOWN
                 case RedumpSystem.SegaALLS:
                     types.Add(MediaType.DVD);
                     break;
@@ -604,6 +616,12 @@ namespace RedumpLib.Data
                     types.Add(MediaType.CDROM);
                     break;
 
+                // https://en.wikipedia.org/wiki/UltraCade_Technologies
+                case RedumpSystem.UltraCade:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
+
                 #endregion
 
                 #region Others
@@ -752,9 +770,9 @@ namespace RedumpLib.Data
             switch (discType)
             {
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     return MediaType.BluRay;
@@ -857,15 +875,15 @@ namespace RedumpLib.Data
                 case "bd25":
                 case "bd-25":
                     return DiscType.BD25;
-                //case "bd33":
-                //case "bd-33":
-                //    return DiscType.BD33;
+                case "bd33":
+                case "bd-33":
+                    return DiscType.BD33;
                 case "bd50":
                 case "bd-50":
                     return DiscType.BD50;
-                //case "bd66":
-                //case "bd-66":
-                //    return DiscType.BD66;
+                case "bd66":
+                case "bd-66":
+                    return DiscType.BD66;
                 case "bd100":
                 case "bd-100":
                     return DiscType.BD100;
@@ -1339,6 +1357,12 @@ namespace RedumpLib.Data
                 case "fujitsufmtownsmarty":
                 case "fujitsu fm towns marty":
                     return RedumpSystem.FujitsuFMTownsMarty;
+                case "ion":
+                case "ionegs":
+                case "hasbroion":
+                case "hasbroioneducationalgamingsystem":
+                case "hasbro ion educational gaming system":
+                    return RedumpSystem.HasbroiONEducationalGamingSystem;
                 case "hvn":
                 case "videonow":
                 case "hasbrovideonow":
@@ -1400,6 +1424,7 @@ namespace RedumpLib.Data
                 case "microsoft xbox one":
                     return RedumpSystem.MicrosoftXboxOne;
                 case "xbs":
+                case "xboxsx":
                 case "xbseries":
                 case "xbseriess":
                 case "xbseriesx":
@@ -1747,6 +1772,9 @@ namespace RedumpLib.Data
                 case "itpc":
                 case "incredible technologies pc-based systems":
                     return RedumpSystem.IncredibleTechnologiesVarious;
+                case "jvlitouch":
+                case "jvl itouch":
+                    return RedumpSystem.JVLiTouch;
                 case "kea":
                 case "eamusement":
                 case "e-amusement":
@@ -1971,6 +1999,11 @@ namespace RedumpLib.Data
                 case "tsunami tsumo":
                 case "tsunami tsumo multi-game motion system":
                     return RedumpSystem.TsunamiTsuMoMultiGameMotionSystem;
+                case "ultracade":
+                case "ultracadepc":
+                case "ultracade pc":
+                case "ultracade pc-based systems":
+                    return RedumpSystem.UltraCade;
 
                 #endregion
 
@@ -2102,6 +2135,24 @@ namespace RedumpLib.Data
         /// <returns></returns>
         public static string LongName(this YesNo? yesno) => AttributeHelper<YesNo?>.GetAttribute(yesno)?.LongName ?? "Yes/No";
 
+        /// <summary>
+        /// Get the YesNo enum value for a given nullable boolean
+        /// </summary>
+        /// <param name="yesno">Nullable boolean value to convert</param>
+        /// <returns>YesNo represented by the nullable boolean, if possible</returns>
+        public static YesNo? ToYesNo(this bool? yesno)
+        {
+            switch (yesno)
+            {
+                case false:
+                    return YesNo.No;
+                case true:
+                    return YesNo.Yes;
+                default:
+                    return YesNo.NULL;
+            }
+        }
+
         /// <summary>
         /// Get the YesNo enum value for a given string
         /// </summary>

RedumpLib/Data/SubmissionInfo.cs

@@ -12,7 +12,7 @@ namespace RedumpLib.Data
         /// Version of the current schema
         /// </summary>
         [JsonProperty(PropertyName = "schema_version", DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public int SchemaVersion { get; set; } = 2;
+        public int SchemaVersion { get; set; } = 3;
 
         /// <summary>
         /// Fully matched Redump ID
@@ -494,6 +494,9 @@ namespace RedumpLib.Data
         [JsonProperty(PropertyName = "d_layerbreak_3", NullValueHandling = NullValueHandling.Ignore)]
         public long Layerbreak3 { get; set; }
 
+        [JsonProperty(PropertyName = "d_pic_identifier", NullValueHandling = NullValueHandling.Ignore)]
+        public string PICIdentifier { get; set; }
+
         [JsonProperty(PropertyName = "d_size", NullValueHandling = NullValueHandling.Ignore)]
         public long Size { get; set; }
 
@@ -513,6 +516,7 @@ namespace RedumpLib.Data
                 Layerbreak = this.Layerbreak,
                 Layerbreak2 = this.Layerbreak2,
                 Layerbreak3 = this.Layerbreak3,
+                PICIdentifier = this.PICIdentifier,
                 Size = this.Size,
                 CRC32 = this.CRC32,
                 MD5 = this.MD5,

RedumpLib/RedumpLib.csproj

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <RuntimeIdentifiers>win7-x64;win8-x64;win81-x64;win10-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 2.3-{build}
+version: 2.6-{build}
 
 # pull request template
 pull_requests:
@@ -12,61 +12,114 @@ image: Visual Studio 2022
 environment:
   EnableNuGetPackageRestore: true
 
-# msbuild configuration
-platform:
-- Any CPU
-configuration:
-- Debug
-
 # install dependencies
 install:
 - ps: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-- cd %APPVEYOR_BUILD_FOLDER%
-- git submodule update --init --recursive
 
 # pre-build script
 before_build:
 - nuget restore
 
 # build step
-build:
-  verbosity: minimal
-  project: MPF.sln
+build_script:
+  - dotnet restore
+
+  # .NET Framework 4.8
+  - msbuild MPF\MPF.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+  - msbuild MPF.Check\MPF.Check.csproj -target:Publish -property:TargetFramework=net48 -property:RuntimeIdentifiers=win7-x64
+
+  # .NET 6.0
+  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF\MPF.csproj --framework net6.0-windows --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win7-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win8-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win81-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime win10-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true
+  - dotnet publish MPF.Check\MPF.Check.csproj --framework net6.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true
 
 # post-build step
 after_build:
-- ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.3.1/aaru-5.3.1_windows_x64.zip
+
+# Aaru
+- ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.3.2/aaru-5.3.2_windows_x64.zip
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net48\publish\Programs\Aaru *
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Aaru *
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Aaru *
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Aaru *
+- 7z x aaru-5.3.2_windows_x64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Aaru *
+
+# dd for Windows
 - ps: appveyor DownloadFile http://www.chrysocome.net/downloads/8ab730cd2a29e76ddd89be1f99357942/dd-0.6beta3.zip
-- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/9536254/DiscImageCreator_20220909.zip
-- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_51/redumper-2022.09.26_build51-win64.zip
+- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net48\publish\Programs\DD *
+- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\DD *
+- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\DD *
+- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\DD *
+- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\DD *
+
+# DiscImageCreator
+- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/11660558/DiscImageCreator_20230606.zip
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net48\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20230606.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Creator Release_ANSI\*
+
+# Redumper
+- ps: appveyor DownloadFile https://github.com/superg/redumper/releases/download/build_183/redumper-2023.07.09_build183-win64.zip
+- 7z e redumper-2023.07.09_build183-win64.zip -oMPF\bin\Debug\net48\publish\Programs\Redumper redumper-2023.07.09_build183-win64\bin\*
+- 7z e redumper-2023.07.09_build183-win64.zip -oMPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Redumper redumper-2023.07.09_build183-win64\bin\*
+- 7z e redumper-2023.07.09_build183-win64.zip -oMPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Redumper redumper-2023.07.09_build183-win64\bin\*
+- 7z e redumper-2023.07.09_build183-win64.zip -oMPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Redumper redumper-2023.07.09_build183-win64\bin\*
+- 7z e redumper-2023.07.09_build183-win64.zip -oMPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Redumper redumper-2023.07.09_build183-win64\bin\*
+
+# Subdump
 - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip
+- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48\publish *
+- mkdir MPF\bin\Debug\net48\publish\Programs\Subdump
+- mv MPF\bin\Debug\net48\publish\subdump_fua_0x28.exe MPF\bin\Debug\net48\publish\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
+- mkdir MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump
+- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win7-x64\publish\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
+- mkdir MPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Subdump
+- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win8-x64\publish\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
+- mkdir MPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Subdump
+- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win81-x64\publish\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0-windows *
+- mkdir MPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Subdump
+- mv MPF\bin\Debug\net6.0-windows\subdump_fua_0x28.exe MPF\bin\Debug\net6.0-windows\win10-x64\publish\Programs\Subdump\subdump.exe
 
-- 7z x aaru-5.3.1_windows_x64.zip -oMPF\bin\Debug\net48\Programs\Aaru *
-#- 7z x aaru-5.3.1_windows_x64.zip -oMPF\bin\Debug\net6.0\Programs\Aaru *
+# MPF
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net48\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net48.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win7-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win7-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win8-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win8-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win81-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win81-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF\bin\Debug\net6.0-windows\win10-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF_net6.0_win10-x64.zip *
 
-- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net48\Programs\DD *
-#- 7z e dd-0.6beta3.zip -oMPF\bin\Debug\net6.0\Programs\DD *
-
-- 7z e DiscImageCreator_20220909.zip -oMPF\bin\Debug\net48\Programs\Creator Release_ANSI\*
-#- 7z e DiscImageCreator_20220909.zip -oMPF\bin\Debug\net6.0\Programs\Creator Release_ANSI\*
-
-- 7z e redumper-2022.09.26_build51-win64.zip -oMPF\bin\Debug\net48\Programs\Redumper redumper-2022.09.26_build51-win64\bin\*
-#- 7z e redumper-2022.09.26_build51-win64.zip -oMPF\bin\Debug\net6.0\Programs\Redumper redumper-2022.09.26_build51-win64\bin\*
-
-- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net48 *
-- mkdir MPF\bin\Debug\net48\Programs\Subdump
-- mv MPF\bin\Debug\net48\subdump_fua_0x28.exe MPF\bin\Debug\net48\Programs\Subdump\subdump.exe
-#- 7z e subdump_fua_0x28.zip -oMPF\bin\Debug\net6.0 *
-#- mkdir MPF\bin\Debug\net6.0\Programs\Subdump
-#- mv MPF\bin\Debug\net6.0\subdump_fua_0x28.exe MPF\bin\Debug\net6.0\Programs\Subdump\subdump.exe
-
-- cd MPF\bin\Debug
-- 7z a MPF_net48.zip net48\*
-#- 7z a MPF_net6.0.zip net6.0\*
-
-- cd ..\..\..\MPF.Check\bin\Debug
-- 7z a MPF-Check_net48.zip net48\*
-#- 7z a MPF-Check_net6.0.zip net6.0\*
+# MPF.Check
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net48\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net48.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win7-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win7-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win8-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win8-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win81-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win81-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\win10-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_win10-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\linux-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_linux-x64.zip *
+- cd %APPVEYOR_BUILD_FOLDER%\MPF.Check\bin\Debug\net6.0\osx-x64\publish\
+- 7z a -tzip %APPVEYOR_BUILD_FOLDER%\MPF.Check_net6.0_osx-x64.zip *
 
 # success/failure tracking
 on_success:
@@ -78,12 +131,28 @@ on_failure:
 
 # artifact linking
 artifacts:
-- path: MPF\bin\Debug\MPF_net48.zip
-  name: MPF (WPF UI) (.NET Framework 4.8)
-#- path: MPF\bin\Debug\MPF_net6.0.zip
-#  name: MPF (WPF UI) (.NET 6.0)
+- path: MPF_net48.zip
+  name: MPF (.NET Framework 4.8)
+- path: MPF_net6.0_win7-x64.zip
+  name: MPF (.NET 6.0, Windows 7 x64)
+- path: MPF_net6.0_win8-x64.zip
+  name: MPF (.NET 6.0, Windows 8 x64)
+- path: MPF_net6.0_win81-x64.zip
+  name: MPF (.NET 6.0, Windows 8.1 x64)
+- path: MPF_net6.0_win10-x64.zip
+  name: MPF (.NET 6.0, Windows 10 x64)
 
-- path: MPF.Check\bin\Debug\MPF-Check_net48.zip
+- path: MPF.Check_net48.zip
   name: MPF Check (.NET Framework 4.8)
-#- path: MPF.Check\bin\Debug\MPF-Check_net6.0.zip
-#  name: MPF Check (.NET 6.0)
+- path: MPF.Check_net6.0_win7-x64.zip
+  name: MPF.Check (.NET 6.0, Windows 7 x64)
+- path: MPF.Check_net6.0_win8-x64.zip
+  name: MPF.Check (.NET 6.0, Windows 8 x64)
+- path: MPF.Check_net6.0_win81-x64.zip
+  name: MPF.Check (.NET 6.0, Windows 8.1 x64)
+- path: MPF.Check_net6.0_win10-x64.zip
+  name: MPF.Check (.NET 6.0, Windows 10 x64)
+- path: MPF.Check_net6.0_linux-x64.zip
+  name: MPF.Check (.NET 6.0, Linux x64)
+- path: MPF.Check_net6.0_osx-x64.zip
+  name: MPF.Check (.NET 6.0, OSX x64)