Advanced Support (#172)

* Who doesn't like drives?

* Add another TODO

* Use built in stuff, it's quicker

* More special handling for floppies, easier this time

* Fix broken test

* Set active drive priority, String -> string

* Track reason for no scanning

* Update DIC version and release notes

CHANGELIST.md

@@ -1,4 +1,41 @@
+### 1.15 (2019-11-16)
+
+- Updated to DIC version 20191116
+- Support non-optical, non-floppy stuff better
+- Update protection scanning and fix some things
+
+### 1.14 (2019-10-01)
+
+- Updated to DIC version 20191001
+- Added builds for .NET 4.6.2, .NET 4.7.2, and .NET Core 3.0
+- Updated and fixed a bunch of things related to Redump
+- Fixed path persistence when changing system and media type
+- Added more system autodetects
+- Added new, optional, disc information filling window (WIP)
+
+### 1.13 (2019-07-02)
+
+- Added new DIC commands and flags
+- Made DICUI Check more robust
+- Added and updated systems along with format cleanup
+- Created a new SubmissionInfo template (and internals)
+- Added automatic grabbing of Redump information, if possible
+- Better media format support (BD, UMD)
+- Initial disc type detection
+
+### 1.12.2 (2019-04-19)
+
+- Added DICUI Check, a new standalone tool for parsing DIC output from platforms unsupported by DICUI
+- Added a few machines/formats
+- Updated to DIC version 20190326
+- Added DMI data extraction for Xbox and X360
+
+### 1.12.1 (2019-01-28)
+
+- Fixed !submissionInfo.txt output for CD-ROM and GD-ROM
+
 ### 1.12 (2019-01-27)
+
 - Added a few new systems and formats
 - Added new DIC commands and flags
 - Updated the `!submissionInfo.txt` file order

DICUI.Check/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-</configuration>
+</configuration>

DICUI.Check/DICUI.Check.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputType>Exe</OutputType>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
+      <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>
+      <Name>DICUI.Library</Name>
+    </ProjectReference>
+  </ItemGroup>
+
+</Project>

DICUI.Check/Program.cs

@@ -0,0 +1,180 @@
+using System;
+using System.IO;
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI.Check
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Help options
+            if (args.Length == 0
+                || args[0] == "/h" || args[0] == "/?"
+                || args[0] == "-h" || args[0] == "-?")
+            {
+                DisplayHelp();
+                return;
+            }
+
+            // List options
+            if (args[0] == "/lm" || args[0] == "/listmedia"
+                || args[0] == "-lm" || args[0] == "--listmedia")
+            {
+                ListMediaTypes();
+                Console.ReadLine();
+                return;
+            }
+            else if (args[0] == "/ls" || args[0] == "/listsystems"
+                || args[0] == "-ls" || args[0] == "--listsystems")
+            {
+                ListKnownSystems();
+                Console.ReadLine();
+                return;
+            }
+
+            // Normal operation check
+            if (args.Length < 3)
+            {
+                DisplayHelp("Invalid number of arguments");
+                return;
+            }            
+
+            // Check the MediaType
+            var mediaType = Converters.StringToMediaType(args[0].Trim('"'));
+            if (mediaType == MediaType.NONE)
+            {
+                DisplayHelp($"{args[0]} is not a recognized media type");
+                return;
+            }
+
+            // Check the KnownSystem
+            var knownSystem = Converters.StringToKnownSystem(args[1].Trim('"'));
+            if (knownSystem == KnownSystem.NONE)
+            {
+                DisplayHelp($"{args[1]} is not a recognized system");
+                return;
+            }
+
+            // Check for Redump login credentials
+            string username = null, password = null;
+            int startIndex = 2;
+            if (args[2] == "-c" || args[2] == "--credentials")
+            {
+                username = args[3];
+                password = args[4];
+                startIndex = 5;
+            }
+
+            // Make a new Progress object
+            var progress = new Progress<Result>();
+            progress.ProgressChanged += ProgressUpdated;
+
+            // Loop through all the rest of the args
+            for (int i = startIndex; i < args.Length; i++)
+            {
+                // Check for a file
+                if (!File.Exists(args[i]))
+                {
+                    DisplayHelp($"{args[i]} does not exist");
+                    return;
+                }
+
+                // Get the full file path
+                string filepath = Path.GetFullPath(args[i]);
+
+                // Now populate an environment
+                var env = new DumpEnvironment
+                {
+                    OutputDirectory = "",
+                    OutputFilename = filepath,
+                    System = knownSystem,
+                    Type = mediaType,
+                    ScanForProtection = false,
+                    PromptForDiscInformation = false,
+
+                    Username = username,
+                    Password = password,
+                };
+                env.FixOutputPaths();
+
+                // Finally, attempt to do the output dance
+                var result = env.VerifyAndSaveDumpOutput(progress);
+                Console.WriteLine(result.Message);
+            }
+        }
+
+        /// <summary>
+        /// Display help for DICUI.Check
+        /// </summary>
+        /// <param name="error">Error string to prefix the help text with</param>
+        private static void DisplayHelp(string error = null)
+        {
+            if (error != null)
+                Console.WriteLine(error);
+
+            Console.WriteLine("Usage:");
+            Console.WriteLine("DICUI.Check.exe <mediatype> <system> [-c username password] </path/to/output.bin> ...");
+            Console.WriteLine();
+            Console.WriteLine(@"Common Media Types:\r\n
+bd / bluray     - BD-ROM
+cd / cdrom      - CD-ROM
+dvd             - DVD-ROM
+fd / floppy     - Floppy Disk
+gd / gdrom      - GD-ROM
+umd             - UMD");
+            Console.WriteLine("Run 'DICUI.Check.exe [-lm|--listmedia' for more options");
+            Console.WriteLine();
+            Console.WriteLine(@"Common Systems:\r\n
+apple / mac     - Apple Macintosh
+cdi             - Philips CD-i
+ibm / ibmpc     - IBM PC Compatible
+psx / ps1       - Sony PlayStation
+ps2             - Sony PlayStation 2
+psp             - Sony PlayStation Portable
+saturn          - Sega Saturn
+xbox            - Microsoft XBOX
+x360            - Microsoft XBOX 360");
+            Console.WriteLine("Run 'DICUI.Check.exe [-ls|--listsystems' for more options");
+        }
+
+        /// <summary>
+        /// List all media types with their short usable names
+        /// </summary>
+        private static void ListMediaTypes()
+        {
+            Console.WriteLine("Supported Media Types:");
+            foreach (var val in Enum.GetValues(typeof(MediaType)))
+            {
+                if (((MediaType)val) == MediaType.NONE)
+                    continue;
+
+                Console.WriteLine($"{((MediaType?)val).ShortName()} - {((MediaType?)val).LongName()}");
+            }
+        }
+
+        /// <summary>
+        /// List all known systems with their short usable names
+        /// </summary>
+        private static void ListKnownSystems()
+        {
+            Console.WriteLine("Supported Known Systems:");
+            foreach (var val in Enum.GetValues(typeof(KnownSystem)))
+            {
+                if (((KnownSystem)val) == KnownSystem.NONE)
+                    continue;
+
+                Console.WriteLine($"{((KnownSystem?)val).ShortName()} - {((KnownSystem?)val).LongName()}");
+            }
+        }
+
+        /// <summary>
+        /// Simple process counter to write to console
+        /// </summary>
+        private static void ProgressUpdated(object sender, Result value)
+        {
+            Console.WriteLine(value.Message);
+        }
+    }
+}

DICUI.Check/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("DICUI.Forms")]
+[assembly: AssemblyTitle("DICUI.Check")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Forms")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyProduct("DICUI.Check")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a6719a99-bf0e-4637-9a8e-cb38b1e16971")]
+[assembly: Guid("8cfde289-e171-4d49-a40d-5293265c1253")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11")]
-[assembly: AssemblyFileVersion("1.11.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DICUI.Forms/Constants.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Media;
-using DICUI.Data;
-
-namespace DICUI
-{
-    /// <summary>
-    /// Variables for UI elements
-    /// </summary>
-    public static class Constants
-    {
-        public const string StartDumping = "Start Dumping";
-        public const string StopDumping = "Stop Dumping";
-
-        public const int LogWindowMarginFromMainWindow = 10;
-
-        // 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> bd { get; } = cd.Where(s => s <= 16).ToList();
-        private static IReadOnlyList<int> unknown { get; } = cd; // TODO: All or {1}? Maybe null?
-
-        /// <summary>
-        /// Get list of all drive speeds for a given MediaType
-        /// </summary>
-        /// <param name="type">MediaType? that represents the current item</param>
-        /// <returns>Read-only list of drive speeds</returns>
-        public static IReadOnlyList<int> GetSpeedsForMediaType(MediaType? type)
-        {
-            switch (type)
-            {
-                case MediaType.CDROM:
-                case MediaType.GDROM:
-                    return cd;
-                case MediaType.DVD:
-                case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
-                case MediaType.NintendoWiiOpticalDisc:
-                    return dvd;
-                case MediaType.BluRay:
-                    return bd;
-                default:
-                    return unknown;
-            }
-        }
-
-        // 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 SpeedsForBDAsCollection { get; } = GetDoubleCollectionFromIntList(bd);
-        private static DoubleCollection GetDoubleCollectionFromIntList(IReadOnlyList<int> list)
-            => new DoubleCollection(list.Select(i => Convert.ToDouble(i)).ToList());
-    }
-}

DICUI.Forms/DICUI.Forms.csproj

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A6719A99-BF0E-4637-9A8E-CB38B1E16971}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>DICUI.Forms</RootNamespace>
-    <AssemblyName>DICUI.Forms</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>Icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing.Design" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Constants.cs" />
-    <Compile Include="EnumDescriptionConverter.cs" />
-    <Compile Include="KnownSystemComboBoxItem.cs" />
-    <Compile Include="MediaTypeComboBoxItem.cs" />
-    <Compile Include="Options.cs" />
-    <Compile Include="Properties\Settings1.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings1.settings</DependentUpon>
-    </Compile>
-    <Compile Include="ViewModels.cs" />
-    <Compile Include="Windows\LogWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\LogWindow.Designer.cs">
-      <DependentUpon>LogWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\MainWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\MainWindow.Designer.cs">
-      <DependentUpon>MainWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Windows\OptionsWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Windows\OptionsWindow.Designer.cs">
-      <DependentUpon>OptionsWindow.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Windows\LogWindow.resx">
-      <DependentUpon>LogWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\MainWindow.resx">
-      <DependentUpon>MainWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Windows\OptionsWindow.resx">
-      <DependentUpon>OptionsWindow.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Properties\Settings1.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings1.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
-      <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>
-      <Name>DICUI.Library</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

DICUI.Forms/EnumDescriptionConverter.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using DICUI.Data;
-using DICUI.Utilities;
-
-namespace DICUI.Forms
-{
-    /// <summary>
-    /// Used to provide a converter to XAML files to render comboboxes with enum values
-    /// </summary>
-    public class EnumDescriptionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is DICCommand)
-                return ((DICCommand)value).Name();
-            else if (value is DICFlag)
-                return ((DICFlag)value).Name();
-            else if (value is MediaType?)
-                return ((MediaType?)value).Name();
-            else if (value is KnownSystem?)
-                return ((KnownSystem?)value).Name();
-            else
-                return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return string.Empty;
-        }
-    }
-}

DICUI.Forms/KnownSystemComboBoxItem.cs

@@ -1,34 +0,0 @@
-using DICUI.Data;
-using DICUI.Utilities;
-
-namespace DICUI
-{
-    /// <summary>
-    /// Represents a single item in the System combo box
-    /// </summary>
-    public class KnownSystemComboBoxItem
-    {
-        private object data;
-
-        public KnownSystemComboBoxItem(KnownSystem? system) => data = system;
-        public KnownSystemComboBoxItem(KnownSystemCategory? category) => data = category;
-
-        //public Brush Foreground { get => IsHeader() ? Brushes.Gray : Brushes.Black; } // TODO: Re-enable this
-
-        public bool IsHeader() => data is KnownSystemCategory?;
-        public bool IsSystem() => data is KnownSystem?;
-
-        public static implicit operator KnownSystem? (KnownSystemComboBoxItem item) => item.data as KnownSystem?;
-
-        public string Name
-        {
-            get
-            {
-                if (IsHeader())
-                    return "---------- " + (data as KnownSystemCategory?).Name() + " ----------";
-                else
-                    return (data as KnownSystem?).Name();
-            }
-        }
-    }
-}

DICUI.Forms/MediaTypeComboBoxItem.cs

@@ -1,20 +0,0 @@
-using DICUI.Data;
-using DICUI.Utilities;
-
-namespace DICUI.Forms
-{
-    /// <summary>
-    /// Represents a single item in the MediaType combo box
-    /// </summary>
-    public class MediaTypeComboBoxItem
-    {
-        private MediaType? data;
-
-        public MediaTypeComboBoxItem(MediaType? mediaType) => data = mediaType;
-
-        public static implicit operator MediaType? (MediaTypeComboBoxItem item) => item.data;
-
-        public string Name { get { return data.Name(); }
-        }
-    }
-}

DICUI.Forms/Options.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Configuration;
-using System.Reflection;
-using DICUI.Data;
-
-namespace DICUI
-{
-    public class Options
-    {
-        public string DefaultOutputPath { get; private set; }
-        public string DICPath { get; private set; }
-        public string SubDumpPath { get; private set; }
-
-        public int PreferredDumpSpeedCD { get; set; }
-        public int PreferredDumpSpeedDVD { get; set; }
-        public int PreferredDumpSpeedBD { get; set; }
-
-        public bool QuietMode { get; set; }
-        public bool ParanoidMode { get; set; }
-        public bool ScanForProtection { get; set; }
-        public int RereadAmountForC2 { get; set; }
-
-        public bool SkipMediaTypeDetection { get; set; }
-
-        public bool VerboseLogging { get; set; }
-        public bool OpenLogWindowAtStartup { get; set; }
-
-        public void Save()
-        {
-            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
-            //TODO: reflection is used
-            //TODO: is remove needed, doesn't the value get directly overridden
-            Array.ForEach(
-                GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance), 
-                p => {
-                    configFile.AppSettings.Settings.Remove(p.Name);
-                    configFile.AppSettings.Settings.Add(p.Name, Convert.ToString(p.GetValue(this)));
-                }
-            );
-            
-            configFile.Save(ConfigurationSaveMode.Modified);
-        }
-
-        public void Load()
-        {
-            //TODO: hardcoded, we should find a better way
-            DICPath = ConfigurationManager.AppSettings["DICPath"] ?? @"Programs\DiscImageCreator.exe";
-            SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe";
-            DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO";
-
-            this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
-            this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
-            this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
-
-            this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false;
-            this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false;
-            this.ScanForProtection = Boolean.TryParse(ConfigurationManager.AppSettings["ScanForProtection"], out bool scanForProtection) ? scanForProtection : true;
-            this.SkipMediaTypeDetection = Boolean.TryParse(ConfigurationManager.AppSettings["SkipMediaTypeDetection"], out bool skipMediaTypeDetection) ? skipMediaTypeDetection : false;
-            this.RereadAmountForC2 = Int32.TryParse(ConfigurationManager.AppSettings["RereadAmountForC2"], out int rereadAmountForC2) ? rereadAmountForC2 : 20;
-            this.VerboseLogging = Boolean.TryParse(ConfigurationManager.AppSettings["VerboseLogging"], out bool verboseLogging) ? verboseLogging : true;
-            this.OpenLogWindowAtStartup = Boolean.TryParse(ConfigurationManager.AppSettings["OpenLogWindowAtStartup"], out bool openLogWindowAtStartup) ? openLogWindowAtStartup : true;
-        }
-
-
-        //TODO: probably should be generic for non-string options
-        //TODO: using reflection for Set and Get is orthodox but it works, should be changed to a key,value map probably
-        public void Set(string key, string value)
-        {
-            GetType().GetProperty(key, BindingFlags.Public | BindingFlags.Instance).SetValue(this, value);
-        }
-
-        public string Get(string key)
-        {
-            return GetType().GetProperty(key, BindingFlags.Public | BindingFlags.Instance).GetValue(this) as string;
-        }
-
-        public int GetPreferredDumpSpeedForMediaType(MediaType? type)
-        {
-            switch (type)
-            {
-                case MediaType.CDROM:
-                case MediaType.GDROM:
-                    return PreferredDumpSpeedCD;
-                case MediaType.DVD:
-                case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
-                case MediaType.NintendoWiiOpticalDisc:
-                    return PreferredDumpSpeedDVD;
-                case MediaType.BluRay:
-                    return PreferredDumpSpeedBD;
-                default:
-                    return 8;
-            }
-        }
-    }
-}

DICUI.Forms/Program.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Windows.Forms;
-using DICUI.Forms.Windows;
-
-namespace DICUI.Forms
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainWindow());
-        }
-    }
-}

DICUI.Forms/Properties/Settings1.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DICUI.Forms.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
-    internal sealed partial class Settings1 : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings1 defaultInstance = ((Settings1)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings1())));
-        
-        public static Settings1 Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

DICUI.Forms/Properties/Settings1.settings

@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-</SettingsFile>

DICUI.Forms/ViewModels.cs

@@ -1,106 +0,0 @@
-using System;
-using DICUI.Forms.Windows;
-
-namespace DICUI.Forms
-{
-    public class OptionsViewModel
-    {
-        private Options _options;
-
-        public OptionsViewModel(Options options)
-        {
-            this._options = options;
-        }
-
-        public bool QuietMode
-        {
-            get { return _options.QuietMode; }
-            set { _options.QuietMode = value; }
-        }
-
-        public bool ParanoidMode
-        {
-            get { return _options.ParanoidMode; }
-            set { _options.ParanoidMode = value; }
-        }
-
-        public bool ScanForProtection
-        {
-            get { return _options.ScanForProtection; }
-            set { _options.ScanForProtection = value; }
-        }
-
-        public bool SkipMediaTypeDetection
-        {
-            get { return _options.SkipMediaTypeDetection; }
-            set { _options.SkipMediaTypeDetection = value; }
-        }
-
-        public string RereadAmountForC2
-        {
-            get { return Convert.ToString(_options.RereadAmountForC2); }
-            set
-            {
-                if (Int32.TryParse(value, out int result))
-                    _options.RereadAmountForC2 = result;
-            }
-        }
-
-        public bool VerboseLogging
-        {
-            get { return _options.VerboseLogging; }
-            set
-            {
-                _options.VerboseLogging = value;
-                _options.Save();
-            }
-        }
-
-        public bool OpenLogWindowAtStartup
-        {
-            get { return _options.OpenLogWindowAtStartup; }
-            set
-            {
-                _options.OpenLogWindowAtStartup = value;
-                _options.Save();
-            }
-        }
-    }
-
-    public class LoggerViewModel
-    {
-        private LogWindow _logWindow;
-
-        public void SetWindow(LogWindow logWindow) => _logWindow = logWindow;
-
-        public bool WindowVisible
-        {
-            get => _logWindow != null ? _logWindow.Visible : false;
-            set
-            {
-                if (value)
-                {
-                    _logWindow.AdjustPositionToMainWindow();
-                    _logWindow.Show();
-                }
-                else
-                    _logWindow.Hide();
-            }
-        }
-
-        public void VerboseLog(string text)
-        {
-            if (ViewModels.OptionsViewModel.VerboseLogging)
-                _logWindow.AppendToTextBox(text, System.Drawing.Color.Yellow);
-        }
-
-        public void VerboseLog(string format, params object[] args) => VerboseLog(string.Format(format, args));
-        public void VerboseLogLn(string format, params object[] args) => VerboseLog(string.Format(format, args) + "\n");
-    }
-
-    public static class ViewModels
-    {
-        public static OptionsViewModel OptionsViewModel { get; set; }
-        public static LoggerViewModel LoggerViewModel { get; set; } = new LoggerViewModel();
-    }
-}

DICUI.Forms/Windows/LogWindow.Designer.cs

@@ -1,175 +0,0 @@
-namespace DICUI.Forms.Windows
-{
-    partial class LogWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.progressBar = new System.Windows.Forms.ProgressBar();
-            this.output = new System.Windows.Forms.RichTextBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.Verbose = new System.Windows.Forms.CheckBox();
-            this.OpenAtStartupCheckBox = new System.Windows.Forms.CheckBox();
-            this.ClearButton = new System.Windows.Forms.Button();
-            this.HideButton = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.Controls.Add(this.progressBar, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.output, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 2);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(560, 287);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // progressBar
-            // 
-            this.progressBar.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.progressBar.Location = new System.Drawing.Point(3, 3);
-            this.progressBar.Name = "progressBar";
-            this.progressBar.Size = new System.Drawing.Size(554, 34);
-            this.progressBar.TabIndex = 0;
-            // 
-            // output
-            // 
-            this.output.BackColor = System.Drawing.Color.DimGray;
-            this.output.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.output.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.output.Location = new System.Drawing.Point(3, 43);
-            this.output.Name = "output";
-            this.output.ReadOnly = true;
-            this.output.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-            this.output.Size = new System.Drawing.Size(554, 201);
-            this.output.TabIndex = 1;
-            this.output.Text = "";
-            this.output.TextChanged += new System.EventHandler(this.OnTextChanged);
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15F));
-            this.tableLayoutPanel2.Controls.Add(this.Verbose, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.OpenAtStartupCheckBox, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.ClearButton, 3, 0);
-            this.tableLayoutPanel2.Controls.Add(this.HideButton, 4, 0);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 250);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(554, 34);
-            this.tableLayoutPanel2.TabIndex = 2;
-            // 
-            // Verbose
-            // 
-            this.Verbose.AutoSize = true;
-            this.Verbose.Dock = System.Windows.Forms.DockStyle.Left;
-            this.Verbose.Location = new System.Drawing.Point(3, 3);
-            this.Verbose.Name = "Verbose";
-            this.Verbose.Size = new System.Drawing.Size(65, 28);
-            this.Verbose.TabIndex = 1;
-            this.Verbose.Text = "Verbose";
-            this.Verbose.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.Verbose.UseVisualStyleBackColor = true;
-            // 
-            // OpenAtStartupCheckBox
-            // 
-            this.OpenAtStartupCheckBox.AutoSize = true;
-            this.OpenAtStartupCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.OpenAtStartupCheckBox.Location = new System.Drawing.Point(86, 3);
-            this.OpenAtStartupCheckBox.Name = "OpenAtStartupCheckBox";
-            this.OpenAtStartupCheckBox.Size = new System.Drawing.Size(104, 28);
-            this.OpenAtStartupCheckBox.TabIndex = 2;
-            this.OpenAtStartupCheckBox.Text = "Open at startup";
-            this.OpenAtStartupCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // ClearButton
-            // 
-            this.ClearButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ClearButton.Location = new System.Drawing.Point(389, 3);
-            this.ClearButton.Name = "ClearButton";
-            this.ClearButton.Size = new System.Drawing.Size(77, 28);
-            this.ClearButton.TabIndex = 3;
-            this.ClearButton.Text = "Clear";
-            this.ClearButton.UseVisualStyleBackColor = true;
-            this.ClearButton.Click += new System.EventHandler(this.OnClearButton);
-            // 
-            // HideButton
-            // 
-            this.HideButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.HideButton.Location = new System.Drawing.Point(472, 3);
-            this.HideButton.Name = "HideButton";
-            this.HideButton.Size = new System.Drawing.Size(79, 28);
-            this.HideButton.TabIndex = 4;
-            this.HideButton.Text = "Hide";
-            this.HideButton.UseVisualStyleBackColor = true;
-            this.HideButton.SizeChanged += new System.EventHandler(this.ScrollViewer_SizeChanged);
-            this.HideButton.Click += new System.EventHandler(this.OnHideButton);
-            // 
-            // LogWindow
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(584, 311);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Name = "LogWindow";
-            this.ShowIcon = false;
-            this.Text = "Log Window";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OnWindowClosed);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.ProgressBar progressBar;
-        private System.Windows.Forms.RichTextBox output;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.CheckBox Verbose;
-        private System.Windows.Forms.CheckBox OpenAtStartupCheckBox;
-        private System.Windows.Forms.Button ClearButton;
-        private System.Windows.Forms.Button HideButton;
-    }
-}

DICUI.Forms/Windows/LogWindow.cs

@@ -1,380 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Threading;
-
-namespace DICUI.Forms.Windows
-{
-    public partial class LogWindow : Form
-    {
-        private const int GWL_STYLE = -16;
-        private const int WS_SYSMENU = 0x80000;
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-        [DllImport("user32.dll")]
-        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-        private MainWindow _mainWindow;
-
-        private List<Matcher> _matchers;
-
-        volatile Process _process;
-
-        public LogWindow(MainWindow mainWindow)
-        {
-            InitializeComponent();
-
-            this._mainWindow = mainWindow;
-
-            _matchers = new List<Matcher>();
-
-            _matchers.Add(new Matcher(
-                "Descrambling data sector of img (LBA)",
-                @"\s*(\d+)\/\s*(\d+)$",
-                match => {
-                    if (UInt32.TryParse(match.Groups[1].Value, out uint current) && UInt32.TryParse(match.Groups[2].Value, out uint total))
-                    {
-                        float percentProgress = (current / (float)total) * 100;
-                        progressBar.Value = (int)percentProgress;
-                        //progressBar.Text = string.Format("Descrambling image.. ({0:##.##}%)", percentProgress);
-                    }
-                }));
-
-            _matchers.Add(new Matcher(
-                @"Creating .scm (LBA)",
-                @"\s*(\d+)\/\s*(\d+)$",
-                match => {
-                    if (UInt32.TryParse(match.Groups[1].Value, out uint current) && UInt32.TryParse(match.Groups[2].Value, out uint total))
-                    {
-                        float percentProgress = (current / (float)total) * 100;
-                        progressBar.Value = (int)percentProgress;
-                        //progressBar.Text = string.Format("Creating scrambled image.. ({0:##.##}%)", percentProgress);
-                    }
-                }));
-
-            _matchers.Add(new Matcher(
-                "Checking sectors (LBA)",
-                @"\s*(\d+)\/\s*(\d+)$",
-                match => {
-                    if (UInt32.TryParse(match.Groups[1].Value, out uint current) && UInt32.TryParse(match.Groups[2].Value, out uint total))
-                    {
-                        float percentProgress = (current / (float)total) * 100;
-                        progressBar.Value = (int)percentProgress;
-                        //progressBar.Text = string.Format("Checking for errors.. ({0:##.##}%)", percentProgress);
-                    }
-                }));
-
-            _matchers.Add(new Matcher(
-                "Scanning sector (LBA)",
-                @"\s*(\d+)\/\s*(\d+)$",
-                match => {
-                    if (UInt32.TryParse(match.Groups[1].Value, out uint current) && UInt32.TryParse(match.Groups[2].Value, out uint total))
-                    {
-                        float percentProgress = (current / (float)total) * 100;
-                        progressBar.Value = (int)percentProgress;
-                        //progressBar.Text = string.Format("Scanning sectors for protection.. ({0:##.##}%)", percentProgress);
-                    }
-                }));
-        }
-
-        protected override bool ShowWithoutActivation
-        {
-            get { return true; }
-        }
-
-        public void StartDump(string args)
-        {
-            AppendToTextBox(string.Format("Launching DIC with args: {0}\r\n", args), System.Drawing.Color.Orange);
-
-            Task.Run(() =>
-            {
-                _process = new Process()
-                {
-                    StartInfo = new ProcessStartInfo()
-                    {
-                        FileName = @"Programs/DiscImageCreator.exe",
-                        Arguments = args,
-                        CreateNoWindow = true,
-                        UseShellExecute = false,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                    },
-                };
-
-                StreamState stdoutState = new StreamState(false);
-                StreamState stderrState = new StreamState(true);
-
-                //_cmd.ErrorDataReceived += (process, text) => Dispatcher.CurrentDispatcher.Invoke(() => UpdateConsole(text.Data, Brushes.Red));
-                _process.Start();
-
-                var _1 = ConsumeOutput(_process.StandardOutput, s => Dispatcher.CurrentDispatcher.Invoke(() => UpdateConsole(s, stdoutState)));
-                var _2 = ConsumeOutput(_process.StandardError, s => Dispatcher.CurrentDispatcher.Invoke(() => UpdateConsole(s, stderrState)));
-
-                _process.EnableRaisingEvents = true;
-                _process.Exited += OnProcessExit;
-            });
-        }
-
-        public void AdjustPositionToMainWindow()
-        {
-            this.Left = _mainWindow.Left;
-            this.Top = _mainWindow.Top + _mainWindow.Height + Constants.LogWindowMarginFromMainWindow;
-            this.BringToFront();
-        }
-
-        private void GracefullyTerminateProcess()
-        {
-            if (_process != null)
-            {
-                _process.Exited -= OnProcessExit;
-                bool isForced = !_process.HasExited;
-
-                if (isForced)
-                {
-                    AppendToTextBox("\r\nForcefully Killing the process\r\n", System.Drawing.Color.Red);
-                    _process.Kill();
-                    _process.WaitForExit();
-                }
-
-                AppendToTextBox(string.Format("\r\nExit Code: {0}\r\n", _process.ExitCode), _process.ExitCode == 0 ? System.Drawing.Color.Green : System.Drawing.Color.Red);
-                if (_process.ExitCode == 0)
-                {
-                    Dispatcher.CurrentDispatcher.Invoke(() =>
-                    {
-                        //progressBar.Text = "Done!";
-                        progressBar.Value = 100;
-                        progressBar.ForeColor = System.Drawing.Color.Green;
-                    });
-                }
-                else
-                {
-                    Dispatcher.CurrentDispatcher.Invoke(() =>
-                    {
-                        //progressBar.Text = isForced ? "Aborted by user" : "Error, please check log!";
-                        progressBar.Value = 100;
-                        progressBar.ForeColor = System.Drawing.Color.Red;
-                    });
-                }
-
-                _process.Close();
-            }
-
-            _process = null;
-        }
-
-        private void ScrollViewer_SizeChanged(object sender, EventArgs e)
-        {
-            output.ScrollToCaret();
-        }
-
-        async Task ConsumeOutput(TextReader reader, Action<string> callback)
-        {
-            char[] buffer = new char[256];
-            int cch;
-
-            while ((cch = await reader.ReadAsync(buffer, 0, buffer.Length)) > 0)
-            {
-                callback(new string(buffer, 0, cch));
-            }
-        }
-
-        // this is used to optimize the work since we need to process A LOT of text
-        struct Matcher
-        {
-            private readonly String prefix;
-            private readonly Regex regex;
-            private readonly int start;
-            private readonly Action<Match> lambda;
-
-            public Matcher(String prefix, String regex, Action<Match> lambda)
-            {
-                this.prefix = prefix;
-                this.regex = new Regex(regex);
-                this.start = prefix.Length;
-                this.lambda = lambda;
-            }
-
-            public bool Matches(ref string text) => text.StartsWith(prefix);
-
-            public void Apply(ref string text)
-            {
-                Match match = regex.Match(text, start);
-                lambda.Invoke(match);
-            }
-        }
-
-        private void ProcessStringForProgressBar(string text)
-        {
-            foreach (Matcher matcher in _matchers)
-            {
-                if (matcher.Matches(ref text))
-                {
-                    matcher.Apply(ref text);
-                    return;
-                }
-            }
-        }
-
-        class StreamState
-        {
-            public enum State
-            {
-                BEGIN,
-                READ_CARRIAGE,
-            };
-
-            public State state;
-            public readonly StringBuilder buffer;
-            public readonly bool isError;
-
-            public StreamState(bool isError)
-            {
-                this.state = State.BEGIN;
-                this.buffer = new StringBuilder();
-                this.isError = isError;
-            }
-
-            public bool HasData() => buffer.Length > 0;
-            public string Fetch() => buffer.ToString();
-            public void Clear() => buffer.Clear();
-            public void Append(char c) => buffer.Append(c);
-
-            public bool Is(State state) => this.state == state;
-            public void Set(State state) => this.state = state;
-        }
-
-        public void AppendToTextBox(string text, System.Drawing.Color color)
-        {
-            if (Dispatcher.CurrentDispatcher.CheckAccess())
-            {
-                output.ForeColor = color;
-                output.AppendText(text);
-            }
-            else
-                Dispatcher.CurrentDispatcher.Invoke(() =>
-                {
-                    output.ForeColor = color;
-                    output.AppendText(text);
-                });
-        }
-
-        private void UpdateConsole(string text, StreamState state)
-        {
-            /*if (c == '\r') { output.Inlines.Add(@"\r"); file.Write("\\r"); }
-                else if (c == '\n') { output.Inlines.Add(@"\n"); file.Write("\\n\n"); }
-                output.Inlines.Add(""+c);
-                file.Write(c);
-                file.Flush();
-                continue;*/
-
-            if (text != null)
-            {
-                foreach (char c in text)
-                {
-                    switch (c)
-                    {
-                        case '\r' when (state.Is(StreamState.State.BEGIN)):
-                            {
-                                state.Set(StreamState.State.READ_CARRIAGE);
-                                break;
-                            }
-
-                        case '\n' when (state.Is(StreamState.State.READ_CARRIAGE)):
-                            {
-                                if (state.buffer.Length > 0)
-                                {
-                                    string buffer = state.Fetch();
-
-                                    AppendToTextBox(buffer, state.isError ? System.Drawing.Color.Red : System.Drawing.Color.White);
-
-                                    if (!state.isError)
-                                        ProcessStringForProgressBar(buffer);
-                                }
-                                output.AppendText(Environment.NewLine);
-                                state.Clear();
-                                state.Set(StreamState.State.BEGIN);
-                                break;
-                            }
-
-                        default:
-                            if (state.Is(StreamState.State.READ_CARRIAGE) && state.HasData())
-                            {
-                                if (!String.IsNullOrEmpty(output.Lines.Last()))
-                                    output.Lines[output.Lines.Length] = string.Empty;
-
-                                string buffer = state.Fetch();
-
-                                AppendToTextBox(buffer, state.isError ? System.Drawing.Color.Red : System.Drawing.Color.White);
-
-                                if (!state.isError)
-                                    ProcessStringForProgressBar(buffer);
-
-                                state.Clear();
-                            }
-
-                            state.Set(StreamState.State.BEGIN);
-                            state.Append(c);
-                            break;
-
-                    }
-                }
-            }
-        }
-
-        #region EventHandlers
-
-        private void OnWindowClosed(object sender, FormClosedEventArgs e)
-        {
-            GracefullyTerminateProcess();
-        }
-
-        private void OnWindowLoaded(object sender, EventArgs e)
-        {
-            var hwnd = this.Handle;
-            SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_SYSMENU);
-        }
-
-        void OnProcessExit(object sender, EventArgs e)
-        {
-            //Dispatcher.CurrentDispatcher.Invoke(() => AbortButton.IsEnabled = false);
-            GracefullyTerminateProcess();
-        }
-
-        private void OnHideButton(object sender, EventArgs e)
-        {
-            ViewModels.LoggerViewModel.WindowVisible = false;
-            //TODO: this should be bound directly to WindowVisible property in two way fashion
-            // we need to study how to properly do it in XAML
-            _mainWindow.showLogWindowToolStripMenuItem.Checked = false;
-        }
-
-        private void OnClearButton(object sender, EventArgs e)
-        {
-            output.Clear();
-        }
-
-        private void OnAbortButton(object sender, EventArgs args)
-        {
-            GracefullyTerminateProcess();
-        }
-
-        private void OnStartButton(object sender, EventArgs args)
-        {
-            StartDump("cd e Gam.iso 16");
-        }
-
-        private void OnTextChanged(object sender, EventArgs e)
-        {
-            output.ScrollToCaret();
-        }
-
-        #endregion
-    }
-}

DICUI.Forms/Windows/LogWindow.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

DICUI.Forms/Windows/MainWindow.Designer.cs

@@ -1,532 +0,0 @@
-namespace DICUI.Forms.Windows
-{
-    partial class MainWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
-            this.MenuBar = new System.Windows.Forms.MenuStrip();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.mainWindowLayout = new System.Windows.Forms.TableLayoutPanel();
-            this.settingsGroupBox = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.parametersLabel = new System.Windows.Forms.Label();
-            this.driveSpeedLabel = new System.Windows.Forms.Label();
-            this.driveLetterLabel = new System.Windows.Forms.Label();
-            this.outputDirectoryLabel = new System.Windows.Forms.Label();
-            this.outputFilenameLabel = new System.Windows.Forms.Label();
-            this.systemMediaTypeLabel = new System.Windows.Forms.Label();
-            this.OutputFilenameTextBox = new System.Windows.Forms.TextBox();
-            this.SystemTypeComboBox = new System.Windows.Forms.ComboBox();
-            this.MediaTypeComboBox = new System.Windows.Forms.ComboBox();
-            this.OutputDirectoryTextBox = new System.Windows.Forms.TextBox();
-            this.OutputDirectoryBrowseButton = new System.Windows.Forms.Button();
-            this.DriveLetterComboBox = new System.Windows.Forms.ComboBox();
-            this.DriveSpeedComboBox = new System.Windows.Forms.ComboBox();
-            this.ParametersTextBox = new System.Windows.Forms.TextBox();
-            this.EnableParametersCheckBox = new System.Windows.Forms.CheckBox();
-            this.controlsGroupBox = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.StartStopButton = new System.Windows.Forms.Button();
-            this.DiscScanButton = new System.Windows.Forms.Button();
-            this.CopyProtectScanButton = new System.Windows.Forms.Button();
-            this.EjectWhenDoneCheckBox = new System.Windows.Forms.CheckBox();
-            this.statusGroupBox = new System.Windows.Forms.GroupBox();
-            this.StatusLabel = new System.Windows.Forms.TextBox();
-            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.showLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.MenuBar.SuspendLayout();
-            this.mainWindowLayout.SuspendLayout();
-            this.settingsGroupBox.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.controlsGroupBox.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            this.statusGroupBox.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // MenuBar
-            // 
-            this.MenuBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.fileToolStripMenuItem,
-            this.toolsToolStripMenuItem,
-            this.helpToolStripMenuItem});
-            this.MenuBar.Location = new System.Drawing.Point(0, 0);
-            this.MenuBar.Name = "MenuBar";
-            this.MenuBar.Size = new System.Drawing.Size(584, 24);
-            this.MenuBar.TabIndex = 0;
-            this.MenuBar.Text = "menuStrip1";
-            // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F)));
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.fileToolStripMenuItem.Text = "File";
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T)));
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // helpToolStripMenuItem
-            // 
-            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.H)));
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.helpToolStripMenuItem.Text = "Help";
-            // 
-            // mainWindowLayout
-            // 
-            this.mainWindowLayout.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.mainWindowLayout.ColumnCount = 1;
-            this.mainWindowLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.mainWindowLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.mainWindowLayout.Controls.Add(this.settingsGroupBox, 0, 0);
-            this.mainWindowLayout.Controls.Add(this.controlsGroupBox, 0, 1);
-            this.mainWindowLayout.Controls.Add(this.statusGroupBox, 0, 2);
-            this.mainWindowLayout.Location = new System.Drawing.Point(13, 28);
-            this.mainWindowLayout.Name = "mainWindowLayout";
-            this.mainWindowLayout.RowCount = 3;
-            this.mainWindowLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 82.66254F));
-            this.mainWindowLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.33746F));
-            this.mainWindowLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 47F));
-            this.mainWindowLayout.Size = new System.Drawing.Size(559, 371);
-            this.mainWindowLayout.TabIndex = 1;
-            // 
-            // settingsGroupBox
-            // 
-            this.settingsGroupBox.Controls.Add(this.tableLayoutPanel2);
-            this.settingsGroupBox.Location = new System.Drawing.Point(3, 3);
-            this.settingsGroupBox.Name = "settingsGroupBox";
-            this.settingsGroupBox.Size = new System.Drawing.Size(553, 259);
-            this.settingsGroupBox.TabIndex = 0;
-            this.settingsGroupBox.TabStop = false;
-            this.settingsGroupBox.Text = "Settings";
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 3;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.32794F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 73.67206F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 145F));
-            this.tableLayoutPanel2.Controls.Add(this.parametersLabel, 0, 5);
-            this.tableLayoutPanel2.Controls.Add(this.driveSpeedLabel, 0, 4);
-            this.tableLayoutPanel2.Controls.Add(this.driveLetterLabel, 0, 3);
-            this.tableLayoutPanel2.Controls.Add(this.outputDirectoryLabel, 0, 2);
-            this.tableLayoutPanel2.Controls.Add(this.outputFilenameLabel, 0, 1);
-            this.tableLayoutPanel2.Controls.Add(this.systemMediaTypeLabel, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.OutputFilenameTextBox, 1, 1);
-            this.tableLayoutPanel2.Controls.Add(this.SystemTypeComboBox, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.MediaTypeComboBox, 2, 0);
-            this.tableLayoutPanel2.Controls.Add(this.OutputDirectoryTextBox, 1, 2);
-            this.tableLayoutPanel2.Controls.Add(this.OutputDirectoryBrowseButton, 2, 2);
-            this.tableLayoutPanel2.Controls.Add(this.DriveLetterComboBox, 1, 3);
-            this.tableLayoutPanel2.Controls.Add(this.DriveSpeedComboBox, 1, 4);
-            this.tableLayoutPanel2.Controls.Add(this.ParametersTextBox, 1, 5);
-            this.tableLayoutPanel2.Controls.Add(this.EnableParametersCheckBox, 2, 5);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 19);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);
-            this.tableLayoutPanel2.RowCount = 6;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(553, 234);
-            this.tableLayoutPanel2.TabIndex = 0;
-            // 
-            // parametersLabel
-            // 
-            this.parametersLabel.AutoSize = true;
-            this.parametersLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.parametersLabel.Location = new System.Drawing.Point(3, 190);
-            this.parametersLabel.Name = "parametersLabel";
-            this.parametersLabel.Size = new System.Drawing.Size(101, 39);
-            this.parametersLabel.TabIndex = 10;
-            this.parametersLabel.Text = "Parameters";
-            this.parametersLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // driveSpeedLabel
-            // 
-            this.driveSpeedLabel.AutoSize = true;
-            this.driveSpeedLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.driveSpeedLabel.Location = new System.Drawing.Point(3, 153);
-            this.driveSpeedLabel.Name = "driveSpeedLabel";
-            this.driveSpeedLabel.Size = new System.Drawing.Size(101, 37);
-            this.driveSpeedLabel.TabIndex = 8;
-            this.driveSpeedLabel.Text = "Drive Speed";
-            this.driveSpeedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // driveLetterLabel
-            // 
-            this.driveLetterLabel.AutoSize = true;
-            this.driveLetterLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.driveLetterLabel.Location = new System.Drawing.Point(3, 116);
-            this.driveLetterLabel.Name = "driveLetterLabel";
-            this.driveLetterLabel.Size = new System.Drawing.Size(101, 37);
-            this.driveLetterLabel.TabIndex = 6;
-            this.driveLetterLabel.Text = "Drive Letter";
-            this.driveLetterLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // outputDirectoryLabel
-            // 
-            this.outputDirectoryLabel.AutoSize = true;
-            this.outputDirectoryLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.outputDirectoryLabel.Location = new System.Drawing.Point(3, 79);
-            this.outputDirectoryLabel.Name = "outputDirectoryLabel";
-            this.outputDirectoryLabel.Size = new System.Drawing.Size(101, 37);
-            this.outputDirectoryLabel.TabIndex = 4;
-            this.outputDirectoryLabel.Text = "Output Directory";
-            this.outputDirectoryLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // outputFilenameLabel
-            // 
-            this.outputFilenameLabel.AutoSize = true;
-            this.outputFilenameLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.outputFilenameLabel.Location = new System.Drawing.Point(3, 42);
-            this.outputFilenameLabel.Name = "outputFilenameLabel";
-            this.outputFilenameLabel.Size = new System.Drawing.Size(101, 37);
-            this.outputFilenameLabel.TabIndex = 2;
-            this.outputFilenameLabel.Text = "Output Filename";
-            this.outputFilenameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // systemMediaTypeLabel
-            // 
-            this.systemMediaTypeLabel.AutoSize = true;
-            this.systemMediaTypeLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.systemMediaTypeLabel.Location = new System.Drawing.Point(3, 5);
-            this.systemMediaTypeLabel.Name = "systemMediaTypeLabel";
-            this.systemMediaTypeLabel.Size = new System.Drawing.Size(101, 37);
-            this.systemMediaTypeLabel.TabIndex = 0;
-            this.systemMediaTypeLabel.Text = "System/Media Type";
-            this.systemMediaTypeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // OutputFilenameTextBox
-            // 
-            this.OutputFilenameTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.tableLayoutPanel2.SetColumnSpan(this.OutputFilenameTextBox, 2);
-            this.OutputFilenameTextBox.Location = new System.Drawing.Point(111, 50);
-            this.OutputFilenameTextBox.Name = "OutputFilenameTextBox";
-            this.OutputFilenameTextBox.Size = new System.Drawing.Size(438, 20);
-            this.OutputFilenameTextBox.TabIndex = 11;
-            this.OutputFilenameTextBox.TextChanged += new System.EventHandler(this.OutputFilenameTextBoxTextChanged);
-            // 
-            // SystemTypeComboBox
-            // 
-            this.SystemTypeComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.SystemTypeComboBox.DisplayMember = "Name";
-            this.SystemTypeComboBox.DropDownWidth = 250;
-            this.SystemTypeComboBox.FormattingEnabled = true;
-            this.SystemTypeComboBox.Location = new System.Drawing.Point(110, 13);
-            this.SystemTypeComboBox.Name = "SystemTypeComboBox";
-            this.SystemTypeComboBox.Size = new System.Drawing.Size(294, 21);
-            this.SystemTypeComboBox.TabIndex = 13;
-            this.SystemTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.SystemTypeComboBoxSelectionChanged);
-            // 
-            // MediaTypeComboBox
-            // 
-            this.MediaTypeComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.MediaTypeComboBox.DisplayMember = "Name";
-            this.MediaTypeComboBox.FormattingEnabled = true;
-            this.MediaTypeComboBox.Location = new System.Drawing.Point(414, 13);
-            this.MediaTypeComboBox.Name = "MediaTypeComboBox";
-            this.MediaTypeComboBox.Size = new System.Drawing.Size(131, 21);
-            this.MediaTypeComboBox.TabIndex = 14;
-            this.MediaTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.MediaTypeComboBoxSelectionChanged);
-            // 
-            // OutputDirectoryTextBox
-            // 
-            this.OutputDirectoryTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.OutputDirectoryTextBox.Location = new System.Drawing.Point(110, 87);
-            this.OutputDirectoryTextBox.Name = "OutputDirectoryTextBox";
-            this.OutputDirectoryTextBox.Size = new System.Drawing.Size(294, 20);
-            this.OutputDirectoryTextBox.TabIndex = 15;
-            this.OutputDirectoryTextBox.TextChanged += new System.EventHandler(this.OutputDirectoryTextBoxTextChanged);
-            // 
-            // OutputDirectoryBrowseButton
-            // 
-            this.OutputDirectoryBrowseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.OutputDirectoryBrowseButton.Location = new System.Drawing.Point(410, 84);
-            this.OutputDirectoryBrowseButton.Name = "OutputDirectoryBrowseButton";
-            this.OutputDirectoryBrowseButton.Size = new System.Drawing.Size(140, 26);
-            this.OutputDirectoryBrowseButton.TabIndex = 16;
-            this.OutputDirectoryBrowseButton.Text = "Browse";
-            this.OutputDirectoryBrowseButton.UseVisualStyleBackColor = true;
-            this.OutputDirectoryBrowseButton.Click += new System.EventHandler(this.OutputDirectoryBrowseButtonClick);
-            // 
-            // DriveLetterComboBox
-            // 
-            this.DriveLetterComboBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.DriveLetterComboBox.DisplayMember = "Letter";
-            this.DriveLetterComboBox.FormattingEnabled = true;
-            this.DriveLetterComboBox.Location = new System.Drawing.Point(110, 124);
-            this.DriveLetterComboBox.Name = "DriveLetterComboBox";
-            this.DriveLetterComboBox.Size = new System.Drawing.Size(121, 21);
-            this.DriveLetterComboBox.TabIndex = 17;
-            this.DriveLetterComboBox.SelectedIndexChanged += new System.EventHandler(this.DriveLetterComboBoxSelectionChanged);
-            // 
-            // DriveSpeedComboBox
-            // 
-            this.DriveSpeedComboBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.DriveSpeedComboBox.FormattingEnabled = true;
-            this.DriveSpeedComboBox.Location = new System.Drawing.Point(110, 161);
-            this.DriveSpeedComboBox.Name = "DriveSpeedComboBox";
-            this.DriveSpeedComboBox.Size = new System.Drawing.Size(121, 21);
-            this.DriveSpeedComboBox.TabIndex = 18;
-            this.DriveSpeedComboBox.SelectedIndexChanged += new System.EventHandler(this.DriveSpeedComboBoxSelectionChanged);
-            // 
-            // ParametersTextBox
-            // 
-            this.ParametersTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.ParametersTextBox.Enabled = false;
-            this.ParametersTextBox.Location = new System.Drawing.Point(110, 199);
-            this.ParametersTextBox.Name = "ParametersTextBox";
-            this.ParametersTextBox.ReadOnly = true;
-            this.ParametersTextBox.Size = new System.Drawing.Size(294, 20);
-            this.ParametersTextBox.TabIndex = 19;
-            // 
-            // EnableParametersCheckBox
-            // 
-            this.EnableParametersCheckBox.AutoSize = true;
-            this.EnableParametersCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.EnableParametersCheckBox.Location = new System.Drawing.Point(410, 193);
-            this.EnableParametersCheckBox.Name = "EnableParametersCheckBox";
-            this.EnableParametersCheckBox.Size = new System.Drawing.Size(140, 33);
-            this.EnableParametersCheckBox.TabIndex = 20;
-            this.EnableParametersCheckBox.Text = "Enable Editing";
-            this.EnableParametersCheckBox.UseVisualStyleBackColor = true;
-            this.EnableParametersCheckBox.CheckedChanged += new System.EventHandler(this.EnableParametersCheckBoxClick);
-            // 
-            // controlsGroupBox
-            // 
-            this.controlsGroupBox.Controls.Add(this.tableLayoutPanel3);
-            this.controlsGroupBox.Location = new System.Drawing.Point(3, 270);
-            this.controlsGroupBox.Name = "controlsGroupBox";
-            this.controlsGroupBox.Size = new System.Drawing.Size(553, 50);
-            this.controlsGroupBox.TabIndex = 1;
-            this.controlsGroupBox.TabStop = false;
-            this.controlsGroupBox.Text = "Controls";
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.ColumnCount = 4;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel3.Controls.Add(this.StartStopButton, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.DiscScanButton, 1, 0);
-            this.tableLayoutPanel3.Controls.Add(this.CopyProtectScanButton, 2, 0);
-            this.tableLayoutPanel3.Controls.Add(this.EjectWhenDoneCheckBox, 3, 0);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 20);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 1;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(553, 32);
-            this.tableLayoutPanel3.TabIndex = 0;
-            // 
-            // StartStopButton
-            // 
-            this.StartStopButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.StartStopButton.Enabled = false;
-            this.StartStopButton.Location = new System.Drawing.Point(3, 3);
-            this.StartStopButton.Name = "StartStopButton";
-            this.StartStopButton.Size = new System.Drawing.Size(132, 26);
-            this.StartStopButton.TabIndex = 0;
-            this.StartStopButton.Text = "Start Dumping";
-            this.StartStopButton.UseVisualStyleBackColor = true;
-            this.StartStopButton.Click += new System.EventHandler(this.StartStopButtonClick);
-            // 
-            // DiscScanButton
-            // 
-            this.DiscScanButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DiscScanButton.Location = new System.Drawing.Point(141, 3);
-            this.DiscScanButton.Name = "DiscScanButton";
-            this.DiscScanButton.Size = new System.Drawing.Size(132, 26);
-            this.DiscScanButton.TabIndex = 1;
-            this.DiscScanButton.Text = "Scan For Discs";
-            this.DiscScanButton.UseVisualStyleBackColor = true;
-            this.DiscScanButton.Click += new System.EventHandler(this.DiscScanButtonClick);
-            // 
-            // CopyProtectScanButton
-            // 
-            this.CopyProtectScanButton.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.CopyProtectScanButton.Location = new System.Drawing.Point(279, 3);
-            this.CopyProtectScanButton.Name = "CopyProtectScanButton";
-            this.CopyProtectScanButton.Size = new System.Drawing.Size(132, 26);
-            this.CopyProtectScanButton.TabIndex = 2;
-            this.CopyProtectScanButton.Text = "Scan For Protection";
-            this.CopyProtectScanButton.UseVisualStyleBackColor = true;
-            this.CopyProtectScanButton.Click += new System.EventHandler(this.CopyProtectScanButtonClick);
-            // 
-            // EjectWhenDoneCheckBox
-            // 
-            this.EjectWhenDoneCheckBox.AutoSize = true;
-            this.EjectWhenDoneCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.EjectWhenDoneCheckBox.Location = new System.Drawing.Point(417, 3);
-            this.EjectWhenDoneCheckBox.Name = "EjectWhenDoneCheckBox";
-            this.EjectWhenDoneCheckBox.Size = new System.Drawing.Size(133, 26);
-            this.EjectWhenDoneCheckBox.TabIndex = 3;
-            this.EjectWhenDoneCheckBox.Text = "Eject When Done";
-            this.EjectWhenDoneCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // statusGroupBox
-            // 
-            this.statusGroupBox.Controls.Add(this.StatusLabel);
-            this.statusGroupBox.Location = new System.Drawing.Point(3, 326);
-            this.statusGroupBox.Name = "statusGroupBox";
-            this.statusGroupBox.Size = new System.Drawing.Size(553, 42);
-            this.statusGroupBox.TabIndex = 2;
-            this.statusGroupBox.TabStop = false;
-            this.statusGroupBox.Text = "Status";
-            // 
-            // StatusLabel
-            // 
-            this.StatusLabel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.StatusLabel.Enabled = false;
-            this.StatusLabel.Location = new System.Drawing.Point(3, 16);
-            this.StatusLabel.Name = "StatusLabel";
-            this.StatusLabel.ReadOnly = true;
-            this.StatusLabel.Size = new System.Drawing.Size(547, 20);
-            this.StatusLabel.TabIndex = 0;
-            this.StatusLabel.Text = "Waiting for media...";
-            this.StatusLabel.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // exitToolStripMenuItem
-            // 
-            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X)));
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.exitToolStripMenuItem.Text = "Exit";
-            this.exitToolStripMenuItem.Click += new System.EventHandler(this.AppExitClick);
-            // 
-            // optionsToolStripMenuItem
-            // 
-            this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.O)));
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
-            this.optionsToolStripMenuItem.Text = "Options";
-            this.optionsToolStripMenuItem.Click += new System.EventHandler(this.OptionsClick);
-            // 
-            // showLogWindowToolStripMenuItem
-            // 
-            this.showLogWindowToolStripMenuItem.Checked = true;
-            this.showLogWindowToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.showLogWindowToolStripMenuItem.Name = "showLogWindowToolStripMenuItem";
-            this.showLogWindowToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.L)));
-            this.showLogWindowToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
-            this.showLogWindowToolStripMenuItem.Text = "Show Log Window";
-            // 
-            // aboutToolStripMenuItem
-            // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.A)));
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.aboutToolStripMenuItem.Text = "About";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutClick);
-            // 
-            // MainWindow
-            // 
-            this.AcceptButton = this.StartStopButton;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(584, 411);
-            this.Controls.Add(this.mainWindowLayout);
-            this.Controls.Add(this.MenuBar);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MainMenuStrip = this.MenuBar;
-            this.Name = "MainWindow";
-            this.Text = "DiscImageCreator GUI";
-            this.Activated += new System.EventHandler(this.MainWindowActivated);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindowClosing);
-            this.Load += new System.EventHandler(this.OnContentRendered);
-            this.LocationChanged += new System.EventHandler(this.MainWindowLocationChanged);
-            this.MenuBar.ResumeLayout(false);
-            this.MenuBar.PerformLayout();
-            this.mainWindowLayout.ResumeLayout(false);
-            this.settingsGroupBox.ResumeLayout(false);
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            this.controlsGroupBox.ResumeLayout(false);
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            this.statusGroupBox.ResumeLayout(false);
-            this.statusGroupBox.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.MenuStrip MenuBar;
-        private System.Windows.Forms.TableLayoutPanel mainWindowLayout;
-        private System.Windows.Forms.GroupBox settingsGroupBox;
-        private System.Windows.Forms.GroupBox controlsGroupBox;
-        private System.Windows.Forms.GroupBox statusGroupBox;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.Label systemMediaTypeLabel;
-        private System.Windows.Forms.Label parametersLabel;
-        private System.Windows.Forms.Label driveSpeedLabel;
-        private System.Windows.Forms.Label driveLetterLabel;
-        private System.Windows.Forms.Label outputDirectoryLabel;
-        private System.Windows.Forms.Label outputFilenameLabel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.Button StartStopButton;
-        private System.Windows.Forms.Button DiscScanButton;
-        private System.Windows.Forms.Button CopyProtectScanButton;
-        private System.Windows.Forms.CheckBox EjectWhenDoneCheckBox;
-        private System.Windows.Forms.TextBox OutputFilenameTextBox;
-        private System.Windows.Forms.ComboBox SystemTypeComboBox;
-        private System.Windows.Forms.ComboBox MediaTypeComboBox;
-        private System.Windows.Forms.TextBox OutputDirectoryTextBox;
-        private System.Windows.Forms.Button OutputDirectoryBrowseButton;
-        private System.Windows.Forms.ComboBox DriveLetterComboBox;
-        private System.Windows.Forms.ComboBox DriveSpeedComboBox;
-        private System.Windows.Forms.TextBox ParametersTextBox;
-        private System.Windows.Forms.CheckBox EnableParametersCheckBox;
-        private System.Windows.Forms.TextBox StatusLabel;
-        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem showLogWindowToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
-    }
-}
-

DICUI.Forms/Windows/MainWindow.cs

@@ -1,727 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Windows;
-using System.Windows.Forms;
-using DICUI.Data;
-using DICUI.Utilities;
-
-namespace DICUI.Forms.Windows
-{
-    public partial class MainWindow : Form
-    {
-        // Private UI-related variables
-        private List<Drive> _drives;
-        private MediaType? _currentMediaType;
-        private List<KnownSystem?> _systems;
-        private List<MediaType?> _mediaTypes;
-        private bool _alreadyShown;
-
-        private DumpEnvironment _env;
-
-        // Option related
-        private Options _options;
-        private OptionsWindow _optionsWindow;
-
-        private LogWindow _logWindow;
-
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            // Initializes and load Options object
-            _options = new Options();
-            _options.Load();
-            ViewModels.OptionsViewModel = new OptionsViewModel(_options);
-
-            _logWindow = new LogWindow(this);
-            ViewModels.LoggerViewModel.SetWindow(_logWindow);
-
-            // Disable buttons until we load fully
-            StartStopButton.Enabled = false;
-            DiscScanButton.Enabled = false;
-            CopyProtectScanButton.Enabled = false;
-
-            if (_options.OpenLogWindowAtStartup)
-            {
-                this.StartPosition = FormStartPosition.CenterScreen;
-                double combinedHeight = this.Height + _logWindow.Height + Constants.LogWindowMarginFromMainWindow;
-                Rectangle bounds = GetScaledCoordinates(Screen.PrimaryScreen.WorkingArea);
-
-                this.Left = (int)(bounds.Left + (bounds.Width - this.Width) / 2);
-                this.Top = (int)(bounds.Top + (bounds.Height - combinedHeight) / 2);
-            }
-        }
-
-        #region Events
-
-        private void OnContentRendered(object sender, EventArgs e)
-        {
-            if (_alreadyShown)
-                return;
-
-            _alreadyShown = true;
-
-            if (_options.OpenLogWindowAtStartup)
-            {
-                //TODO: this should be bound directly to WindowVisible property in two way fashion
-                // we need to study how to properly do it in XAML
-                showLogWindowToolStripMenuItem.Checked = true;
-                ViewModels.LoggerViewModel.WindowVisible = true;
-            }
-
-            // Populate the list of systems
-            StatusLabel.Text = "Creating system list, please wait!";
-            PopulateSystems();
-
-            // Populate the list of drives
-            StatusLabel.Text = "Creating drive list, please wait!";
-            PopulateDrives();
-
-            // Set the position of the log window
-            if (_logWindow.Visible)
-            {
-                _logWindow.AdjustPositionToMainWindow();
-                this.Focus();
-            }
-        }
-
-        private void StartStopButtonClick(object sender, EventArgs e)
-        {
-            // Dump or stop the dump
-            if (StartStopButton.Text == Constants.StartDumping)
-            {
-                StartDumping();
-            }
-            else if (StartStopButton.Text == Constants.StopDumping)
-            {
-                ViewModels.LoggerViewModel.VerboseLogLn("Canceling dumping process...");
-                _env.CancelDumping();
-                CopyProtectScanButton.Enabled = true;
-
-                if (EjectWhenDoneCheckBox.Checked == true)
-                {
-                    ViewModels.LoggerViewModel.VerboseLogLn($"Ejecting disc in drive {_env.Drive.Letter}");
-                    _env.EjectDisc();
-                }
-            }
-        }
-
-        private void OutputDirectoryBrowseButtonClick(object sender, EventArgs e)
-        {
-            BrowseFolder();
-            EnsureDiscInformation();
-        }
-
-        private void DiscScanButtonClick(object sender, EventArgs e)
-        {
-            PopulateDrives();
-        }
-
-        private void CopyProtectScanButtonClick(object sender, EventArgs e)
-        {
-            ScanAndShowProtection();
-        }
-
-        private void SystemTypeComboBoxSelectionChanged(object sender, EventArgs e)
-        {
-            // If we're on a separator, go to the next item and return
-            if ((SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem).IsHeader())
-            {
-                SystemTypeComboBox.SelectedIndex++;
-                return;
-            }
-
-            ViewModels.LoggerViewModel.VerboseLogLn("Changed system to: {0}", (SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem).Name);
-            PopulateMediaType();
-            EnsureDiscInformation();
-        }
-
-        private void MediaTypeComboBoxSelectionChanged(object sender, EventArgs e)
-        {
-            _currentMediaType = MediaTypeComboBox.SelectedItem as MediaType?;
-            SetSupportedDriveSpeed();
-            GetOutputNames();
-            EnsureDiscInformation();
-        }
-
-        private void DriveLetterComboBoxSelectionChanged(object sender, EventArgs e)
-        {
-            CacheCurrentDiscType();
-            SetCurrentDiscType();
-            GetOutputNames();
-            SetSupportedDriveSpeed();
-        }
-
-        private void DriveSpeedComboBoxSelectionChanged(object sender, EventArgs e)
-        {
-            EnsureDiscInformation();
-        }
-
-        private void OutputFilenameTextBoxTextChanged(object sender, EventArgs e)
-        {
-            EnsureDiscInformation();
-        }
-
-        private void OutputDirectoryTextBoxTextChanged(object sender, EventArgs e)
-        {
-            EnsureDiscInformation();
-        }
-
-        private void ProgressUpdated(object sender, Result value)
-        {
-            StatusLabel.Text = value.Message;
-            ViewModels.LoggerViewModel.VerboseLogLn(value.Message);
-        }
-
-        private void MainWindowLocationChanged(object sender, EventArgs e)
-        {
-            if (_logWindow.Visible)
-                _logWindow.AdjustPositionToMainWindow();
-        }
-
-        private void MainWindowActivated(object sender, EventArgs e)
-        {
-            if (!_logWindow.Visible)
-                _logWindow.BringToFront();
-            this.BringToFront();
-        }
-
-        private void MainWindowClosing(object sender, FormClosingEventArgs e)
-        {
-            if (_logWindow.Visible)
-                _logWindow.Close();
-        }
-
-        private void EnableParametersCheckBoxClick(object sender, EventArgs e)
-        {
-            if (EnableParametersCheckBox.Checked)
-            {
-                ParametersTextBox.ReadOnly = false;
-                ParametersTextBox.Enabled = true;
-            }
-            else
-            {
-                ParametersTextBox.ReadOnly = true;
-                ParametersTextBox.Enabled = false;
-                ProcessCustomParameters();
-            }
-        }
-
-        // Toolbar Events
-
-        private void AppExitClick(object sender, EventArgs e)
-        {
-            System.Windows.Application.Current.Shutdown();
-        }
-
-        private void AboutClick(object sender, EventArgs e)
-        {
-            System.Windows.MessageBox.Show($"ReignStumble - Project Lead / UI Design{Environment.NewLine}" +
-                $"darksabre76 - Project Co-Lead / Backend Design{Environment.NewLine}" +
-                $"Jakz - Feature Contributor{Environment.NewLine}" +
-                $"NHellFire - Feature Contributor{Environment.NewLine}" +
-                $"Dizzzy - Concept/Ideas/Beta tester{Environment.NewLine}", "About", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-
-        private void OptionsClick(object sender, EventArgs e)
-        {
-            // lazy initialization
-            if (_optionsWindow == null)
-            {
-                _optionsWindow = new OptionsWindow(this, _options);
-                _optionsWindow.Closed += delegate
-                {
-                    _optionsWindow = null;
-                };
-            }
-
-            _optionsWindow.Owner = this;
-            _optionsWindow.StartPosition = FormStartPosition.CenterParent;
-            _optionsWindow.RefreshSettings();
-            _optionsWindow.Show();
-        }
-
-        public void OnOptionsUpdated()
-        {
-            GetOutputNames();
-            SetSupportedDriveSpeed();
-            EnsureDiscInformation();
-        }
-
-        #endregion
-
-        #region Helpers
-
-        /// <summary>
-        /// Populate media type according to system type
-        /// </summary>
-        private void PopulateMediaType()
-        {
-            KnownSystem? currentSystem = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem;
-            if (currentSystem != null)
-            {
-                _mediaTypes = Validators.GetValidMediaTypes(currentSystem).ToList();
-
-                var comboBoxItems = new List<MediaTypeComboBoxItem>();
-                foreach (var mediaType in _mediaTypes)
-                    comboBoxItems.Add(new MediaTypeComboBoxItem(mediaType));
-
-                MediaTypeComboBox.DataSource = comboBoxItems;
-
-                MediaTypeComboBox.Enabled = _mediaTypes.Count > 1;
-                MediaTypeComboBox.SelectedIndex = (_mediaTypes.IndexOf(_currentMediaType) >= 0 ? _mediaTypes.IndexOf(_currentMediaType) : 0);
-            }
-            else
-            {
-                MediaTypeComboBox.Enabled = false;
-                MediaTypeComboBox.DataSource = null;
-                MediaTypeComboBox.SelectedIndex = -1;
-            }
-        }
-
-        /// <summary>
-        /// Get a complete list of supported systems and fill the combo box
-        /// </summary>
-        private void PopulateSystems()
-        {
-            _systems = Validators.CreateListOfSystems();
-
-            ViewModels.LoggerViewModel.VerboseLogLn("Populating systems, {0} systems found.", _systems.Count);
-
-            Dictionary<KnownSystemCategory, List<KnownSystem?>> mapping = _systems
-                .GroupBy(s => s.Category())
-                .ToDictionary(
-                    k => k.Key,
-                    v => v
-                        .OrderBy(s => s.Name())
-                        .ToList()
-                );
-
-            List<KnownSystemComboBoxItem> comboBoxItems = new List<KnownSystemComboBoxItem>();
-
-            comboBoxItems.Add(new KnownSystemComboBoxItem(KnownSystem.NONE));
-
-            foreach (var group in mapping)
-            {
-                comboBoxItems.Add(new KnownSystemComboBoxItem(group.Key));
-                group.Value.ForEach(system => comboBoxItems.Add(new KnownSystemComboBoxItem(system)));
-            }
-
-            SystemTypeComboBox.DataSource = comboBoxItems;
-            SystemTypeComboBox.SelectedIndex = 0;
-
-            StartStopButton.Enabled = false;
-        }
-
-        /// <summary>
-        /// Get a complete list of active disc drives and fill the combo box
-        /// </summary>
-        /// <remarks>TODO: Find a way for this to periodically run, or have it hook to a "drive change" event</remarks>
-        private void PopulateDrives()
-        {
-            ViewModels.LoggerViewModel.VerboseLogLn("Scanning for drives..");
-
-            // Always enable the disk scan
-            DiscScanButton.Enabled = true;
-
-            // Populate the list of drives and add it to the combo box
-            _drives = Validators.CreateListOfDrives();
-            DriveLetterComboBox.DataSource = _drives;
-
-            if (DriveLetterComboBox.Items.Count > 0)
-            {
-                int index = _drives.FindIndex(d => d.MarkedActive);
-                DriveLetterComboBox.SelectedIndex = (index != -1 ? index : 0);
-                StatusLabel.Text = "Valid drive found! Choose your Media Type";
-                StartStopButton.Enabled = true;
-                CopyProtectScanButton.Enabled = true;
-
-                ViewModels.LoggerViewModel.VerboseLogLn("Found {0} drives: {1}", _drives.Count, String.Join(", ", _drives.Select(d => d.Letter)));
-            }
-            else
-            {
-                DriveLetterComboBox.SelectedIndex = -1;
-                StatusLabel.Text = "No valid drive found!";
-                StartStopButton.Enabled = false;
-                CopyProtectScanButton.Enabled = false;
-
-                ViewModels.LoggerViewModel.VerboseLogLn("Found no drives");
-            }
-        }
-
-        /// <summary>
-        /// Browse for an output folder
-        /// </summary>
-        private void BrowseFolder()
-        {
-            FolderBrowserDialog folderDialog = new FolderBrowserDialog { ShowNewFolderButton = false, SelectedPath = System.AppDomain.CurrentDomain.BaseDirectory };
-            DialogResult result = folderDialog.ShowDialog();
-
-            if (result == DialogResult.OK)
-            {
-                OutputDirectoryTextBox.Text = folderDialog.SelectedPath;
-            }
-        }
-
-        /// <summary>
-        /// Create a DumpEnvironment with all current settings
-        /// </summary>
-        /// <returns>Filled DumpEnvironment instance</returns>
-        private DumpEnvironment DetermineEnvironment()
-        {
-            // Populate the new environment
-            var env = new DumpEnvironment()
-            {
-                // Paths to tools
-                SubdumpPath = _options.SubDumpPath,
-                DICPath = _options.DICPath,
-
-                OutputDirectory = OutputDirectoryTextBox.Text,
-                OutputFilename = OutputFilenameTextBox.Text,
-
-                // Get the currently selected options
-                Drive = DriveLetterComboBox.SelectedItem as Drive,
-
-                DICParameters = new Parameters(ParametersTextBox.Text),
-
-                QuietMode = _options.QuietMode,
-                ParanoidMode = _options.ParanoidMode,
-                ScanForProtection = _options.ScanForProtection,
-                RereadAmountC2 = _options.RereadAmountForC2,
-
-                System = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem,
-                Type = MediaTypeComboBox.SelectedItem as MediaTypeComboBoxItem,
-            };
-
-            // Fix the output paths
-            env.FixOutputPaths();
-
-            // Disable automatic reprocessing of the textboxes until we're done
-            OutputDirectoryTextBox.TextChanged -= OutputDirectoryTextBoxTextChanged;
-            OutputFilenameTextBox.TextChanged -= OutputFilenameTextBoxTextChanged;
-
-            OutputDirectoryTextBox.Text = env.OutputDirectory;
-            OutputFilenameTextBox.Text = env.OutputFilename;
-
-            OutputDirectoryTextBox.TextChanged += OutputDirectoryTextBoxTextChanged;
-            OutputFilenameTextBox.TextChanged += OutputFilenameTextBoxTextChanged;
-
-            return env;
-        }
-
-        /// <summary>
-        /// Begin the dumping process using the given inputs
-        /// </summary>
-        private async void StartDumping()
-        {
-            if (_env == null)
-                _env = DetermineEnvironment();
-
-            // If still in custom parameter mode, check that users meant to continue or not
-            if (EnableParametersCheckBox.Checked == true)
-            {
-                MessageBoxResult result = System.Windows.MessageBox.Show("It looks like you have custom parameters that have not been saved. Would you like to apply those changes before starting to dump?", "Custom Changes", MessageBoxButton.YesNoCancel, MessageBoxImage.Question);
-                if (result == MessageBoxResult.Yes)
-                {
-                    EnableParametersCheckBox.Checked = false;
-                    ParametersTextBox.Enabled = false;
-                    ProcessCustomParameters();
-                }
-                else if (result == MessageBoxResult.Cancel)
-                    return;
-                // If "No", then we continue with the current known environment
-            }
-
-            try
-            {
-                // Check for the firmware first
-                // TODO: Remove this (and method) once DIC end-to-end logging becomes a thing
-                if (!await _env.DriveHasLatestFimrware())
-                {
-                    System.Windows.MessageBox.Show($"DiscImageCreator has reported that drive {_env.Drive.Letter} is not updated to the most recent firmware. Please update the firmware for your drive and try again.", "Outdated Firmware", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                // Validate that the user explicitly wants an inactive drive to be considered for dumping
-                if (!_env.Drive.MarkedActive)
-                {
-                    MessageBoxResult mbresult = System.Windows.MessageBox.Show("The currently selected drive does not appear to contain a disc! Are you sure you want to continue?", "Missing Disc", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-                    if (mbresult == MessageBoxResult.No || mbresult == MessageBoxResult.Cancel || mbresult == MessageBoxResult.None)
-                    {
-                        ViewModels.LoggerViewModel.VerboseLogLn("Dumping aborted!");
-                        return;
-                    }
-                }
-
-                // If a complete dump already exists
-                if (_env.FoundAllFiles())
-                {
-                    MessageBoxResult mbresult = System.Windows.MessageBox.Show("A complete dump already exists! Are you sure you want to overwrite?", "Overwrite?", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-                    if (mbresult == MessageBoxResult.No || mbresult == MessageBoxResult.Cancel || mbresult == MessageBoxResult.None)
-                    {
-                        ViewModels.LoggerViewModel.VerboseLogLn("Dumping aborted!");
-                        return;
-                    }
-                }
-
-                StartStopButton.Text = Constants.StopDumping;
-                CopyProtectScanButton.Enabled = false;
-                StatusLabel.Text = "Beginning dumping process";
-                ViewModels.LoggerViewModel.VerboseLogLn("Starting dumping process..");
-
-                var progress = new Progress<Result>();
-                progress.ProgressChanged += ProgressUpdated;
-                Result result = await _env.StartDumping(progress);
-
-                StatusLabel.Text = result ? "Dumping complete!" : result.Message;
-                ViewModels.LoggerViewModel.VerboseLogLn(result ? "Dumping complete!" : result.Message);
-            }
-            catch
-            {
-                // No-op, we don't care what it was
-            }
-            finally
-            {
-                StartStopButton.Text = Constants.StartDumping;
-                CopyProtectScanButton.Enabled = true;
-            }
-
-            if (EjectWhenDoneCheckBox.Checked == true)
-            {
-                ViewModels.LoggerViewModel.VerboseLogLn($"Ejecting disc in drive {_env.Drive.Letter}");
-                _env.EjectDisc();
-            }
-        }
-
-        /// <summary>
-        /// Ensure information is consistent with the currently selected disc type
-        /// </summary>
-        private void EnsureDiscInformation()
-        {
-            // Get the current environment information
-            _env = DetermineEnvironment();
-
-            // Take care of null cases
-            if (_env.System == null)
-                _env.System = KnownSystem.NONE;
-            if (_env.Type == null)
-                _env.Type = MediaType.NONE;
-
-            // Get the status to write out
-            Result result = Validators.GetSupportStatus(_env.System, _env.Type);
-            StatusLabel.Text = result.Message;
-
-            // Set the index for the current disc type
-            SetCurrentDiscType();
-
-            StartStopButton.Enabled = result && (_drives != null && _drives.Count > 0 ? true : false);
-
-            // If we're in a type that doesn't support drive speeds
-            DriveSpeedComboBox.Enabled = _env.Type.DoesSupportDriveSpeed();
-
-            // If input params are not enabled, generate the full parameters from the environment
-            if (!ParametersTextBox.Enabled)
-            {
-                string generated = _env.GetFullParameters((int?)DriveSpeedComboBox.SelectedItem);
-                if (generated != null)
-                    ParametersTextBox.Text = generated;
-            }
-        }
-
-        /// <summary>
-        /// Get the default output directory name from the currently selected drive
-        /// </summary>
-        private void GetOutputNames()
-        {
-            Drive drive = DriveLetterComboBox.SelectedItem as Drive;
-            KnownSystem? systemType = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem;
-            MediaType? mediaType = MediaTypeComboBox.SelectedItem as MediaType?;
-
-            OutputDirectoryTextBox.Text = Path.Combine(_options.DefaultOutputPath, drive?.VolumeLabel ?? string.Empty);
-            OutputFilenameTextBox.Text = (drive?.VolumeLabel ?? "disc") + (mediaType.Extension() ?? ".bin");
-        }
-
-        /// <summary>
-        /// Scan and show copy protection for the current disc
-        /// </summary>
-        private async void ScanAndShowProtection()
-        {
-            if (_env == null)
-                _env = DetermineEnvironment();
-
-            if (_env.Drive.Letter != default(char))
-            {
-                ViewModels.LoggerViewModel.VerboseLogLn("Scanning for copy protection in {0}", _env.Drive.Letter);
-
-                var tempContent = StatusLabel.Text;
-                StatusLabel.Text = "Scanning for copy protection... this might take a while!";
-                StartStopButton.Enabled = false;
-                DiscScanButton.Enabled = false;
-                CopyProtectScanButton.Enabled = false;
-
-                string protections = await Validators.RunProtectionScanOnPath(_env.Drive.Letter + ":\\");
-                if (!ViewModels.LoggerViewModel.WindowVisible)
-                    System.Windows.MessageBox.Show(protections, "Detected Protection", MessageBoxButton.OK, MessageBoxImage.Information);
-                ViewModels.LoggerViewModel.VerboseLog("Detected the following protections in {0}:\r\n\r\n{1}", _env.Drive.Letter, protections);
-
-                StatusLabel.Text = tempContent;
-                StartStopButton.Enabled = true;
-                DiscScanButton.Enabled = true;
-                CopyProtectScanButton.Enabled = true;
-            }
-        }
-
-        /// <summary>
-        /// Set the drive speed based on reported maximum and user-defined option
-        /// </summary>
-        private void SetSupportedDriveSpeed()
-        {
-            // Set the drive speed list that's appropriate
-            var values = Constants.GetSpeedsForMediaType(_currentMediaType);
-            DriveSpeedComboBox.DataSource = values;
-            ViewModels.LoggerViewModel.VerboseLogLn("Supported media speeds: {0}", string.Join(",", values));
-
-            // Find the minimum set to compare against
-            int preferred = 100;
-            switch (_currentMediaType)
-            {
-                case MediaType.CDROM:
-                case MediaType.GDROM:
-                    preferred = _options.PreferredDumpSpeedCD;
-                    break;
-                case MediaType.DVD:
-                case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
-                case MediaType.NintendoWiiOpticalDisc:
-                    preferred = _options.PreferredDumpSpeedDVD;
-                    break;
-                case MediaType.BluRay:
-                    preferred = _options.PreferredDumpSpeedBD;
-                    break;
-                default:
-                    preferred = _options.PreferredDumpSpeedCD;
-                    break;
-            }
-
-            // Choose the lower of the two speeds between the allowed speeds and the user-defined one
-            // TODO: Inform more users about setting preferences in the settings so this comparison doesn't need to happen
-            int chosenSpeed = Math.Min(
-                values.Where(s => s <= values[values.Count / 2]).Last(),
-                preferred
-            );
-
-            // Set the selected speed
-            ViewModels.LoggerViewModel.VerboseLogLn("Setting drive speed to: {0}", chosenSpeed);
-            DriveSpeedComboBox.SelectedIndex = values.ToList().IndexOf(chosenSpeed);
-        }
-
-        /// <summary>
-        /// Cache the current disc type to internal variable
-        /// </summary>
-        private void CacheCurrentDiscType()
-        {
-            // Get the drive letter from the selected item
-            Drive drive = DriveLetterComboBox.SelectedItem as Drive;
-            if (drive == null || drive.IsFloppy)
-                return;
-
-            // Get the current optical disc type
-            if (!_options.SkipMediaTypeDetection)
-            {
-                ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
-                _currentMediaType = Validators.GetDiscType(drive.Letter);
-                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType == null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
-            }
-        }
-
-        /// <summary>
-        /// Set the current disc type in the combo box
-        /// </summary>
-        private void SetCurrentDiscType()
-        {
-            // If we have an invalid current type, we don't care and return
-            if (_currentMediaType == null || _currentMediaType == MediaType.NONE)
-                return;
-
-            // Now set the selected item, if possible
-            int index = _mediaTypes.FindIndex(kvp => kvp.Value == _currentMediaType);
-            if (index != -1)
-                MediaTypeComboBox.SelectedIndex = index;
-            else
-                StatusLabel.Text = $"Disc of type '{Converters.MediaTypeToString(_currentMediaType)}' found, but the current system does not support it!";
-        }
-
-        /// <summary>
-        /// Process the current custom parameters back into UI values
-        /// </summary>
-        private void ProcessCustomParameters()
-        {
-            _env.DICParameters = new Parameters(ParametersTextBox.Text);
-
-            int driveIndex = _drives.Select(d => d.Letter).ToList().IndexOf(_env.DICParameters.DriveLetter[0]);
-            if (driveIndex > -1)
-                DriveLetterComboBox.SelectedIndex = driveIndex;
-
-            int driveSpeed = _env.DICParameters.DriveSpeed ?? -1;
-            if (driveSpeed > 0)
-                DriveSpeedComboBox.SelectedIndex = ((IReadOnlyList<int>)(DriveSpeedComboBox.DataSource)).ToList().IndexOf(driveSpeed);
-            else
-                _env.DICParameters.DriveSpeed = (int?)DriveSpeedComboBox.SelectedValue;
-
-            string trimmedPath = _env.DICParameters.Filename?.Trim('"') ?? string.Empty;
-            string outputDirectory = Path.GetDirectoryName(trimmedPath);
-            string outputFilename = Path.GetFileName(trimmedPath);
-            if (!String.IsNullOrWhiteSpace(outputDirectory))
-                OutputDirectoryTextBox.Text = outputDirectory;
-            else
-                outputDirectory = OutputDirectoryTextBox.Text;
-            if (!String.IsNullOrWhiteSpace(outputFilename))
-                OutputFilenameTextBox.Text = outputFilename;
-            else
-                outputFilename = OutputFilenameTextBox.Text;
-
-            MediaType? mediaType = Converters.BaseCommmandToMediaType(_env.DICParameters.Command);
-            int mediaTypeIndex = _mediaTypes.IndexOf(mediaType);
-            if (mediaTypeIndex > -1)
-                MediaTypeComboBox.SelectedIndex = mediaTypeIndex;
-        }
-
-        #endregion
-
-        #region UI Helpers
-
-        /// <summary>
-        /// Get pixel coordinates based on DPI scaling
-        /// </summary>
-        /// <param name="bounds">Rectangle representing the bounds to transform</param>
-        /// <returns>Rectangle representing the scaled bounds</returns>
-        private Rectangle GetScaledCoordinates(Rectangle bounds)
-        {
-            using (Graphics g = Graphics.FromHwnd(IntPtr.Zero))
-            {
-                return new Rectangle(
-                TransformCoordinate(bounds.Left, g.DpiX),
-                TransformCoordinate(bounds.Top, g.DpiY),
-                TransformCoordinate(bounds.Width, g.DpiX),
-                TransformCoordinate(bounds.Height, g.DpiY));
-            }
-        }
-
-        /// <summary>
-        /// Transform an individual coordinate using DPI scaling
-        /// </summary>
-        /// <param name="coord">Current integer coordinate</param>
-        /// <param name="dpi">DPI scaling factor</param>
-        /// <returns>Scaled integer coordinate</returns>
-        private int TransformCoordinate(int coord, float dpi)
-        {
-            return (int)(coord / ((double)dpi / 96));
-        }
-
-        #endregion
-    }
-}

DICUI.Forms/Windows/OptionsWindow.Designer.cs

@@ -1,565 +0,0 @@
-namespace DICUI.Forms.Windows
-{
-    partial class OptionsWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.pathsGroupBox = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.DefaultOutputPathButton = new System.Windows.Forms.Button();
-            this.SubDumpPathButton = new System.Windows.Forms.Button();
-            this.discImageCreatorPathLabel = new System.Windows.Forms.Label();
-            this.subdumpPathLabel = new System.Windows.Forms.Label();
-            this.defaultOutputPathLabel = new System.Windows.Forms.Label();
-            this.DICPathTextBox = new System.Windows.Forms.TextBox();
-            this.SubDumpPathTextBox = new System.Windows.Forms.TextBox();
-            this.DefaultOutputPathTextBox = new System.Windows.Forms.TextBox();
-            this.DICPathButton = new System.Windows.Forms.Button();
-            this.preferredSpeedGroupBox = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.DumpSpeedCDLabel = new System.Windows.Forms.Label();
-            this.DumpSpeedDVDLabel = new System.Windows.Forms.Label();
-            this.DumpSpeedBDLabel = new System.Windows.Forms.Label();
-            this.DumpSpeedCDSlider = new System.Windows.Forms.TrackBar();
-            this.DumpSpeedDVDSlider = new System.Windows.Forms.TrackBar();
-            this.DumpSpeedBDSlider = new System.Windows.Forms.TrackBar();
-            this.DumpSpeedCDTextBox = new System.Windows.Forms.TextBox();
-            this.DumpSpeedDVDTextBox = new System.Windows.Forms.TextBox();
-            this.DumpSpeedBDTextBox = new System.Windows.Forms.TextBox();
-            this.optionsGroupBox = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
-            this.QuietModeCheckBox = new System.Windows.Forms.CheckBox();
-            this.AutoScanCheckBox = new System.Windows.Forms.CheckBox();
-            this.ParanoidModeCheckBox = new System.Windows.Forms.CheckBox();
-            this.SkipDetectionCheckBox = new System.Windows.Forms.CheckBox();
-            this.C2RereadTimesTextBox = new System.Windows.Forms.TextBox();
-            this.C2RereadLabel = new System.Windows.Forms.Label();
-            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
-            this.AcceptButton = new System.Windows.Forms.Button();
-            this.CancelButton = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.pathsGroupBox.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.preferredSpeedGroupBox.SuspendLayout();
-            this.tableLayoutPanel3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedCDSlider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedDVDSlider)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedBDSlider)).BeginInit();
-            this.optionsGroupBox.SuspendLayout();
-            this.tableLayoutPanel4.SuspendLayout();
-            this.tableLayoutPanel5.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Controls.Add(this.pathsGroupBox, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.preferredSpeedGroupBox, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.optionsGroupBox, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel5, 0, 3);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 12);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 4;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 150F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(475, 417);
-            this.tableLayoutPanel1.TabIndex = 0;
-            this.tableLayoutPanel1.UseWaitCursor = true;
-            // 
-            // pathsGroupBox
-            // 
-            this.pathsGroupBox.Controls.Add(this.tableLayoutPanel2);
-            this.pathsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pathsGroupBox.Location = new System.Drawing.Point(3, 3);
-            this.pathsGroupBox.Name = "pathsGroupBox";
-            this.pathsGroupBox.Size = new System.Drawing.Size(469, 121);
-            this.pathsGroupBox.TabIndex = 0;
-            this.pathsGroupBox.TabStop = false;
-            this.pathsGroupBox.Text = "Paths";
-            this.pathsGroupBox.UseWaitCursor = true;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 3;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 29.41176F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.82353F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.76471F));
-            this.tableLayoutPanel2.Controls.Add(this.DefaultOutputPathButton, 2, 2);
-            this.tableLayoutPanel2.Controls.Add(this.SubDumpPathButton, 2, 1);
-            this.tableLayoutPanel2.Controls.Add(this.discImageCreatorPathLabel, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.subdumpPathLabel, 0, 1);
-            this.tableLayoutPanel2.Controls.Add(this.defaultOutputPathLabel, 0, 2);
-            this.tableLayoutPanel2.Controls.Add(this.DICPathTextBox, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.SubDumpPathTextBox, 1, 1);
-            this.tableLayoutPanel2.Controls.Add(this.DefaultOutputPathTextBox, 1, 2);
-            this.tableLayoutPanel2.Controls.Add(this.DICPathButton, 2, 0);
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 15);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 3;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(457, 100);
-            this.tableLayoutPanel2.TabIndex = 0;
-            this.tableLayoutPanel2.UseWaitCursor = true;
-            // 
-            // DefaultOutputPathButton
-            // 
-            this.DefaultOutputPathButton.Location = new System.Drawing.Point(405, 69);
-            this.DefaultOutputPathButton.Name = "DefaultOutputPathButton";
-            this.DefaultOutputPathButton.Size = new System.Drawing.Size(49, 23);
-            this.DefaultOutputPathButton.TabIndex = 8;
-            this.DefaultOutputPathButton.Text = "...";
-            this.DefaultOutputPathButton.UseVisualStyleBackColor = true;
-            this.DefaultOutputPathButton.UseWaitCursor = true;
-            this.DefaultOutputPathButton.Click += new System.EventHandler(this.BrowseForPathClick);
-            // 
-            // SubDumpPathButton
-            // 
-            this.SubDumpPathButton.Location = new System.Drawing.Point(405, 36);
-            this.SubDumpPathButton.Name = "SubDumpPathButton";
-            this.SubDumpPathButton.Size = new System.Drawing.Size(49, 23);
-            this.SubDumpPathButton.TabIndex = 7;
-            this.SubDumpPathButton.Text = "...";
-            this.SubDumpPathButton.UseVisualStyleBackColor = true;
-            this.SubDumpPathButton.UseWaitCursor = true;
-            this.SubDumpPathButton.Click += new System.EventHandler(this.BrowseForPathClick);
-            // 
-            // discImageCreatorPathLabel
-            // 
-            this.discImageCreatorPathLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.discImageCreatorPathLabel.AutoSize = true;
-            this.discImageCreatorPathLabel.Cursor = System.Windows.Forms.Cursors.WaitCursor;
-            this.discImageCreatorPathLabel.Location = new System.Drawing.Point(15, 10);
-            this.discImageCreatorPathLabel.Name = "discImageCreatorPathLabel";
-            this.discImageCreatorPathLabel.Size = new System.Drawing.Size(116, 13);
-            this.discImageCreatorPathLabel.TabIndex = 0;
-            this.discImageCreatorPathLabel.Text = "DiscImageCreator Path";
-            // 
-            // subdumpPathLabel
-            // 
-            this.subdumpPathLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.subdumpPathLabel.AutoSize = true;
-            this.subdumpPathLabel.Location = new System.Drawing.Point(56, 43);
-            this.subdumpPathLabel.Name = "subdumpPathLabel";
-            this.subdumpPathLabel.Size = new System.Drawing.Size(75, 13);
-            this.subdumpPathLabel.TabIndex = 1;
-            this.subdumpPathLabel.Text = "subdump Path";
-            this.subdumpPathLabel.UseWaitCursor = true;
-            // 
-            // defaultOutputPathLabel
-            // 
-            this.defaultOutputPathLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.defaultOutputPathLabel.AutoSize = true;
-            this.defaultOutputPathLabel.Location = new System.Drawing.Point(30, 76);
-            this.defaultOutputPathLabel.Name = "defaultOutputPathLabel";
-            this.defaultOutputPathLabel.Size = new System.Drawing.Size(101, 13);
-            this.defaultOutputPathLabel.TabIndex = 2;
-            this.defaultOutputPathLabel.Text = "Default Output Path";
-            this.defaultOutputPathLabel.UseWaitCursor = true;
-            // 
-            // DICPathTextBox
-            // 
-            this.DICPathTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.DICPathTextBox.Location = new System.Drawing.Point(138, 6);
-            this.DICPathTextBox.Name = "DICPathTextBox";
-            this.DICPathTextBox.Size = new System.Drawing.Size(259, 20);
-            this.DICPathTextBox.TabIndex = 3;
-            this.DICPathTextBox.UseWaitCursor = true;
-            // 
-            // SubDumpPathTextBox
-            // 
-            this.SubDumpPathTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.SubDumpPathTextBox.Location = new System.Drawing.Point(138, 39);
-            this.SubDumpPathTextBox.Name = "SubDumpPathTextBox";
-            this.SubDumpPathTextBox.Size = new System.Drawing.Size(259, 20);
-            this.SubDumpPathTextBox.TabIndex = 4;
-            this.SubDumpPathTextBox.UseWaitCursor = true;
-            // 
-            // DefaultOutputPathTextBox
-            // 
-            this.DefaultOutputPathTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.DefaultOutputPathTextBox.Location = new System.Drawing.Point(138, 73);
-            this.DefaultOutputPathTextBox.Name = "DefaultOutputPathTextBox";
-            this.DefaultOutputPathTextBox.Size = new System.Drawing.Size(259, 20);
-            this.DefaultOutputPathTextBox.TabIndex = 5;
-            this.DefaultOutputPathTextBox.UseWaitCursor = true;
-            // 
-            // DICPathButton
-            // 
-            this.DICPathButton.Location = new System.Drawing.Point(405, 3);
-            this.DICPathButton.Name = "DICPathButton";
-            this.DICPathButton.Size = new System.Drawing.Size(49, 23);
-            this.DICPathButton.TabIndex = 6;
-            this.DICPathButton.Text = "...";
-            this.DICPathButton.UseVisualStyleBackColor = true;
-            this.DICPathButton.UseWaitCursor = true;
-            this.DICPathButton.Click += new System.EventHandler(this.BrowseForPathClick);
-            // 
-            // preferredSpeedGroupBox
-            // 
-            this.preferredSpeedGroupBox.Controls.Add(this.tableLayoutPanel3);
-            this.preferredSpeedGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.preferredSpeedGroupBox.Location = new System.Drawing.Point(3, 130);
-            this.preferredSpeedGroupBox.Name = "preferredSpeedGroupBox";
-            this.preferredSpeedGroupBox.Size = new System.Drawing.Size(469, 144);
-            this.preferredSpeedGroupBox.TabIndex = 1;
-            this.preferredSpeedGroupBox.TabStop = false;
-            this.preferredSpeedGroupBox.Text = "Preferred Dump Speed";
-            this.preferredSpeedGroupBox.UseWaitCursor = true;
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.ColumnCount = 3;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedCDLabel, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedDVDLabel, 0, 1);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedBDLabel, 0, 2);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedCDSlider, 1, 0);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedDVDSlider, 1, 1);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedBDSlider, 1, 2);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedCDTextBox, 2, 0);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedDVDTextBox, 2, 1);
-            this.tableLayoutPanel3.Controls.Add(this.DumpSpeedBDTextBox, 2, 2);
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 19);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 3;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(457, 119);
-            this.tableLayoutPanel3.TabIndex = 0;
-            this.tableLayoutPanel3.UseWaitCursor = true;
-            // 
-            // DumpSpeedCDLabel
-            // 
-            this.DumpSpeedCDLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.DumpSpeedCDLabel.AutoSize = true;
-            this.DumpSpeedCDLabel.Location = new System.Drawing.Point(3, 13);
-            this.DumpSpeedCDLabel.Name = "DumpSpeedCDLabel";
-            this.DumpSpeedCDLabel.Size = new System.Drawing.Size(50, 13);
-            this.DumpSpeedCDLabel.TabIndex = 0;
-            this.DumpSpeedCDLabel.Text = "CD-ROM";
-            this.DumpSpeedCDLabel.UseWaitCursor = true;
-            // 
-            // DumpSpeedDVDLabel
-            // 
-            this.DumpSpeedDVDLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.DumpSpeedDVDLabel.AutoSize = true;
-            this.DumpSpeedDVDLabel.Location = new System.Drawing.Point(3, 52);
-            this.DumpSpeedDVDLabel.Name = "DumpSpeedDVDLabel";
-            this.DumpSpeedDVDLabel.Size = new System.Drawing.Size(58, 13);
-            this.DumpSpeedDVDLabel.TabIndex = 1;
-            this.DumpSpeedDVDLabel.Text = "DVD-ROM";
-            this.DumpSpeedDVDLabel.UseWaitCursor = true;
-            // 
-            // DumpSpeedBDLabel
-            // 
-            this.DumpSpeedBDLabel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.DumpSpeedBDLabel.AutoSize = true;
-            this.DumpSpeedBDLabel.Location = new System.Drawing.Point(3, 92);
-            this.DumpSpeedBDLabel.Name = "DumpSpeedBDLabel";
-            this.DumpSpeedBDLabel.Size = new System.Drawing.Size(50, 13);
-            this.DumpSpeedBDLabel.TabIndex = 2;
-            this.DumpSpeedBDLabel.Text = "BD-ROM";
-            this.DumpSpeedBDLabel.UseWaitCursor = true;
-            // 
-            // DumpSpeedCDSlider
-            // 
-            this.DumpSpeedCDSlider.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DumpSpeedCDSlider.Location = new System.Drawing.Point(83, 3);
-            this.DumpSpeedCDSlider.Name = "DumpSpeedCDSlider";
-            this.DumpSpeedCDSlider.Size = new System.Drawing.Size(331, 33);
-            this.DumpSpeedCDSlider.TabIndex = 3;
-            this.DumpSpeedCDSlider.UseWaitCursor = true;
-            this.DumpSpeedCDSlider.Value = 1;
-            this.DumpSpeedCDSlider.Scroll += new System.EventHandler(this.SliderChanged);
-            // 
-            // DumpSpeedDVDSlider
-            // 
-            this.DumpSpeedDVDSlider.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DumpSpeedDVDSlider.Location = new System.Drawing.Point(83, 42);
-            this.DumpSpeedDVDSlider.Name = "DumpSpeedDVDSlider";
-            this.DumpSpeedDVDSlider.Size = new System.Drawing.Size(331, 33);
-            this.DumpSpeedDVDSlider.TabIndex = 4;
-            this.DumpSpeedDVDSlider.UseWaitCursor = true;
-            this.DumpSpeedDVDSlider.Value = 1;
-            this.DumpSpeedDVDSlider.Scroll += new System.EventHandler(this.SliderChanged);
-            // 
-            // DumpSpeedBDSlider
-            // 
-            this.DumpSpeedBDSlider.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DumpSpeedBDSlider.Location = new System.Drawing.Point(83, 81);
-            this.DumpSpeedBDSlider.Name = "DumpSpeedBDSlider";
-            this.DumpSpeedBDSlider.Size = new System.Drawing.Size(331, 35);
-            this.DumpSpeedBDSlider.TabIndex = 5;
-            this.DumpSpeedBDSlider.UseWaitCursor = true;
-            this.DumpSpeedBDSlider.Value = 1;
-            this.DumpSpeedBDSlider.Scroll += new System.EventHandler(this.SliderChanged);
-            // 
-            // DumpSpeedCDTextBox
-            // 
-            this.DumpSpeedCDTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.DumpSpeedCDTextBox.Enabled = false;
-            this.DumpSpeedCDTextBox.Location = new System.Drawing.Point(420, 9);
-            this.DumpSpeedCDTextBox.Name = "DumpSpeedCDTextBox";
-            this.DumpSpeedCDTextBox.ReadOnly = true;
-            this.DumpSpeedCDTextBox.Size = new System.Drawing.Size(34, 20);
-            this.DumpSpeedCDTextBox.TabIndex = 6;
-            this.DumpSpeedCDTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.DumpSpeedCDTextBox.UseWaitCursor = true;
-            // 
-            // DumpSpeedDVDTextBox
-            // 
-            this.DumpSpeedDVDTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.DumpSpeedDVDTextBox.Enabled = false;
-            this.DumpSpeedDVDTextBox.Location = new System.Drawing.Point(420, 48);
-            this.DumpSpeedDVDTextBox.Name = "DumpSpeedDVDTextBox";
-            this.DumpSpeedDVDTextBox.ReadOnly = true;
-            this.DumpSpeedDVDTextBox.Size = new System.Drawing.Size(34, 20);
-            this.DumpSpeedDVDTextBox.TabIndex = 7;
-            this.DumpSpeedDVDTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.DumpSpeedDVDTextBox.UseWaitCursor = true;
-            // 
-            // DumpSpeedBDTextBox
-            // 
-            this.DumpSpeedBDTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.DumpSpeedBDTextBox.Enabled = false;
-            this.DumpSpeedBDTextBox.Location = new System.Drawing.Point(420, 88);
-            this.DumpSpeedBDTextBox.Name = "DumpSpeedBDTextBox";
-            this.DumpSpeedBDTextBox.ReadOnly = true;
-            this.DumpSpeedBDTextBox.Size = new System.Drawing.Size(34, 20);
-            this.DumpSpeedBDTextBox.TabIndex = 8;
-            this.DumpSpeedBDTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.DumpSpeedBDTextBox.UseWaitCursor = true;
-            // 
-            // optionsGroupBox
-            // 
-            this.optionsGroupBox.Controls.Add(this.tableLayoutPanel4);
-            this.optionsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.optionsGroupBox.Location = new System.Drawing.Point(3, 280);
-            this.optionsGroupBox.Name = "optionsGroupBox";
-            this.optionsGroupBox.Size = new System.Drawing.Size(469, 94);
-            this.optionsGroupBox.TabIndex = 2;
-            this.optionsGroupBox.TabStop = false;
-            this.optionsGroupBox.Text = "Options";
-            // 
-            // tableLayoutPanel4
-            // 
-            this.tableLayoutPanel4.ColumnCount = 4;
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel4.Controls.Add(this.QuietModeCheckBox, 0, 0);
-            this.tableLayoutPanel4.Controls.Add(this.AutoScanCheckBox, 0, 1);
-            this.tableLayoutPanel4.Controls.Add(this.ParanoidModeCheckBox, 1, 0);
-            this.tableLayoutPanel4.Controls.Add(this.SkipDetectionCheckBox, 2, 1);
-            this.tableLayoutPanel4.Controls.Add(this.C2RereadTimesTextBox, 3, 0);
-            this.tableLayoutPanel4.Controls.Add(this.C2RereadLabel, 2, 0);
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(6, 19);
-            this.tableLayoutPanel4.Name = "tableLayoutPanel4";
-            this.tableLayoutPanel4.RowCount = 2;
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(457, 69);
-            this.tableLayoutPanel4.TabIndex = 0;
-            // 
-            // QuietModeCheckBox
-            // 
-            this.QuietModeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.QuietModeCheckBox.AutoSize = true;
-            this.QuietModeCheckBox.Location = new System.Drawing.Point(3, 8);
-            this.QuietModeCheckBox.Name = "QuietModeCheckBox";
-            this.QuietModeCheckBox.Size = new System.Drawing.Size(81, 17);
-            this.QuietModeCheckBox.TabIndex = 0;
-            this.QuietModeCheckBox.Text = "Quiet Mode";
-            this.QuietModeCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // AutoScanCheckBox
-            // 
-            this.AutoScanCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.AutoScanCheckBox.AutoSize = true;
-            this.tableLayoutPanel4.SetColumnSpan(this.AutoScanCheckBox, 2);
-            this.AutoScanCheckBox.Location = new System.Drawing.Point(3, 43);
-            this.AutoScanCheckBox.Name = "AutoScanCheckBox";
-            this.AutoScanCheckBox.Size = new System.Drawing.Size(182, 17);
-            this.AutoScanCheckBox.TabIndex = 1;
-            this.AutoScanCheckBox.Text = "Automatically Scan for Protection";
-            this.AutoScanCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // ParanoidModeCheckBox
-            // 
-            this.ParanoidModeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.ParanoidModeCheckBox.AutoSize = true;
-            this.ParanoidModeCheckBox.Location = new System.Drawing.Point(117, 8);
-            this.ParanoidModeCheckBox.Name = "ParanoidModeCheckBox";
-            this.ParanoidModeCheckBox.Size = new System.Drawing.Size(98, 17);
-            this.ParanoidModeCheckBox.TabIndex = 2;
-            this.ParanoidModeCheckBox.Text = "Paranoid Mode";
-            this.ParanoidModeCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // SkipDetectionCheckBox
-            // 
-            this.SkipDetectionCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.SkipDetectionCheckBox.AutoSize = true;
-            this.tableLayoutPanel4.SetColumnSpan(this.SkipDetectionCheckBox, 2);
-            this.SkipDetectionCheckBox.Location = new System.Drawing.Point(231, 43);
-            this.SkipDetectionCheckBox.Name = "SkipDetectionCheckBox";
-            this.SkipDetectionCheckBox.Size = new System.Drawing.Size(155, 17);
-            this.SkipDetectionCheckBox.TabIndex = 3;
-            this.SkipDetectionCheckBox.Text = "Skip Media Type Detection";
-            this.SkipDetectionCheckBox.UseVisualStyleBackColor = true;
-            // 
-            // C2RereadTimesTextBox
-            // 
-            this.C2RereadTimesTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.C2RereadTimesTextBox.Location = new System.Drawing.Point(349, 7);
-            this.C2RereadTimesTextBox.Name = "C2RereadTimesTextBox";
-            this.C2RereadTimesTextBox.Size = new System.Drawing.Size(100, 20);
-            this.C2RereadTimesTextBox.TabIndex = 4;
-            // 
-            // C2RereadLabel
-            // 
-            this.C2RereadLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.C2RereadLabel.AutoSize = true;
-            this.C2RereadLabel.Location = new System.Drawing.Point(250, 10);
-            this.C2RereadLabel.Name = "C2RereadLabel";
-            this.C2RereadLabel.Size = new System.Drawing.Size(89, 13);
-            this.C2RereadLabel.TabIndex = 5;
-            this.C2RereadLabel.Text = "C2 Reread Times";
-            // 
-            // tableLayoutPanel5
-            // 
-            this.tableLayoutPanel5.ColumnCount = 2;
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel5.Controls.Add(this.AcceptButton, 0, 0);
-            this.tableLayoutPanel5.Controls.Add(this.CancelButton, 1, 0);
-            this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 380);
-            this.tableLayoutPanel5.Name = "tableLayoutPanel5";
-            this.tableLayoutPanel5.RowCount = 1;
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel5.Size = new System.Drawing.Size(469, 34);
-            this.tableLayoutPanel5.TabIndex = 3;
-            // 
-            // AcceptButton
-            // 
-            this.AcceptButton.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.AcceptButton.Location = new System.Drawing.Point(79, 5);
-            this.AcceptButton.Name = "AcceptButton";
-            this.AcceptButton.Size = new System.Drawing.Size(75, 23);
-            this.AcceptButton.TabIndex = 0;
-            this.AcceptButton.Text = "Accept";
-            this.AcceptButton.UseVisualStyleBackColor = true;
-            this.AcceptButton.Click += new System.EventHandler(this.OnAcceptClick);
-            // 
-            // CancelButton
-            // 
-            this.CancelButton.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.CancelButton.Location = new System.Drawing.Point(314, 5);
-            this.CancelButton.Name = "CancelButton";
-            this.CancelButton.Size = new System.Drawing.Size(75, 23);
-            this.CancelButton.TabIndex = 1;
-            this.CancelButton.Text = "Cancel";
-            this.CancelButton.UseVisualStyleBackColor = true;
-            this.CancelButton.Click += new System.EventHandler(this.OnCancelClick);
-            // 
-            // OptionsWindow
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(499, 441);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Name = "OptionsWindow";
-            this.ShowIcon = false;
-            this.Text = "Options";
-            this.UseWaitCursor = true;
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.pathsGroupBox.ResumeLayout(false);
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
-            this.preferredSpeedGroupBox.ResumeLayout(false);
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedCDSlider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedDVDSlider)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DumpSpeedBDSlider)).EndInit();
-            this.optionsGroupBox.ResumeLayout(false);
-            this.tableLayoutPanel4.ResumeLayout(false);
-            this.tableLayoutPanel4.PerformLayout();
-            this.tableLayoutPanel5.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.GroupBox pathsGroupBox;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private System.Windows.Forms.Label discImageCreatorPathLabel;
-        private System.Windows.Forms.Label subdumpPathLabel;
-        private System.Windows.Forms.Label defaultOutputPathLabel;
-        private System.Windows.Forms.TextBox DICPathTextBox;
-        private System.Windows.Forms.TextBox SubDumpPathTextBox;
-        private System.Windows.Forms.TextBox DefaultOutputPathTextBox;
-        private System.Windows.Forms.Button DICPathButton;
-        private System.Windows.Forms.Button DefaultOutputPathButton;
-        private System.Windows.Forms.Button SubDumpPathButton;
-        private System.Windows.Forms.GroupBox preferredSpeedGroupBox;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.Label DumpSpeedCDLabel;
-        private System.Windows.Forms.Label DumpSpeedDVDLabel;
-        private System.Windows.Forms.Label DumpSpeedBDLabel;
-        private System.Windows.Forms.TrackBar DumpSpeedCDSlider;
-        private System.Windows.Forms.TrackBar DumpSpeedDVDSlider;
-        private System.Windows.Forms.TrackBar DumpSpeedBDSlider;
-        private System.Windows.Forms.TextBox DumpSpeedCDTextBox;
-        private System.Windows.Forms.TextBox DumpSpeedDVDTextBox;
-        private System.Windows.Forms.TextBox DumpSpeedBDTextBox;
-        private System.Windows.Forms.GroupBox optionsGroupBox;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
-        private System.Windows.Forms.CheckBox QuietModeCheckBox;
-        private System.Windows.Forms.CheckBox AutoScanCheckBox;
-        private System.Windows.Forms.CheckBox ParanoidModeCheckBox;
-        private System.Windows.Forms.CheckBox SkipDetectionCheckBox;
-        private System.Windows.Forms.TextBox C2RereadTimesTextBox;
-        private System.Windows.Forms.Label C2RereadLabel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
-        private System.Windows.Forms.Button AcceptButton;
-        private System.Windows.Forms.Button CancelButton;
-    }
-}

DICUI.Forms/Windows/OptionsWindow.cs

@@ -1,179 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows;
-using System.Windows.Forms;
-
-namespace DICUI.Forms.Windows
-{
-    /// <summary>
-    /// Interaction logic for OptionsWindow
-    /// </summary>
-    public partial class OptionsWindow : Form
-    {
-        private readonly MainWindow _mainWindow;
-        private readonly Options _options;
-
-        public OptionsWindow(MainWindow mainWindow, Options options)
-        {
-            InitializeComponent();
-            _mainWindow = mainWindow;
-            _options = options;
-
-            // Create data sets
-            DumpSpeedCDSlider.Minimum = (int)Constants.SpeedsForCDAsCollection.First();
-            DumpSpeedCDSlider.Maximum = (int)Constants.SpeedsForCDAsCollection.Last();
-            DumpSpeedDVDSlider.Minimum = (int)Constants.SpeedsForDVDAsCollection.First();
-            DumpSpeedDVDSlider.Maximum = (int)Constants.SpeedsForDVDAsCollection.Last();
-            DumpSpeedBDSlider.Minimum = (int)Constants.SpeedsForBDAsCollection.First();
-            DumpSpeedBDSlider.Maximum = (int)Constants.SpeedsForBDAsCollection.Last();
-
-            // Select the current values
-            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
-
-            // Create textbox outputs
-            DumpSpeedCDTextBox.Text = DumpSpeedCDSlider.Value.ToString();
-            DumpSpeedDVDTextBox.Text = DumpSpeedDVDSlider.Value.ToString();
-            DumpSpeedBDTextBox.Text = DumpSpeedBDSlider.Value.ToString();
-
-            // Set options
-            QuietModeCheckBox.Checked = _options.QuietMode;
-            ParanoidModeCheckBox.Checked = _options.ParanoidMode;
-            C2RereadTimesTextBox.Text = _options.RereadAmountForC2.ToString();
-            AutoScanCheckBox.Checked = _options.ScanForProtection;
-            SkipDetectionCheckBox.Checked = _options.SkipMediaTypeDetection;
-        }
-
-        private OpenFileDialog CreateOpenFileDialog()
-        {
-            OpenFileDialog dialog = new OpenFileDialog();
-
-            dialog.InitialDirectory = AppDomain.CurrentDomain.BaseDirectory;
-            dialog.Filter = "Executables (*.exe)|*.exe";
-            dialog.FilterIndex = 0;
-            dialog.RestoreDirectory = true;
-
-            return dialog;
-        }
-
-        private FolderBrowserDialog CreateFolderBrowserDialog()
-        {
-            FolderBrowserDialog dialog = new FolderBrowserDialog();
-            return dialog;
-        }
-
-        private string[] PathSettings()
-        {
-            string[] pathSettings = { "DefaultOutputPath", "DICPath", "SubDumpPath" };
-            return pathSettings;
-        }
-
-        private TextBox TextBoxForPathSetting(string name)
-        {
-            switch (name)
-            {
-                case "DICPath":
-                    return DICPathTextBox;
-                case "SubDumpPath":
-                    return SubDumpPathTextBox;
-                case "DefaultOutputPath":
-                    return DefaultOutputPathTextBox;
-                default:
-                    return null;
-            }
-        }
-
-        private void BrowseForPathClick(object sender, EventArgs e)
-        {
-            Button button = sender as Button;
-            // strips button prefix to obtain the setting name
-            string pathSettingName = button.Name.Substring(0, button.Name.IndexOf("Button"));
-
-            // TODO: hack for now, then we'll see
-            bool shouldBrowseForPath = pathSettingName == "DefaultOutputPath";
-
-            CommonDialog dialog = shouldBrowseForPath ? (CommonDialog)CreateFolderBrowserDialog() : CreateOpenFileDialog();
-            using (dialog)
-            {
-                DialogResult result = dialog.ShowDialog();
-
-                if (result == System.Windows.Forms.DialogResult.OK)
-                {
-                    string path;
-                    bool exists;
-
-                    if (shouldBrowseForPath)
-                    {
-                        path = (dialog as FolderBrowserDialog).SelectedPath;
-                        exists = Directory.Exists(path);
-                    }
-                    else
-                    {
-                        path = (dialog as OpenFileDialog).FileName;
-                        exists = File.Exists(path);
-                    }
-
-                    if (exists)
-                        TextBoxForPathSetting(pathSettingName).Text = path;
-                    else
-                    {
-                        System.Windows.MessageBox.Show(
-                            "Specified path doesn't exists!",
-                            "Error",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error
-                        );
-                    }
-                }
-            }
-        }
-
-        public void RefreshSettings()
-        {
-            Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting));
-
-            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
-        }
-
-        #region Event Handlers
-
-        private void SliderChanged(object sender, EventArgs e)
-        {
-            DumpSpeedCDTextBox.Text = DumpSpeedCDSlider.Value.ToString();
-            DumpSpeedDVDTextBox.Text = DumpSpeedDVDSlider.Value.ToString();
-            DumpSpeedBDTextBox.Text = DumpSpeedBDSlider.Value.ToString();
-        }
-
-        private void OnAcceptClick(object sender, EventArgs e)
-        {
-            Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text));
-
-            _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
-            _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
-            _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
-
-            _options.QuietMode = QuietModeCheckBox.Checked;
-            _options.ParanoidMode = ParanoidModeCheckBox.Checked;
-            _options.RereadAmountForC2 = Convert.ToInt32(C2RereadTimesTextBox.Text);
-            _options.ScanForProtection = AutoScanCheckBox.Checked;
-            _options.SkipMediaTypeDetection = SkipDetectionCheckBox.Checked;
-
-            _options.Save();
-            Hide();
-
-            _mainWindow.OnOptionsUpdated();
-        }
-
-        private void OnCancelClick(object sender, EventArgs e)
-        {
-            // just hide the window and don't care
-            Hide();
-        }
-
-        #endregion
-    }
-}

DICUI.Forms/Windows/OptionsWindow.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

DICUI.Library/DICUI.Library.csproj

@@ -1,79 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{51AB0928-13F9-44BF-A407-B6957A43A056}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DICUI.Library</RootNamespace>
-    <AssemblyName>DICUI.Library</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="BurnOutSharp, Version=1.3.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\BurnOutSharp.1.3.7.1\lib\net461\BurnOutSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="LessIO, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LessIO.0.5.0\lib\net40\LessIO.dll</HintPath>
-    </Reference>
-    <Reference Include="libmspackn, Version=0.8.0.0, Culture=neutral, processorArchitecture=x86">
-      <HintPath>..\packages\libmspack4n.0.8.0\lib\net40\libmspackn.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
-      <HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Data\Constants.cs" />
-    <Compile Include="Data\Enumerations.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\Converters.cs" />
-    <Compile Include="Utilities\DumpEnvironment.cs" />
-    <Compile Include="Utilities\Extensions.cs" />
-    <Compile Include="Utilities\Parameters.cs" />
-    <Compile Include="Utilities\Result.cs" />
-    <Compile Include="Utilities\Validators.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="mspack.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+  
   <ItemGroup>
     <COMReference Include="IMAPI2">
       <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>
@@ -94,8 +26,15 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="BurnOutSharp" Version="1.3.8.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="System.Management" Version="4.6.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+  <ItemGroup>
+    <Reference Include="System.Management" />
+  </ItemGroup>
+
+</Project>

DICUI.Library/Data/Constants.cs

@@ -11,6 +11,7 @@
         public const string CompactDisc = "cd";
         public const string Data = "data";
         public const string DigitalVideoDisc = "dvd";
+        public const string Disk = "disk";
         public const string DriveSpeed = "ls";
         public const string Eject = "eject";
         public const string Floppy = "fd";
@@ -18,6 +19,7 @@
         public const string MDS = "mds";
         public const string Merge = "merge";
         public const string Reset = "reset";
+        public const string SACD = "sacd";
         public const string Start = "start";
         public const string Stop = "stop";
         public const string Sub = "sub";
@@ -35,6 +37,7 @@
     {
         public const string AddOffset = "/a";
         public const string AMSF = "/p";
+        public const string AtariJaguar = "/aj";
         public const string BEOpcode = "/be";
         public const string C2Opcode = "/c2";
         public const string CopyrightManagementInformation = "/c";
@@ -46,8 +49,9 @@
         public const string NoFixSubP = "/np";
         public const string NoFixSubQ = "/nq";
         public const string NoFixSubQLibCrypt = "/nl";
-        public const string NoFixSubQSecuROM = "/ns";
         public const string NoFixSubRtoW = "/nr";
+        public const string NoFixSubQSecuROM = "/ns";
+        public const string NoSkipSS = "/nss";
         public const string Raw = "/raw";
         public const string Reverse = "/r";
         public const string ScanAntiMod = "/am";
@@ -56,6 +60,8 @@
         public const string SeventyFour = "/74";
         public const string SkipSector = "/sk";
         public const string SubchannelReadLevel = "/s";
+        public const string VideoNow = "/vn";
+        public const string VideoNowColor = "/vnc";
     }
 
     /// <summary>
@@ -66,6 +72,7 @@
         // Manual information
 
         public const string TitleField = "Title";
+        public const string ForeignTitleField = "Foreign Title (Non-latin)";
         public const string DiscNumberField = "Disc Number / Letter";
         public const string DiscTitleField = "Disc Title";
         public const string SystemField = "System";
@@ -73,13 +80,16 @@
         public const string CategoryField = "Category";
         public const string RegionField = "Region";
         public const string LanguagesField = "Languages";
+        public const string PlaystationLanguageSelectionViaField = "Language Selection Via";
         public const string DiscSerialField = "Disc Serial";
         public const string BarcodeField = "Barcode";
-        public const string ISBNField = "ISBN";
         public const string CommentsField = "Comments";
         public const string ContentsField = "Contents";
         public const string VersionField = "Version";
         public const string EditionField = "Edition/Release";
+        public const string PlayStation3WiiDiscKeyField = "Disc Key";
+        public const string PlayStation3DiscIDField = "Disc ID";
+        public const string GameCubeWiiBCAField = "BCA";
         public const string CopyProtectionField = "Copy Protection";
         public const string MasteringRingField = "Mastering Code (laser branded/etched)";
         public const string MasteringSIDField = "Mastering SID Code";
@@ -91,18 +101,22 @@
 
         public const string PVDField = "Primary Volume Descriptor (PVD)";
         public const string DATField = "DAT";
+        public const string SizeField = "Size";
+        public const string CRC32Field = "CRC32";
+        public const string MD5Field = "MD5";
+        public const string SHA1Field = "SHA1";
+        public const string MatchingIDsField = "Matching IDs";
         public const string ErrorCountField = "Error Count";
         public const string CuesheetField = "Cuesheet";
         public const string SubIntentionField = "SubIntention Data (SecuROM/LibCrypt)";
         public const string WriteOffsetField = "Write Offset";
         public const string LayerbreakField = "Layerbreak";
-        public const string PlaystationEXEDateField = "EXE Date";
+        public const string EXEDateBuildDate = "EXE/Build Date";
+        public const string HeaderField = "Header";
+        public const string PICField = "Permanent Information & Control (PIC)";
         public const string PlayStationEDCField = "EDC";
         public const string PlayStationAntiModchipField = "Anti-modchip";
         public const string PlayStationLibCryptField = "LibCrypt";
-        public const string PlayStation4PICField = "Permanent Information & Control (PIC)";
-        public const string SegaHeaderField = "Header";
-        public const string SegaBuildDateField = "Build Date";
         public const string XBOXDMIHash = "DMI.bin Hashes";
         public const string XBOXPFIHash = "PFI.bin Hashes";
         public const string XBOXSSHash = "SS.bin Hashes";
@@ -114,7 +128,6 @@
         public const string RequiredValue = "(REQUIRED)";
         public const string RequiredIfExistsValue = "(REQUIRED, IF EXISTS)";
         public const string OptionalValue = "(OPTIONAL)";
-        public const string YesNoValue = "Yes/No";
         public const string DiscNotDetected = "Disc Not Detected";
     }
 }

DICUI.Library/Data/Enumerations.cs

@@ -1,5 +1,23 @@
 namespace DICUI.Data
 {
+    /// <summary>
+    /// Category for Redump
+    /// </summary>
+    public enum Category
+    {
+        Games = 1,
+        Demos = 2,
+        Video = 3,
+        Audio = 4,
+        Multimedia = 5,
+        Applications = 6,
+        Coverdiscs = 7,
+        Educational = 8,
+        BonusDiscs = 9,
+        Preproduction = 10,
+        AddOns = 11,
+    }
+
     /// <summary>
     /// Supported DIC commands
     /// </summary>
@@ -12,6 +30,7 @@
         CompactDisc,
         Data,
         DigitalVideoDisc,
+        Disk,
         DriveSpeed,
         Eject,
         Floppy,
@@ -19,6 +38,7 @@
         MDS,
         Merge,
         Reset,
+        SACD,
         Start,
         Stop,
         Sub,
@@ -37,6 +57,7 @@
         NONE = 0,
         AddOffset,
         AMSF,
+        AtariJaguar,
         BEOpcode,
         C2Opcode,
         CopyrightManagementInformation,
@@ -48,8 +69,9 @@
         NoFixSubP,
         NoFixSubQ,
         NoFixSubQLibCrypt,
-        NoFixSubQSecuROM,
         NoFixSubRtoW,
+        NoFixSubQSecuROM,
+        NoSkipSS,
         Raw,
         Reverse,
         ScanAntiMod,
@@ -58,6 +80,30 @@
         SeventyFour,
         SkipSector,
         SubchannelReadLevel,
+        VideoNow,
+        VideoNowColor,
+    }
+
+    /// <summary>
+    /// Drive type for dumping
+    /// </summary>
+    public enum InternalDriveType
+    {
+        Optical,
+        Floppy,
+        HardDisk,
+        Removable,
+    }
+
+    /// <summary>
+    /// Dump status for Redump
+    /// </summary>
+    public enum DumpStatus
+    {
+        BadDumpRed = 2,
+        PossibleBadDumpYellow = 3,
+        OriginalMediaBlue = 4,
+        TwoOrMoreDumpsGreen = 5,
     }
 
     /// <summary>
@@ -67,12 +113,19 @@
     {
         NONE = 0,
 
-        #region Consoles
+        #region Disc-Based Consoles
 
+        AtariJaguarCD,
         BandaiPlaydiaQuickInteractiveSystem,
         BandaiApplePippin,
         CommodoreAmigaCD32,
         CommodoreAmigaCDTV,
+        EnvizionsEVOSmartConsole,
+        FujitsuFMTownsMarty,
+        HasbroVideoNow,
+        HasbroVideoNowColor,
+        HasbroVideoNowJr,
+        HasbroVideoNowXP,
         MattelHyperscan,
         MicrosoftXBOX,
         MicrosoftXBOX360,
@@ -80,10 +133,12 @@
         NECPCEngineTurboGrafxCD,
         NECPCFX,
         NintendoGameCube,
+        NintendoSonySuperNESCDROMSystem,
         NintendoWii,
         NintendoWiiU,
-        Panasonic3DOInteractiveMultiplayer,
+        Panasonic3DOInteractiveMultiplayer, // The 3DO Company 3DO Interactive Multiplayer
         PhilipsCDi,
+        PioneerLaserActive,
         SegaCDMegaCD,
         SegaDreamcast,
         SegaSaturn,
@@ -93,11 +148,69 @@
         SonyPlayStation3,
         SonyPlayStation4,
         SonyPlayStationPortable,
+        TandyMemorexVisualInformationSystem,
         VMLabsNuon,
         VTechVFlashVSmilePro,
         ZAPiTGamesGameWaveFamilyEntertainmentSystem,
 
-        MarkerConsoleEnd,
+        MarkerDiscBasedConsoleEnd,
+
+        #endregion
+
+        #region Cartridge-Based and Other Consoles
+
+        /*
+        AmstradGX4000,
+        APFMicrocomputerSystem,
+        Atari2600VCS,
+        Atari5200,
+        Atari7800,
+        AtariJaguar,
+        AtariXEVideoGameSystem,
+        Audiosonic1292AdvancedProgrammableVideoSystem,
+        BallyAstrocade,
+        BitCorporationDina,
+        CasioLoopy,
+        CasioPV1000,
+        Commodore64GamesSystem,
+        DaewooElectronicsZemmix,
+        EmersonArcadia2001,
+        EpochCassetteVision,
+        EpochSuperCassetteVision,
+        FairchildChannelF,
+        FuntechSuperACan,
+        GeneralConsumerElectricVectrex,
+        HeberBBCBridgeCompanion,
+        IntertonVC4000,
+        JungleTacVii,
+        LeapFrogClickStart,
+        LJNVideoArt,
+        MagnavoxOdyssey2,
+        MattelIntellivision,
+        NECPCEngineTurboGrafx16,
+        NichibutsuMyVision,
+        Nintendo64,
+        Nintendo64DD,
+        NintendoFamilyComputerNintendoEntertainmentSystem,
+        NintendoFamilyComputerDiskSystem,
+        NintendoSuperFamicomSuperNintendoEntertainmentSystem,
+        NintendoSwitch,
+        PhilipsVideopacPlusG7400,
+        RCAStudioII,
+        Sega32X,
+        SegaMarkIIIMasterSystem,
+        SegaMegaDriveGenesis,
+        SegaSG1000,
+        SNKNeoGeo,
+        SSDCOMPANYLIMITEDXaviXPORT,
+        ViewMasterInteractiveVision,
+        VTechCreatiVision,
+        VTechVSmile,
+        VTechSocrates,
+        WorldsOfWonderActionMax,
+
+        MarkerOtherConsoleEnd,
+        */
 
         #endregion
 
@@ -105,7 +218,7 @@
 
         AcornArchimedes,
         AppleMacintosh,
-        CommodoreAmigaCD,
+        CommodoreAmiga,
         FujitsuFMTowns,
         IBMPCCompatible,
         NECPC88,
@@ -141,7 +254,6 @@
         KonamiTwinkle,
         KonamiVarious,
         MeritIndustriesBoardwalk,
-        MeritIndustriesMegaTouchAurora,
         MeritIndustriesMegaTouchForce,
         MeritIndustriesMegaTouchION,
         MeritIndustriesMegaTouchMaxx,
@@ -171,7 +283,6 @@
         SegaSystem32,
         SeibuCATSSystem,
         TABAustriaQuizard,
-        TandyMemorexVisualInformationSystem,
         TsunamiTsuMoMultiGameMotionSystem,
 
         MarkerArcadeEnd,
@@ -184,15 +295,14 @@
         BDVideo,
         DVDVideo,
         EnhancedCD,
-        EnhancedDVD,
-        EnhancedBD,
-        HasbroVideoNow,
         HDDVDVideo,
+        NavisoftNaviken21,
         PalmOS,
         PhilipsCDiDigitalVideo,
         PhotoCD,
         PlayStationGameSharkUpdates,
         RainbowDisc,
+        SuperAudioCD,
         TaoiKTV,
         TomyKissSite,
         VideoCD,
@@ -207,13 +317,67 @@
     /// </summary>
     public enum KnownSystemCategory
     {
-        Console = 0,
+        DiscBasedConsole = 0,
+        OtherConsole,
         Computer,
         Arcade,
         Other,
         Custom
     };
 
+    /// <summary>
+    /// List of all disc langauges
+    /// </summary>
+    public enum Language
+    {
+        Afrikaans,
+        Arabic,
+        Basque,
+        Bulgarian,
+        Catalan,
+        Chinese,
+        Croatian,
+        Czech,
+        Danish,
+        Dutch,
+        English,
+        Finnish,
+        French,
+        Gaelic,
+        German,
+        Greek,
+        Hebrew,
+        Hindi,
+        Hungarian,
+        Italian,
+        Japanese,
+        Korean,
+        Norwegian,
+        Polish,
+        Portuguese,
+        Punjabi,
+        Romanian,
+        Russian,
+        Slovak,
+        Slovenian,
+        Spanish,
+        Swedish,
+        Tamil,
+        Thai,
+        Turkish,
+        Ukrainian,
+    }
+
+    /// <summary>
+    /// All possible language selections
+    /// </summary>
+    public enum LanguageSelection
+    {
+        BiosSettings,
+        LanguageSelector,
+        OptionsMenu,
+    }
+
     /// <summary>
     /// Known media types
     /// </summary>
@@ -256,7 +420,7 @@
         LaserDisc, // LD-ROM and LV-ROM variants
         Nintendo64DD,
         NintendoFamicomDiskSystem,
-        NintendoGameCube,
+        NintendoGameCubeGameDisc,
         NintendoWiiOpticalDisc,
         NintendoWiiUOpticalDisc,
         UMD,
@@ -266,5 +430,172 @@
         // Unsorted Formats
         Cartridge,
         CED,
+        CompactFlash,
+        MMC,
+        SDCard,
+        FlashDrive,
+    }
+
+    /// <summary>
+    /// List of all known Redump systems
+    /// </summary>
+    public enum RedumpSystem
+    {
+        // Special BIOS sets
+        MicrosoftXboxBIOS,
+        NintendoGameCubeBIOS,
+        SonyPlayStationBIOS,
+        SonyPlayStation2BIOS,
+
+        // Regular systems
+        AcornArchimedes,
+        AppleMacintosh,
+        AudioCD,
+        BDVideo,
+        BandaiPippin,
+        BandaiPlaydiaQuickInteractiveSystem,
+        CommodoreAmigaCD,
+        CommodoreAmigaCD32,
+        CommodoreAmigaCDTV,
+        DVDVideo,
+        FujitsuFMTownsseries,
+        HasbroVideoNow,
+        HasbroVideoNowColor,
+        HasbroVideoNowJr,
+        HasbroVideoNowXP,
+        IBMPCcompatible,
+        IncredibleTechnologiesEagle,
+        KonamiFireBeat,
+        KonamiM2,
+        KonamiSystem573,
+        KonamiSystemGV,
+        KonamiTwinkle,
+        KonamieAmusement,
+        MattelHyperScan,
+        MemorexVisualInformationSystem,
+        MicrosoftXbox,
+        MicrosoftXbox360,
+        MicrosoftXboxOne,
+        NECPC88series,
+        NECPC98series,
+        NECPCEngineCDTurboGrafxCD,
+        NECPCFXPCFXGA,
+        NamcoSystem12,
+        NamcoSystem246,
+        NavisoftNaviken21,
+        NinendoGameCube,
+        NintendoWii,
+        NintendoWiiU,
+        PalmOS,
+        Panasonic3DOInteractiveMultiplayer,
+        PanasonicM2,
+        PhilipsCDi,
+        PhilipsCDiDigitalVideo,
+        PhotoCD,
+        PlayStationGameSharkUpdates,
+        SegaChihiro,
+        SegaDreamcast,
+        SegaLindbergh,
+        SegaMegaCDSegaCD,
+        SegaNaomi,
+        SegaNaomi2,
+        SegaRingEdge,
+        SegaRingEdge2,
+        SegaSaturn,
+        SegaTitanVideo,
+        SegaTriforce,
+        SharpX68000,
+        SNKNeoGeoCD,
+        SonyPlayStation,
+        SonyPlayStation2,
+        SonyPlayStation3,
+        SonyPlayStation4,
+        SonyPlayStationPortable,
+        TABAustriaQuizard,
+        TaoiKTV,
+        TomyKissSite,
+        VideoCD,
+        VMLabsNUON,
+        VTechVFlashVSmilePro,
+        ZAPiTGamesGameWaveFamilyEntertainmentSystem,
+    }
+
+    /// <summary>
+    /// List of all known Redump regions
+    /// </summary>
+    public enum Region
+    {
+        Argentina,
+        Asia,
+        AsiaEurope,
+        AsiaUSA,
+        Australia,
+        Austria,
+        AustriaSwitzerland,
+        Belgium,
+        BelgiumNetherlands,
+        Brazil,
+        Canada,
+        China,
+        Croatia,
+        Czech,
+        Denmark,
+        Europe,
+        EuropeAsia,
+        EuropeAustralia,
+        Finland,
+        France,
+        FranceSpain,
+        Germany,
+        GreaterChina,
+        Greece,
+        Hungary,
+        India,
+        Ireland,
+        Israel,
+        Italy,
+        Japan,
+        JapanAsia,
+        JapanEurope,
+        JapanKorea,
+        JapanUSA,
+        Korea,
+        LatinAmerica,
+        Netherlands,
+        Norway,
+        Poland,
+        Portugal,
+        Russia,
+        Scandinavia,
+        Singapore,
+        Slovakia,
+        SouthAfrica,
+        Spain,
+        Sweden,
+        Switzerland,
+        Taiwan,
+        Thailand,
+        Turkey,
+        UnitedArabEmirates,
+        UK,
+        UKAustralia,
+        Ukraine,
+        USA,
+        USAAsia,
+        USABrazil,
+        USACanada,
+        USAEurope,
+        USAJapan,
+        World,
+    }
+
+    /// <summary>
+    /// Generic yes/no values for Redump
+    /// </summary>
+    public enum YesNo
+    {
+        NULL = 0,
+        No = 1,
+        Yes = 2,
     }
 }

DICUI.Library/Data/SubmissionInfo.cs

@@ -0,0 +1,500 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Net;
+using DICUI.Utilities;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+
+namespace DICUI.Data
+{
+    public class SubmissionInfo
+    {
+        /// <summary>
+        /// List of matched Redump IDs
+        /// </summary>
+        [JsonIgnore]
+        public List<int> MatchedIDs { get; set; }
+
+        /// <summary>
+        /// DateTime of when the disc was added
+        /// </summary>
+        [JsonIgnore]
+        public DateTime? Added { get; set; }
+
+        /// <summary>
+        /// DateTime of when the disc was last modified
+        /// </summary>
+        [JsonIgnore]
+        public DateTime? LastModified { get; set; }
+
+        [JsonProperty(PropertyName = "common_disc_info", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public CommonDiscInfoSection CommonDiscInfo { get; set; } = new CommonDiscInfoSection();
+
+        [JsonProperty(PropertyName = "versions_and_editions", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public VersionAndEditionsSection VersionAndEditions { get; set; } = new VersionAndEditionsSection();
+
+        [JsonProperty(PropertyName = "edc", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public EDCSection EDC { get; set; } = new EDCSection();
+
+        [JsonProperty(PropertyName = "parent_clone_relationship", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public ParentCloneRelationshipSection ParentCloneRelationship { get; set; } = new ParentCloneRelationshipSection();
+
+        [JsonProperty(PropertyName = "extras", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public ExtrasSection Extras { get; set; } = new ExtrasSection();
+
+        [JsonProperty(PropertyName = "copy_protection", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public CopyProtectionSection CopyProtection { get; set; } = new CopyProtectionSection();
+
+        [JsonProperty(PropertyName = "dumpers_and_status", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public DumpersAndStatusSection DumpersAndStatus { get; set; } = new DumpersAndStatusSection();
+
+        [JsonProperty(PropertyName = "tracks_and_write_offsets", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public TracksAndWriteOffsetsSection TracksAndWriteOffsets { get; set; } = new TracksAndWriteOffsetsSection();
+
+        [JsonProperty(PropertyName = "size_and_checksums", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public SizeAndChecksumsSection SizeAndChecksums { get; set; } = new SizeAndChecksumsSection();
+
+        #region Regexes
+
+        private readonly Regex addedRegex = new Regex(@"<tr><th>Added</th><td>(.*?)</td></tr>");
+        private readonly Regex barcodeRegex = new Regex(@"<tr><th>Barcode</th></tr><tr><td>(.*?)</td></tr>");
+        private readonly Regex bcaRegex = new Regex(@"<h3>BCA .*?/></h3></td><td .*?></td></tr>"
+            + "<tr><th>Row</th><th>Contents</th><th>ASCII</th></tr>"
+            + "<tr><td>(?<row1number>.*?)</td><td>(?<row1contents>.*?)</td><td>(?<row1ascii>.*?)</td></tr>"
+            + "<tr><td>(?<row2number>.*?)</td><td>(?<row2contents>.*?)</td><td>(?<row2ascii>.*?)</td></tr>"
+            + "<tr><td>(?<row3number>.*?)</td><td>(?<row3contents>.*?)</td><td>(?<row3ascii>.*?)</td></tr>"
+            + "<tr><td>(?<row4number>.*?)</td><td>(?<row4contents>.*?)</td><td>(?<row4ascii>.*?)</td></tr>");
+        private readonly Regex categoryRegex = new Regex(@"<tr><th>Category</th><td>(.*?)</td></tr>");
+        private readonly Regex commentsRegex = new Regex(@"<tr><th>Comments</th></tr><tr><td>(.*?)</td></tr>");
+        private readonly Regex contentsRegex = new Regex(@"<tr><th>Contents</th></tr><tr .*?><td>(.*?)</td></tr>");
+        private readonly Regex discNumberLetterRegex = new Regex(@"\((.*?)\)");
+        private readonly Regex dumpersRegex = new Regex(@"<a href=""/discs/dumper/(.*?)/"">");
+        private readonly Regex editionRegex = new Regex(@"<tr><th>Edition</th><td>(.*?)</td></tr>");
+        private readonly Regex errorCountRegex = new Regex(@"<tr><th>Errors count</th><td>(.*?)</td></tr>");
+        private readonly Regex foreignTitleRegex = new Regex(@"<h2>(.*?)</h2>");
+        private readonly Regex fullMatchRegex = new Regex(@"<td class=""static"">full match ids: (.*?)</td>");
+        private readonly Regex languagesRegex = new Regex(@"<img src=""/images/languages/(.*?)\.png"" alt="".*?"" title="".*?"" />\s*");
+        private readonly Regex lastModifiedRegex = new Regex(@"<tr><th>Last modified</th><td>(.*?)</td></tr>");
+        private readonly Regex mediaRegex = new Regex(@"<tr><th>Media</th><td>(.*?)</td></tr>");
+        private readonly Regex partialMatchRegex = new Regex(@"<td class=""static"">partial match ids: (.*?)</td>");
+        private readonly Regex pvdRegex = new Regex(@"<h3>Primary Volume Descriptor (PVD) <img .*?/></h3></td><td .*?></td></tr>"
+            + @"<tr><th>Record / Entry</th><th>Contents</th><th>Date</th><th>Time</th><th>GMT</th></tr>"
+            + @"<tr><td>Creation</td><td>(?<creationbytes>.*?)</td><td>(?<creationdate>.*?)</td><td>(?<creationtime>.*?)</td><td>(?<creationtimezone>.*?)</td></tr>"
+            + @"<tr><td>Modification</td><td>(?<modificationbytes>.*?)</td><td>(?<modificationdate>.*?)</td><td>(?<modificationtime>.*?)</td><td>(?<modificationtimezone>.*?)</td></tr>"
+            + @"<tr><td>Expiration</td><td>(?<expirationbytes>.*?)</td><td>(?<expirationdate>.*?)</td><td>(?<expirationtime>.*?)</td><td>(?<expirationtimezone>.*?)</td></tr>"
+            + @"<tr><td>Effective</td><td>(?<effectivebytes>.*?)</td><td>(?<effectivedate>.*?)</td><td>(?<effectivetime>.*?)</td><td>(?<effectivetimezone>.*?)</td></tr>");
+        private readonly Regex regionRegex = new Regex(@"<tr><th>Region</th><td><a href=""/discs/region/(.*?)/"">");
+        private readonly Regex ringCodeDoubleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould
+        private readonly Regex ringCodeSingleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould
+        private readonly Regex serialRegex = new Regex(@"<tr><th>Serial</th><td>(.*?)</td></tr>");
+        private readonly Regex systemRegex = new Regex(@"<tr><th>System</th><td><a href=""/discs/system/(.*?)/"">");
+        private readonly Regex titleRegex = new Regex(@"<h1>(.*?)</h1>");
+        private readonly Regex trackRegex = new Regex(@"<tr><td>(?<number>.*?)</td><td>(?<type>.*?)</td><td>(?<pregap>.*?)</td><td>(?<length>.*?)</td><td>(?<sectors>.*?)</td><td>(?<size>.*?)</td><td>(?<crc32>.*?)</td><td>(?<md5>.*?)</td><td>(?<sha1>.*?)</td></tr>");
+        private readonly Regex trackCountRegex = new Regex(@"<tr><th>Number of tracks</th><td>(.*?)</td></tr>");
+        private readonly Regex versionRegex = new Regex(@"<tr><th>Version</th><td>(.*?)</td></tr>");
+        private readonly Regex writeOffsetRegex = new Regex(@"<tr><th>Write offset</th><td>(.*?)</td></tr>");
+
+        #endregion
+
+        /// <summary>
+        /// Fill in information from a Redump disc page
+        /// </summary>
+        /// <param name="discData">String representation of the disc page</param>
+        public void FillFromDiscPage(string discData)
+        {
+            // Title, Disc Number/Letter, Disc Title
+            var match = titleRegex.Match(discData);
+            if (match.Success)
+            {
+                string title = WebUtility.HtmlDecode(match.Groups[1].Value);
+
+                // If we have parenthesis, title is everything before the first one
+                int firstParenLocation = title.IndexOf(" (");
+                if (firstParenLocation >= 0)
+                {
+                    this.CommonDiscInfo.Title = title.Substring(0, firstParenLocation);
+                    var subMatches = discNumberLetterRegex.Match(title);
+                    for (int i = 1; i < subMatches.Groups.Count; i++)
+                    {
+                        string subMatch = subMatches.Groups[i].Value;
+
+                        // Disc number or letter
+                        if (subMatch.StartsWith("Disc"))
+                            this.CommonDiscInfo.DiscNumberLetter = subMatch.Remove(0, "Disc ".Length);
+
+                        // Disc title
+                        else
+                            this.CommonDiscInfo.DiscTitle = subMatch;
+                    }
+                }
+                // Otherwise, leave the title as-is
+                else
+                {
+                    this.CommonDiscInfo.Title = title;
+                }
+            }
+
+            // Foreign Title
+            match = foreignTitleRegex.Match(discData);
+            if (match.Success)
+                this.CommonDiscInfo.ForeignTitleNonLatin = WebUtility.HtmlDecode(match.Groups[1].Value);
+            else
+                this.CommonDiscInfo.ForeignTitleNonLatin = null;
+
+            // Category
+            match = categoryRegex.Match(discData);
+            if (match.Success)
+                this.CommonDiscInfo.Category = Converters.StringToCategory(match.Groups[1].Value);
+            else
+                this.CommonDiscInfo.Category = Data.Category.Games;
+
+            // Region
+            match = regionRegex.Match(discData);
+            if (match.Success)
+                this.CommonDiscInfo.Region = Converters.StringToRegion(match.Groups[1].Value);
+
+            // Languages
+            var matches = languagesRegex.Matches(discData);
+            if (matches.Count > 0)
+            {
+                List<Language?> tempLanguages = new List<Language?>();
+                foreach (Match submatch in matches)
+                    tempLanguages.Add(Converters.StringToLanguage(submatch.Groups[1].Value));
+
+                this.CommonDiscInfo.Languages = tempLanguages.ToArray();
+            }
+
+            // Serial
+            match = serialRegex.Match(discData);
+            if (match.Success)
+                this.CommonDiscInfo.Serial = WebUtility.HtmlDecode(match.Groups[1].Value);
+
+            // Error count
+            match = errorCountRegex.Match(discData);
+            if (match.Success)
+            {
+                // If the error counts don't match, then use the one from the disc page
+                if (!string.IsNullOrEmpty(this.CommonDiscInfo.ErrorsCount) && match.Groups[1].Value != this.CommonDiscInfo.ErrorsCount)
+                    this.CommonDiscInfo.ErrorsCount = match.Groups[1].Value;
+            }
+
+            // Version
+            match = versionRegex.Match(discData);
+            if (match.Success)
+                this.VersionAndEditions.Version = WebUtility.HtmlDecode(match.Groups[1].Value);
+
+            // Edition
+            match = editionRegex.Match(discData);
+            if (match.Success)
+                this.VersionAndEditions.OtherEditions = WebUtility.HtmlDecode(match.Groups[1].Value);
+
+            // Dumpers
+            matches = dumpersRegex.Matches(discData);
+            if (matches.Count > 0)
+            {
+                // Start with any currently listed dumpers
+                List<string> tempDumpers = new List<string>();
+                if (this.DumpersAndStatus.Dumpers.Length > 0)
+                {
+                    foreach (string dumper in this.DumpersAndStatus.Dumpers)
+                        tempDumpers.Add(dumper);
+                }
+
+                foreach (Match submatch in matches)
+                    tempDumpers.Add(WebUtility.HtmlDecode(submatch.Groups[1].Value));
+
+                this.DumpersAndStatus.Dumpers = tempDumpers.ToArray();
+            }
+
+            // Barcode
+            match = barcodeRegex.Match(discData);
+            if (match.Success)
+                this.CommonDiscInfo.Barcode = WebUtility.HtmlDecode(match.Groups[1].Value);
+
+            // Comments
+            match = commentsRegex.Match(discData);
+            if (match.Success)
+            {
+                this.CommonDiscInfo.Comments = WebUtility.HtmlDecode(match.Groups[1].Value)
+                    .Replace("<br />", "\n")
+                    .Replace("<b>ISBN</b>", "[T:ISBN]") + "\n";
+            }
+
+            // Contents
+            match = contentsRegex.Match(discData);
+            if (match.Success)
+            {
+                this.CommonDiscInfo.Contents = WebUtility.HtmlDecode(match.Groups[1].Value)
+                       .Replace("<br />", "\n")
+                       .Replace("</div>", "");
+                this.CommonDiscInfo.Contents = Regex.Replace(this.CommonDiscInfo.Contents, @"<div .*?>", "");
+            }
+
+            // Added
+            match = addedRegex.Match(discData);
+            if (match.Success)
+                this.Added = DateTime.Parse(match.Groups[1].Value);
+
+            // Last Modified
+            match = lastModifiedRegex.Match(discData);
+            if (match.Success)
+                this.LastModified = DateTime.Parse(match.Groups[1].Value);
+        }
+    }
+
+    /// <summary>
+    /// Common disc info section of New Disc Form
+    /// </summary>
+    public class CommonDiscInfoSection
+    {
+        // TODO: Name not defined
+        [JsonProperty(PropertyName = "d_system", Required = Required.AllowNull)]
+        [JsonConverter(typeof(KnownSystemConverter))]
+        public KnownSystem? System { get; set; }
+
+        // TODO: Name not defined
+        // TODO: Have this convert to a new `RedumpMedia?` if possible, for submission
+        [JsonProperty(PropertyName = "d_media", Required = Required.AllowNull)]
+        [JsonConverter(typeof(MediaTypeConverter))]
+        public MediaType? Media { get; set; }
+
+        [JsonProperty(PropertyName = "d_title", Required = Required.AllowNull)]
+        public string Title { get; set; }
+
+        [JsonProperty(PropertyName = "d_title_foreign", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public string ForeignTitleNonLatin { get; set; }
+
+        [JsonProperty(PropertyName = "d_number", NullValueHandling = NullValueHandling.Ignore)]
+        public string DiscNumberLetter { get; set; }
+
+        [JsonProperty(PropertyName = "d_label", NullValueHandling = NullValueHandling.Ignore)]
+        public string DiscTitle { get; set; }
+
+        [JsonProperty(PropertyName = "d_category", Required = Required.AllowNull)]
+        public Category? Category { get; set; }
+
+        [JsonProperty(PropertyName = "d_region", Required = Required.AllowNull)]
+        [JsonConverter(typeof(RegionConverter))]
+        public Region? Region { get; set; }
+
+        [JsonProperty(PropertyName = "d_languages", Required = Required.AllowNull)]
+        [JsonConverter(typeof(LanguagesConverter))]
+        public Language?[] Languages { get; set; }
+
+        [JsonProperty(PropertyName = "d_languages_selection", NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)]
+        [JsonConverter(typeof(LanguageSelectionConverter))]
+        public LanguageSelection?[] LanguageSelection { get; set; }
+
+        [JsonProperty(PropertyName = "d_serial", NullValueHandling = NullValueHandling.Ignore)]
+        public string Serial { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring", NullValueHandling = NullValueHandling.Ignore)]
+        public string Ring { get; }
+
+        [JsonProperty(PropertyName = "d_ring_0_id", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingId { get; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ma1", Required = Required.AllowNull)]
+        public string MasteringRingFirstLayerDataSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ma1_sid", NullValueHandling = NullValueHandling.Ignore)]
+        public string MasteringSIDCodeFirstLayerDataSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ts1", NullValueHandling = NullValueHandling.Ignore)]
+        public string ToolstampMasteringCodeFirstLayerDataSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_mo1_sid", NullValueHandling = NullValueHandling.Ignore)]
+        public string MouldSIDCodeFirstLayerDataSide { get; set; }
+
+        [JsonProperty(PropertyName = "dr_ring_0_mo1", NullValueHandling = NullValueHandling.Ignore)]
+        public string AdditionalMouldFirstLayerDataSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ma2", NullValueHandling = NullValueHandling.Ignore)]
+        public string MasteringRingSecondLayerLabelSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ma2_sid", NullValueHandling = NullValueHandling.Ignore)]
+        public string MasteringSIDCodeSecondLayerLabelSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_ts2", NullValueHandling = NullValueHandling.Ignore)]
+        public string ToolstampMasteringCodeSecondLayerLabelSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_mo2_sid", NullValueHandling = NullValueHandling.Ignore)]
+        public string MouldSIDCodeSecondLayerLabelSide { get; set; }
+
+        [JsonProperty(PropertyName = "dr_ring_0_mo2", NullValueHandling = NullValueHandling.Ignore)]
+        public string AdditionalMouldSecondLayerLabelSide { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_0_offsets", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingOffsetsHidden { get { return "1"; } }
+
+        [JsonProperty(PropertyName = "d_ring_0_0_id", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingZeroId { get; }
+
+        [JsonProperty(PropertyName = "d_ring_0_0_density", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingZeroDensity { get; }
+
+        [JsonProperty(PropertyName = "d_ring_0_0_value", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingWriteOffset { get; set; }
+
+        [JsonProperty(PropertyName = "d_ring_count", NullValueHandling = NullValueHandling.Ignore)]
+        public string RingCount { get { return "1"; } }
+
+        [JsonProperty(PropertyName = "d_barcode", NullValueHandling = NullValueHandling.Ignore)]
+        public string Barcode { get; set; }
+
+        [JsonProperty(PropertyName = "d_date", NullValueHandling = NullValueHandling.Ignore)]
+        public string EXEDateBuildDate { get; set; }
+
+        [JsonProperty(PropertyName = "d_errors", NullValueHandling = NullValueHandling.Ignore)]
+        public string ErrorsCount { get; set; }
+
+        [JsonProperty(PropertyName = "d_comments", NullValueHandling = NullValueHandling.Ignore)]
+        public string Comments { get; set; }
+
+        [JsonProperty(PropertyName = "d_contents", NullValueHandling = NullValueHandling.Ignore)]
+        public string Contents { get; set; }
+    }
+
+    /// <summary>
+    /// Version and editions section of New Disc form
+    /// </summary>
+    public class VersionAndEditionsSection
+    {
+        [JsonProperty(PropertyName = "d_version", NullValueHandling = NullValueHandling.Ignore)]
+        public string Version { get; set; }
+
+        [JsonProperty(PropertyName = "d_version_datfile", NullValueHandling = NullValueHandling.Ignore)]
+        public string VersionDatfile { get; set; }
+
+        [JsonProperty(PropertyName = "d_editions", NullValueHandling = NullValueHandling.Ignore)]
+        public string[] CommonEditions { get; set; }
+
+        [JsonProperty(PropertyName = "d_editions_text", NullValueHandling = NullValueHandling.Ignore)]
+        public string OtherEditions { get; set; }
+    }
+
+    /// <summary>
+    /// EDC section of New Disc form (PSX only)
+    /// </summary>
+    public class EDCSection
+    {
+        [JsonProperty(PropertyName = "d_edc", NullValueHandling = NullValueHandling.Ignore)]
+        public YesNo EDC { get; set; }
+    }
+
+    /// <summary>
+    /// Parent/Clone relationship section of New Disc form
+    /// </summary>
+    public class ParentCloneRelationshipSection
+    {
+        [JsonProperty(PropertyName = "d_parent_id", NullValueHandling = NullValueHandling.Ignore)]
+        public string ParentID { get; set; }
+
+        [JsonProperty(PropertyName = "d_is_regional_parent", NullValueHandling = NullValueHandling.Ignore)]
+        public bool RegionalParent { get; set; }
+    }
+
+    /// <summary>
+    /// Extras section of New Disc form
+    /// </summary>
+    public class ExtrasSection
+    {
+        [JsonProperty(PropertyName = "d_pvd", NullValueHandling = NullValueHandling.Ignore)]
+        public string PVD { get; set; }
+
+        [JsonProperty(PropertyName = "d_d1_key", NullValueHandling = NullValueHandling.Ignore)]
+        public string DiscKey { get; set; }
+
+        [JsonProperty(PropertyName = "d_d2_key", NullValueHandling = NullValueHandling.Ignore)]
+        public string DiscID { get; set; }
+
+        [JsonProperty(PropertyName = "d_pic_data", NullValueHandling = NullValueHandling.Ignore)]
+        public string PIC { get; set; }
+
+        [JsonProperty(PropertyName = "d_header", NullValueHandling = NullValueHandling.Ignore)]
+        public string Header { get; set; }
+
+        [JsonProperty(PropertyName = "d_bca", NullValueHandling = NullValueHandling.Ignore)]
+        public string BCA { get; set; }
+
+        [JsonProperty(PropertyName = "d_ssranges", NullValueHandling = NullValueHandling.Ignore)]
+        public string SecuritySectorRanges { get; set; }
+    }
+
+    /// <summary>
+    /// Copy protection section of New Disc form
+    /// </summary>
+    public class CopyProtectionSection
+    {
+        [JsonProperty(PropertyName = "d_protection_a", NullValueHandling = NullValueHandling.Ignore)]
+        public YesNo AntiModchip { get; set; }
+
+        [JsonProperty(PropertyName = "d_protection_1", NullValueHandling = NullValueHandling.Ignore)]
+        public YesNo LibCrypt { get; set; }
+
+        [JsonProperty(PropertyName = "d_libcrypt", NullValueHandling = NullValueHandling.Ignore)]
+        public string LibCryptData { get; set; }
+
+        [JsonProperty(PropertyName = "d_protection", NullValueHandling = NullValueHandling.Ignore)]
+        public string Protection { get; set; }
+
+        [JsonProperty(PropertyName = "d_securom", NullValueHandling = NullValueHandling.Ignore)]
+        public string SecuROMData { get; set; }
+    }
+
+    /// <summary>
+    /// Dumpers and status section of New Disc form (Moderator only)
+    /// </summary>
+    public class DumpersAndStatusSection
+    {
+        [JsonProperty(PropertyName = "d_status", NullValueHandling = NullValueHandling.Ignore)]
+        public DumpStatus Status { get; set; }
+
+        [JsonProperty(PropertyName = "d_dumpers", NullValueHandling = NullValueHandling.Ignore)]
+        public string[] Dumpers { get; set; }
+
+        [JsonProperty(PropertyName = "d_dumpers_text", NullValueHandling = NullValueHandling.Ignore)]
+        public string OtherDumpers { get; set; }
+    }
+
+    /// <summary>
+    /// Tracks and write offsets section of New Disc form (CD/GD-based)
+    /// </summary>
+    public class TracksAndWriteOffsetsSection
+    {
+        [JsonProperty(PropertyName = "d_tracks", NullValueHandling = NullValueHandling.Ignore)]
+        public string ClrMameProData { get; set; }
+
+        [JsonProperty(PropertyName = "d_cue", NullValueHandling = NullValueHandling.Ignore)]
+        public string Cuesheet { get; set; }
+
+        [JsonProperty(PropertyName = "d_offset", NullValueHandling = NullValueHandling.Ignore)]
+        public int[] CommonWriteOffsets { get; set; }
+
+        [JsonProperty(PropertyName = "d_offset_text", NullValueHandling = NullValueHandling.Ignore)]
+        public string OtherWriteOffsets { get; set; }
+    }
+
+    /// <summary>
+    /// Size & checksums section of New Disc form (DVD/BD/UMD-based)
+    /// </summary>
+    public class SizeAndChecksumsSection
+    {
+        [JsonProperty(PropertyName = "d_layerbreak", NullValueHandling = NullValueHandling.Ignore)]
+        public long Layerbreak { get; set; }
+
+        [JsonProperty(PropertyName = "d_size", NullValueHandling = NullValueHandling.Ignore)]
+        public long Size { get; set; }
+
+        [JsonProperty(PropertyName = "d_crc32", NullValueHandling = NullValueHandling.Ignore)]
+        public string CRC32 { get; set; }
+
+        [JsonProperty(PropertyName = "d_md5", NullValueHandling = NullValueHandling.Ignore)]
+        public string MD5 { get; set; }
+
+        [JsonProperty(PropertyName = "d_sha1", NullValueHandling = NullValueHandling.Ignore)]
+        public string SHA1 { get; set; }
+    }
+}

DICUI.Library/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DICUI.Library")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,6 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11")]
-[assembly: AssemblyFileVersion("1.11.0.0")]
+[assembly: AssemblyVersion("1.13")]
+[assembly: AssemblyFileVersion("1.13.0.0")]
+[assembly: InternalsVisibleTo("DICUI.Test")]

DICUI.Library/Utilities/Drive.cs

@@ -0,0 +1,63 @@
+using System.IO;
+using DICUI.Data;
+
+namespace DICUI.Utilities
+{
+    /// <summary>
+    /// Represents information for a single drive
+    /// </summary>
+    public class Drive
+    {
+        /// <summary>
+        /// Represents drive type
+        /// </summary>
+        public InternalDriveType? InternalDriveType { get; set; }
+
+        /// <summary>
+        /// DriveInfo object representing the drive, if possible
+        /// </summary>
+        public DriveInfo DriveInfo { get; private set; }
+
+        /// <summary>
+        /// Windows drive letter
+        /// </summary>
+        public char Letter { get { return DriveInfo?.Name[0] ?? '\0'; } }
+
+        /// <summary>
+        /// Media label as read by Windows
+        /// </summary>
+        public string VolumeLabel
+        {
+            get
+            {
+                if (DriveInfo.IsReady)
+                {
+                    if (string.IsNullOrWhiteSpace(DriveInfo.VolumeLabel))
+                        return "track";
+                    else
+                        return DriveInfo.VolumeLabel;
+                }
+                else
+                {
+                    return Template.DiscNotDetected;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Drive partition format
+        /// </summary>
+        public string DriveFormat { get { return DriveInfo.DriveFormat; } }
+
+        /// <summary>
+        /// Represents if Windows has marked the drive as active
+        /// </summary>
+        public bool MarkedActive { get { return DriveInfo.IsReady; } }
+
+        public Drive(InternalDriveType? driveType, DriveInfo driveInfo)
+        {
+            this.InternalDriveType = driveType;
+            this.DriveInfo = driveInfo;
+        }
+    }
+}

DICUI.Library/Utilities/Extensions.cs

@@ -2,42 +2,202 @@
 
 namespace DICUI.Utilities
 {
-    /// <summary>
-    /// Extensions for DICCommand for easier calling
-    /// </summary>
-    public static class DICCommandExtensions
+    public static class Extensions
     {
-        public static string Name(this DICCommand command)
-        {
-            return Converters.DICCommandToString(command);
-        }
-    }
+        #region Redump Information Lists
 
-    /// <summary>
-    /// Extensions for DICFlag for easier calling
-    /// </summary>
-    public static class DICFlagExtensions
-    {
-        public static string Name(this DICFlag command)
+        /// <summary>
+        /// List of systems that are not publically accessible
+        /// </summary>
+        public static readonly RedumpSystem[] BannedSystems = new RedumpSystem[]
         {
-            return Converters.DICFlagToString(command);
-        }
-    }
+            RedumpSystem.AudioCD,
+            RedumpSystem.BDVideo,
+            RedumpSystem.DVDVideo,
+            RedumpSystem.HasbroVideoNow,
+            RedumpSystem.HasbroVideoNowColor,
+            RedumpSystem.HasbroVideoNowJr,
+            RedumpSystem.HasbroVideoNowXP,
+            RedumpSystem.KonamiM2,
+            RedumpSystem.MicrosoftXbox360,
+            RedumpSystem.MicrosoftXboxOne,
+            RedumpSystem.NavisoftNaviken21,
+            RedumpSystem.NintendoWii,
+            RedumpSystem.NintendoWiiU,
+            RedumpSystem.PanasonicM2,
+            RedumpSystem.PhilipsCDiDigitalVideo,
+            RedumpSystem.SegaRingEdge,
+            RedumpSystem.SegaRingEdge2,
+            RedumpSystem.SonyPlayStation3,
+            RedumpSystem.SonyPlayStation4,
+            RedumpSystem.VideoCD,
+        };
 
-    /// <summary>
-    /// Extensions for MediaType? for easier calling
-    /// </summary>
-    public static class MediaTypeExtensions
-    {
-        public static string Name(this MediaType? type)
+        /// <summary>
+        /// List of systems that have a Cues pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasCues = new RedumpSystem[]
         {
-            return Converters.MediaTypeToString(type);
-        }
+            RedumpSystem.AppleMacintosh,
+            RedumpSystem.AudioCD,
+            RedumpSystem.BandaiPippin,
+            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
+            RedumpSystem.CommodoreAmigaCD,
+            RedumpSystem.CommodoreAmigaCD32,
+            RedumpSystem.CommodoreAmigaCDTV,
+            RedumpSystem.FujitsuFMTownsseries,
+            RedumpSystem.HasbroVideoNow,
+            RedumpSystem.HasbroVideoNowJr,
+            RedumpSystem.IBMPCcompatible,
+            RedumpSystem.IncredibleTechnologiesEagle,
+            RedumpSystem.KonamieAmusement,
+            RedumpSystem.KonamiFireBeat,
+            RedumpSystem.KonamiM2,
+            RedumpSystem.KonamiSystemGV,
+            RedumpSystem.MattelHyperScan,
+            RedumpSystem.MicrosoftXbox,
+            RedumpSystem.MicrosoftXbox360,
+            RedumpSystem.NamcoSystem246,
+            RedumpSystem.NavisoftNaviken21,
+            RedumpSystem.NECPC88series,
+            RedumpSystem.NECPC98series,
+            RedumpSystem.NECPCEngineCDTurboGrafxCD,
+            RedumpSystem.NECPCFXPCFXGA,
+            RedumpSystem.PalmOS,
+            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
+            RedumpSystem.PanasonicM2,
+            RedumpSystem.PhilipsCDi,
+            RedumpSystem.PhilipsCDiDigitalVideo,
+            RedumpSystem.PhotoCD,
+            RedumpSystem.PlayStationGameSharkUpdates,
+            RedumpSystem.SegaChihiro,
+            RedumpSystem.SegaDreamcast,
+            RedumpSystem.SegaMegaCDSegaCD,
+            RedumpSystem.SegaNaomi,
+            RedumpSystem.SegaNaomi2,
+            RedumpSystem.SegaSaturn,
+            RedumpSystem.SegaTriforce,
+            RedumpSystem.SNKNeoGeoCD,
+            RedumpSystem.SonyPlayStation,
+            RedumpSystem.SonyPlayStation2,
+            RedumpSystem.SonyPlayStation3,
+            RedumpSystem.TABAustriaQuizard,
+            RedumpSystem.TomyKissSite,
+            RedumpSystem.VideoCD,
+            RedumpSystem.VTechVFlashVSmilePro,
+};
 
-        public static string Extension(this MediaType? type)
+        /// <summary>
+        /// List of systems that has a Dat pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasDat = new RedumpSystem[]
         {
-            return Converters.MediaTypeToExtension(type);
-        }
+            RedumpSystem.MicrosoftXboxBIOS,
+            RedumpSystem.NintendoGameCubeBIOS,
+            RedumpSystem.SonyPlayStationBIOS,
+            RedumpSystem.SonyPlayStation2BIOS,
+
+            RedumpSystem.AppleMacintosh,
+            RedumpSystem.AudioCD,
+            RedumpSystem.BDVideo,
+            RedumpSystem.BandaiPippin,
+            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
+            RedumpSystem.CommodoreAmigaCD,
+            RedumpSystem.CommodoreAmigaCD32,
+            RedumpSystem.CommodoreAmigaCDTV,
+            RedumpSystem.DVDVideo,
+            RedumpSystem.FujitsuFMTownsseries,
+            RedumpSystem.HasbroVideoNow,
+            RedumpSystem.HasbroVideoNowJr,
+            RedumpSystem.IBMPCcompatible,
+            RedumpSystem.IncredibleTechnologiesEagle,
+            RedumpSystem.KonamiFireBeat,
+            RedumpSystem.KonamiM2,
+            RedumpSystem.KonamiSystemGV,
+            RedumpSystem.KonamieAmusement,
+            RedumpSystem.MattelHyperScan,
+            RedumpSystem.MicrosoftXbox,
+            RedumpSystem.MicrosoftXbox360,
+            RedumpSystem.MicrosoftXboxOne,
+            RedumpSystem.NamcoSystem246,
+            RedumpSystem.NavisoftNaviken21,
+            RedumpSystem.NECPC88series,
+            RedumpSystem.NECPC98series,
+            RedumpSystem.NECPCEngineCDTurboGrafxCD,
+            RedumpSystem.NECPCFXPCFXGA,
+            RedumpSystem.NinendoGameCube,
+            RedumpSystem.NintendoWii,
+            RedumpSystem.NintendoWiiU,
+            RedumpSystem.PalmOS,
+            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
+            RedumpSystem.PanasonicM2,
+            RedumpSystem.PhilipsCDi,
+            RedumpSystem.PhilipsCDiDigitalVideo,
+            RedumpSystem.PhotoCD,
+            RedumpSystem.PlayStationGameSharkUpdates,
+            RedumpSystem.SegaChihiro,
+            RedumpSystem.SegaDreamcast,
+            RedumpSystem.SegaLindbergh,
+            RedumpSystem.SegaMegaCDSegaCD,
+            RedumpSystem.SegaNaomi,
+            RedumpSystem.SegaNaomi2,
+            RedumpSystem.SegaRingEdge,
+            RedumpSystem.SegaRingEdge2,
+            RedumpSystem.SegaSaturn,
+            RedumpSystem.SegaTriforce,
+            RedumpSystem.SNKNeoGeoCD,
+            RedumpSystem.SonyPlayStation,
+            RedumpSystem.SonyPlayStation2,
+            RedumpSystem.SonyPlayStation3,
+            RedumpSystem.SonyPlayStation4,
+            RedumpSystem.SonyPlayStationPortable,
+            RedumpSystem.TABAustriaQuizard,
+            RedumpSystem.TomyKissSite,
+            RedumpSystem.VideoCD,
+            RedumpSystem.VMLabsNUON,
+            RedumpSystem.VTechVFlashVSmilePro,
+            RedumpSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem,
+        };
+
+        /// <summary>
+        /// List of systems that has a Decrypted Keys pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasDkeys = new RedumpSystem[]
+        {
+            RedumpSystem.SonyPlayStation3,
+        };
+
+        /// <summary>
+        /// List of systems that has a GDI pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasGdi = new RedumpSystem[]
+        {
+            RedumpSystem.SegaChihiro,
+            RedumpSystem.SegaDreamcast,
+            RedumpSystem.SegaNaomi,
+            RedumpSystem.SegaNaomi2,
+            RedumpSystem.SegaTriforce,
+        };
+
+        /// <summary>
+        /// List of systems that has a Keys pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasKeys = new RedumpSystem[]
+        {
+            RedumpSystem.NintendoWiiU,
+            RedumpSystem.SonyPlayStation3,
+        };
+
+        /// <summary>
+        /// List of systems that has an SBI pack
+        /// </summary>
+        public static readonly RedumpSystem[] HasSbi = new RedumpSystem[]
+        {
+            RedumpSystem.IBMPCcompatible,
+            RedumpSystem.SonyPlayStation,
+        };
+
+        #endregion
 
         public static bool DoesSupportDriveSpeed(this MediaType? type)
         {
@@ -48,29 +208,22 @@ namespace DICUI.Utilities
                 case MediaType.GDROM:
                 case MediaType.HDDVD:
                 case MediaType.BluRay:
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     return true;
                 default:
                     return false;
             }
         }
-    }
-
-    /// <summary>
-    /// Extensions for KnownSystem? for easier calling
-    /// </summary>
-    public static class KnownSystemExtensions
-    {
-        public static string Name(this KnownSystem? system)
-        {
-            return Converters.KnownSystemToString(system);
-        }
 
         public static KnownSystemCategory Category(this KnownSystem? system)
         {
-            if (system < KnownSystem.MarkerConsoleEnd)
-                return KnownSystemCategory.Console;
+            if (system < KnownSystem.MarkerDiscBasedConsoleEnd)
+                return KnownSystemCategory.DiscBasedConsole;
+            /*
+            else if (system < KnownSystem.MarkerOtherConsoleEnd)
+                return KnownSystemCategory.OtherConsole;
+            */
             else if (system < KnownSystem.MarkerComputerEnd)
                 return KnownSystemCategory.Computer;
             else if (system < KnownSystem.MarkerArcadeEnd)
@@ -87,7 +240,8 @@ namespace DICUI.Utilities
             {
                 case KnownSystem.MarkerArcadeEnd:
                 case KnownSystem.MarkerComputerEnd:
-                case KnownSystem.MarkerConsoleEnd:
+                case KnownSystem.MarkerDiscBasedConsoleEnd:
+                // case KnownSystem.MarkerOtherConsoleEnd:
                 case KnownSystem.MarkerOtherEnd:
                     return true;
                 default:
@@ -95,32 +249,4 @@ namespace DICUI.Utilities
             }
         }
     }
-
-    /// <summary>
-    /// Extensions for KnownSystemCategory?
-    /// </summary>
-    public static class KnownSystemCategoryExtensions
-    {
-        /// <summary>
-        /// Get the string representation of a KnownSystemCategory
-        /// </summary>
-        public static string Name(this KnownSystemCategory? category)
-        {
-            switch (category)
-            {
-                case KnownSystemCategory.Arcade:
-                    return "Arcade";
-                case KnownSystemCategory.Computer:
-                    return "Computers";
-                case KnownSystemCategory.Console:
-                    return "Consoles";
-                case KnownSystemCategory.Other:
-                    return "Other";
-                case KnownSystemCategory.Custom:
-                    return "Custom";
-                default:
-                    return "";
-            }
-        }
-    }
 }

DICUI.Library/Utilities/Parameters.cs

@@ -8,26 +8,48 @@ using DICUI.Data;
 namespace DICUI.Utilities
 {
     /// <summary>
-    ///  Represents a generic set of DIC parameters
+    ///  Represents a generic set of DiscImageCreator parameters
     /// </summary>
     public class Parameters
     {
-        // DIC Command
-        public DICCommand Command;
+        /// <summary>
+        /// Base DiscImageCreator command to run
+        /// </summary>
+        public DICCommand Command { get; set; }
 
-        // Drive Information
-        public string DriveLetter;
-        public int? DriveSpeed;
+        /// <summary>
+        /// Drive letter or path to pass to DiscImageCreator
+        /// </summary>
+        public string DriveLetter { get; set; }
 
-        // Path Information
-        public string Filename;
-        public string OptiarcFilename;
+        /// <summary>
+        /// Drive speed to set, if applicable
+        /// </summary>
+        public int? DriveSpeed { get; set; }
 
-        // Sector Information
-        public int? StartLBAValue;
-        public int? EndLBAValue;
+        /// <summary>
+        /// Destination filename for DiscImageCreator output
+        /// </summary>
+        public string Filename { get; set; }
 
-        // DIC Flags
+        /// <summary>
+        /// Optiarc drive output filename for merging
+        /// </summary>
+        public string OptiarcFilename { get; set; }
+
+        /// <summary>
+        /// Start LBA value for dumping specific sectors
+        /// </summary>
+        public int? StartLBAValue { get; set; }
+
+        /// <summary>
+        /// End LBA value for dumping specific sectors
+        /// </summary>
+        public int? EndLBAValue { get; set; }
+
+        /// <summary>
+        /// Set of flags to pass to DiscImageCreator
+        /// </summary>
         private Dictionary<DICFlag, bool> _flags = new Dictionary<DICFlag, bool>();
         public bool this[DICFlag key]
         {
@@ -42,26 +64,62 @@ namespace DICUI.Utilities
                 _flags[key] = value;
             }
         }
-        public IEnumerable<DICFlag> Keys => _flags.Keys;
+        internal IEnumerable<DICFlag> Keys => _flags.Keys;
 
-        // DIC Flag Values
-        public int? AddOffsetValue;
-        public string BEOpcodeValue; // raw (default), pack
-        public int?[] C2OpcodeValue = new int?[4];    // Reread Value;
-        //public int? C2OpcodeValue2;   // 0 reread issue sector (default), 1 reread all
-        //public int? C2OpcodeValue3;   // First LBA to reread (default 0)
-        //public int? C2OpcodeValue4;   // Last LBA to reread (default EOS)
-        public int? ForceUnitAccessValue; // Delete per specified (default 1)
-        public int? ScanFileProtectValue; // Timeout value (default 60)
-        public int?[] SkipSectorValue = new int?[2]; // Skip between sectors
-        public int? SubchannelReadLevelValue; // 0 no next sub, 1 next sub (default), 2 next and next next
+        #region DIC Flag Values
 
         /// <summary>
-        /// Generic empty constructor for adding things individually
+        /// Manual offset for Audio CD
         /// </summary>
-        public Parameters()
-        {
-        }
+        public int? AddOffsetValue { get; set; }
+
+        /// <summary>
+        /// 0xbe opcode value for dumping
+        /// Possible values: raw (default), pack
+        /// </summary>
+        public string BEOpcodeValue { get; set; }
+
+        /// <summary>
+        /// C2 reread options for dumping
+        /// [0] - Reread value
+        /// [1] - 0 reread issue sector (default), 1 reread all
+        /// [2] - First LBA to reread (default 0)
+        /// [3] - Last LBA to reread (default EOS)
+        /// </summary>
+        public int?[] C2OpcodeValue { get; set; } = new int?[4];
+
+        /// <summary>
+        /// Set the force unit access flag value (default 1)
+        /// </summary>
+        public int? ForceUnitAccessValue { get; set; }
+
+        /// <summary>
+        /// Set the no skip security sector flag value (default 100)
+        /// </summary>
+        public int? NoSkipSecuritySectorValue { get; set; }
+
+        /// <summary>
+        /// Set scan file timeout value (default 60)
+        /// </summary>
+        public int? ScanFileProtectValue { get; set; }
+
+        /// <summary>
+        /// Beginning and ending sectors to skip for physical protection
+        /// </summary>
+        public int?[] SkipSectorValue { get; set; } = new int?[2];
+
+        /// <summary>
+        /// Set the subchanel read level
+        /// Possible values: 0 no next sub, 1 next sub (default), 2 next and next next
+        /// </summary>
+        public int? SubchannelReadLevelValue { get; set; }
+
+        /// <summary>
+        /// Set number of empty bytes to insert at the head of first track for VideoNow
+        /// </summary>
+        public int? VideoNowValue { get; set; }
+
+        #endregion
 
         /// <summary>
         /// Populate a Parameters object from a param string
@@ -88,8 +146,10 @@ namespace DICUI.Utilities
                 BEOpcodeValue = null;
                 C2OpcodeValue = new int?[4];
                 ForceUnitAccessValue = null;
+                NoSkipSecuritySectorValue = null;
                 ScanFileProtectValue = null;
                 SubchannelReadLevelValue = null;
+                VideoNowValue = null;
             }
         }
 
@@ -115,7 +175,6 @@ namespace DICUI.Utilities
         /// <summary>
         /// Determine the base flags to use for checking a commandline
         /// </summary>
-        /// <param name="parameters">Parameters as a string to check</param>
         /// <param name="type">Output nullable MediaType containing the found MediaType, if possible</param>
         /// <param name="system">Output nullable KnownSystem containing the found KnownSystem, if possible</param>
         /// <param name="letter">Output string containing the found drive letter</param>
@@ -131,8 +190,8 @@ namespace DICUI.Utilities
                 return false;
 
             // Set the default outputs
-            type = Converters.BaseCommmandToMediaType(Command);
-            system = Converters.BaseCommandToKnownSystem(Command);
+            type = Converters.ToMediaType(Command);
+            system = Converters.ToKnownSystem(Command);
             letter = DriveLetter;
             path = Filename;
 
@@ -148,11 +207,11 @@ namespace DICUI.Utilities
                     // GameCube and Wii
                     if (this[DICFlag.Raw])
                     {
-                        type = MediaType.NintendoGameCube;
+                        type = MediaType.NintendoGameCubeGameDisc;
                         system = KnownSystem.NintendoGameCube;
                     }
 
-                    // PlaySTation
+                    // PlayStation
                     else if (this[DICFlag.NoFixSubQLibCrypt]
                         || this[DICFlag.ScanAntiMod])
                     {
@@ -182,7 +241,7 @@ namespace DICUI.Utilities
             List<string> parameters = new List<string>();
 
             if (Command != DICCommand.NONE)
-                parameters.Add(Command.Name());
+                parameters.Add(Command.LongName());
             else
                 return null;
 
@@ -193,11 +252,13 @@ namespace DICUI.Utilities
                 || Command == DICCommand.CompactDisc
                 || Command == DICCommand.Data
                 || Command == DICCommand.DigitalVideoDisc
+                || Command == DICCommand.Disk
                 || Command == DICCommand.DriveSpeed
                 || Command == DICCommand.Eject
                 || Command == DICCommand.Floppy
                 || Command == DICCommand.GDROM
                 || Command == DICCommand.Reset
+                || Command == DICCommand.SACD
                 || Command == DICCommand.Start
                 || Command == DICCommand.Stop
                 || Command == DICCommand.Swap
@@ -218,10 +279,12 @@ namespace DICUI.Utilities
                 || Command == DICCommand.CompactDisc
                 || Command == DICCommand.Data
                 || Command == DICCommand.DigitalVideoDisc
+                || Command == DICCommand.Disk
                 || Command == DICCommand.Floppy
                 || Command == DICCommand.GDROM
                 || Command == DICCommand.MDS
                 || Command == DICCommand.Merge
+                || Command == DICCommand.SACD
                 || Command == DICCommand.Swap
                 || Command == DICCommand.Sub
                 || Command == DICCommand.XBOX
@@ -251,6 +314,7 @@ namespace DICUI.Utilities
                 || Command == DICCommand.Data
                 || Command == DICCommand.DigitalVideoDisc
                 || Command == DICCommand.GDROM
+                || Command == DICCommand.SACD
                 || Command == DICCommand.Swap
                 || Command == DICCommand.XBOX
                 || Command == DICCommand.XBOXSwap
@@ -283,7 +347,7 @@ namespace DICUI.Utilities
             {
                 if (this[DICFlag.AddOffset])
                 {
-                    parameters.Add(DICFlag.AddOffset.Name());
+                    parameters.Add(DICFlag.AddOffset.LongName());
                     if (AddOffsetValue != null)
                         parameters.Add(AddOffsetValue.ToString());
                     else
@@ -295,7 +359,14 @@ namespace DICUI.Utilities
             if (Command == DICCommand.CompactDisc)
             {
                 if (this[DICFlag.AMSF])
-                    parameters.Add(DICFlag.AMSF.Name());
+                    parameters.Add(DICFlag.AMSF.LongName());
+            }
+
+            // Atari Jaguar CD
+            if (Command == DICCommand.CompactDisc)
+            {
+                if (this[DICFlag.AtariJaguar])
+                    parameters.Add(DICFlag.AtariJaguar.LongName());
             }
 
             // BE Opcode
@@ -307,7 +378,7 @@ namespace DICUI.Utilities
             {
                 if (this[DICFlag.BEOpcode] && !this[DICFlag.D8Opcode])
                 {
-                    parameters.Add(DICFlag.BEOpcode.Name());
+                    parameters.Add(DICFlag.BEOpcode.LongName());
                     if (BEOpcodeValue != null
                         && (BEOpcodeValue == "raw" || BEOpcodeValue == "pack"))
                         parameters.Add(BEOpcodeValue);
@@ -323,7 +394,7 @@ namespace DICUI.Utilities
             {
                 if (this[DICFlag.C2Opcode])
                 {
-                    parameters.Add(DICFlag.C2Opcode.Name());
+                    parameters.Add(DICFlag.C2Opcode.LongName());
                     if (C2OpcodeValue[0] != null)
                     {
                         if (C2OpcodeValue[0] > 0)
@@ -359,7 +430,7 @@ namespace DICUI.Utilities
             if (Command == DICCommand.DigitalVideoDisc)
             {
                 if (this[DICFlag.CopyrightManagementInformation])
-                    parameters.Add(DICFlag.CopyrightManagementInformation.Name());
+                    parameters.Add(DICFlag.CopyrightManagementInformation.LongName());
             }
 
             // D8 Opcode
@@ -370,7 +441,7 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.D8Opcode])
-                    parameters.Add(DICFlag.D8Opcode.Name());
+                    parameters.Add(DICFlag.D8Opcode.LongName());
             }
 
             // Disable Beep
@@ -384,19 +455,21 @@ namespace DICUI.Utilities
                || Command == DICCommand.XBOX)
             {
                 if (this[DICFlag.DisableBeep])
-                    parameters.Add(DICFlag.DisableBeep.Name());
+                    parameters.Add(DICFlag.DisableBeep.LongName());
             }
 
             // Force Unit Access
-            if (Command == DICCommand.BluRay
+            if (Command == DICCommand.Audio
+               || Command == DICCommand.BluRay
                || Command == DICCommand.CompactDisc
+               || Command == DICCommand.Data
                || Command == DICCommand.DigitalVideoDisc
                || Command == DICCommand.Swap
                || Command == DICCommand.XBOX)
             {
                 if (this[DICFlag.ForceUnitAccess])
                 {
-                    parameters.Add(DICFlag.ForceUnitAccess.Name());
+                    parameters.Add(DICFlag.ForceUnitAccess.LongName());
                     if (ForceUnitAccessValue != null)
                         parameters.Add(ForceUnitAccessValue.ToString());
                 }
@@ -406,14 +479,14 @@ namespace DICUI.Utilities
             if (Command == DICCommand.CompactDisc)
             {
                 if (this[DICFlag.MCN])
-                    parameters.Add(DICFlag.MCN.Name());
+                    parameters.Add(DICFlag.MCN.LongName());
             }
 
             // Multi-Session
             if (Command == DICCommand.CompactDisc)
             {
                 if (this[DICFlag.MultiSession])
-                    parameters.Add(DICFlag.MultiSession.Name());
+                    parameters.Add(DICFlag.MultiSession.LongName());
             }
 
             // Not fix SubP
@@ -424,7 +497,7 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.NoFixSubP])
-                    parameters.Add(DICFlag.NoFixSubP.Name());
+                    parameters.Add(DICFlag.NoFixSubP.LongName());
             }
 
             // Not fix SubQ
@@ -435,7 +508,7 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.NoFixSubQ])
-                    parameters.Add(DICFlag.NoFixSubQ.Name());
+                    parameters.Add(DICFlag.NoFixSubQ.LongName());
             }
 
             // Not fix SubQ (PlayStation LibCrypt)
@@ -446,7 +519,7 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.NoFixSubQLibCrypt])
-                    parameters.Add(DICFlag.NoFixSubQLibCrypt.Name());
+                    parameters.Add(DICFlag.NoFixSubQLibCrypt.LongName());
             }
             
             // Not fix SubQ (SecuROM)
@@ -457,7 +530,7 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.NoFixSubQSecuROM])
-                    parameters.Add(DICFlag.NoFixSubQSecuROM.Name());
+                    parameters.Add(DICFlag.NoFixSubQSecuROM.LongName());
             }
 
             // Not fix SubRtoW
@@ -468,22 +541,37 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.NoFixSubRtoW])
-                    parameters.Add(DICFlag.NoFixSubRtoW.Name());
+                    parameters.Add(DICFlag.NoFixSubRtoW.LongName());
+            }
+
+            // Not skip security sectors
+            if (Command == DICCommand.XBOX
+                || Command == DICCommand.XBOXSwap
+                || Command == DICCommand.XGD2Swap
+                || Command == DICCommand.XGD3Swap)
+            {
+                if (this[DICFlag.NoSkipSS])
+                {
+                    parameters.Add(DICFlag.NoSkipSS.LongName());
+                    if (NoSkipSecuritySectorValue != null)
+                        parameters.Add(NoSkipSecuritySectorValue.ToString());
+                }
             }
 
             // Raw read (2064 byte/sector)
             if (Command == DICCommand.DigitalVideoDisc)
             {
                 if (this[DICFlag.Raw])
-                    parameters.Add(DICFlag.Raw.Name());
+                    parameters.Add(DICFlag.Raw.LongName());
             }
 
             // Reverse read
             if (Command == DICCommand.CompactDisc
-               || Command == DICCommand.Data)
+               || Command == DICCommand.Data
+               || Command == DICCommand.DigitalVideoDisc)
             {
                 if (this[DICFlag.Reverse])
-                    parameters.Add(DICFlag.Reverse.Name());
+                    parameters.Add(DICFlag.Reverse.LongName());
             }
 
             // Scan PlayStation anti-mod strings
@@ -491,18 +579,19 @@ namespace DICUI.Utilities
                || Command == DICCommand.Data)
             {
                 if (this[DICFlag.ScanAntiMod])
-                    parameters.Add(DICFlag.ScanAntiMod.Name());
+                    parameters.Add(DICFlag.ScanAntiMod.LongName());
             }
 
             // Scan file to detect protect
             if (Command == DICCommand.Audio
                || Command == DICCommand.CompactDisc
                || Command == DICCommand.Data
+               || Command == DICCommand.DigitalVideoDisc
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.ScanFileProtect])
                 {
-                    parameters.Add(DICFlag.ScanFileProtect.Name());
+                    parameters.Add(DICFlag.ScanFileProtect.LongName());
                     if (ScanFileProtectValue != null)
                     {
                         if (ScanFileProtectValue > 0)
@@ -519,14 +608,14 @@ namespace DICUI.Utilities
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.ScanSectorProtect])
-                    parameters.Add(DICFlag.ScanSectorProtect.Name());
+                    parameters.Add(DICFlag.ScanSectorProtect.LongName());
             }
 
             // Scan 74:00:00 (Saturn)
             if (Command == DICCommand.Swap)
             {
                 if (this[DICFlag.SeventyFour])
-                    parameters.Add(DICFlag.SeventyFour.Name());
+                    parameters.Add(DICFlag.SeventyFour.LongName());
             }
 
             // Skip sectors
@@ -536,7 +625,7 @@ namespace DICUI.Utilities
                 {
                     if (SkipSectorValue[0] != null && SkipSectorValue[1] != null)
                     {
-                        parameters.Add(DICFlag.SkipSector.Name());
+                        parameters.Add(DICFlag.SkipSector.LongName());
                         if (SkipSectorValue[0] >= 0 && SkipSectorValue[1] >= 0)
                         {
                             parameters.Add(SkipSectorValue[0].ToString());
@@ -559,7 +648,7 @@ namespace DICUI.Utilities
             {
                 if (this[DICFlag.SubchannelReadLevel])
                 {
-                    parameters.Add(DICFlag.SubchannelReadLevel.Name());
+                    parameters.Add(DICFlag.SubchannelReadLevel.LongName());
                     if (SubchannelReadLevelValue != null)
                     {
                         if (SubchannelReadLevelValue >= 0 && SubchannelReadLevelValue <= 2)
@@ -570,6 +659,29 @@ namespace DICUI.Utilities
                 }
             }
 
+            // VideoNow
+            if (Command == DICCommand.CompactDisc)
+            {
+                if (this[DICFlag.VideoNow])
+                {
+                    parameters.Add(DICFlag.VideoNow.LongName());
+                    if (VideoNowValue != null)
+                    {
+                        if (VideoNowValue >= 0)
+                            parameters.Add(VideoNowValue.ToString());
+                        else
+                            return null;
+                    }
+                }
+            }
+
+            // VideoNow Color
+            if (Command == DICCommand.CompactDisc)
+            {
+                if (this[DICFlag.VideoNowColor])
+                    parameters.Add(DICFlag.VideoNowColor.LongName());
+            }
+
             return string.Join(" ", parameters);
         }
 
@@ -590,10 +702,8 @@ namespace DICUI.Utilities
         private bool ValidateAndSetParameters(string parameters)
         {
             // The string has to be valid by itself first
-            if (String.IsNullOrWhiteSpace(parameters))
-            {
+            if (string.IsNullOrWhiteSpace(parameters))
                 return false;
-            }
 
             // Now split the string into parts for easier validation
             // https://stackoverflow.com/questions/14655023/split-a-string-that-has-white-spaces-unless-they-are-enclosed-within-quotes
@@ -739,6 +849,23 @@ namespace DICUI.Utilities
                     index = 4;
                     break;
 
+                case DICCommandStrings.Disk:
+                    if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1]))
+                        return false;
+                    else
+                        DriveLetter = parts[1];
+
+                    if (!DoesExist(parts, 2) || IsFlag(parts[2]))
+                        return false;
+                    else
+                        Filename = parts[2];
+
+                    if (parts.Count > 3)
+                        return false;
+
+                    Command = DICCommand.Disk;
+                    break;
+
                 case DICCommandStrings.DriveSpeed:
                     if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1]))
                         return false;
@@ -841,6 +968,28 @@ namespace DICUI.Utilities
                     Command = DICCommand.Reset;
                     break;
 
+                case DICCommandStrings.SACD:
+                    if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1]))
+                        return false;
+                    else
+                        DriveLetter = parts[1];
+
+                    if (!DoesExist(parts, 2) || IsFlag(parts[2]))
+                        return false;
+                    else
+                        Filename = parts[2];
+
+                    if (!DoesExist(parts, 3) || !IsValidNumber(parts[3], lowerBound: 0, upperBound: 16))
+                        return false;
+                    else
+                        DriveSpeed = Int32.Parse(parts[3]);
+
+                    if (parts.Count > 4)
+                        return false;
+
+                    Command = DICCommand.SACD;
+                    break;
+
                 case DICCommandStrings.Start:
                     if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1]))
                         return false;
@@ -974,6 +1123,13 @@ namespace DICUI.Utilities
                             this[DICFlag.AMSF] = true;
                             break;
 
+                        case DICFlagStrings.AtariJaguar:
+                            if (parts[0] != DICCommandStrings.CompactDisc)
+                                return false;
+
+                            this[DICFlag.AtariJaguar] = true;
+                            break;
+
                         case DICFlagStrings.BEOpcode:
                             if (parts[0] != DICCommandStrings.Audio
                                 && parts[0] != DICCommandStrings.CompactDisc
@@ -1055,12 +1211,12 @@ namespace DICUI.Utilities
 
                         case DICFlagStrings.ForceUnitAccess:
                             if (parts[0] != DICCommandStrings.Audio
-                                && parts[0] != DICCommandStrings.BluRay
-                                && parts[0] != DICCommandStrings.CompactDisc
-                                && parts[0] != DICCommandStrings.DigitalVideoDisc
-                                && parts[0] != DICCommandStrings.Data
-                                && parts[0] != DICCommandStrings.GDROM
-                                && parts[0] != DICCommandStrings.XBOX)
+                               && parts[0] != DICCommandStrings.BluRay
+                               && parts[0] != DICCommandStrings.CompactDisc
+                               && parts[0] != DICCommandStrings.DigitalVideoDisc
+                               && parts[0] != DICCommandStrings.Data
+                               && parts[0] != DICCommandStrings.GDROM
+                               && parts[0] != DICCommandStrings.XBOX)
                                 return false;
                             else if (!DoesExist(parts, i + 1))
                             {
@@ -1121,6 +1277,16 @@ namespace DICUI.Utilities
                             this[DICFlag.NoFixSubQLibCrypt] = true;
                             break;
 
+                        case DICFlagStrings.NoFixSubRtoW:
+                            if (parts[0] != DICCommandStrings.Audio
+                                && parts[0] != DICCommandStrings.CompactDisc
+                                && parts[0] != DICCommandStrings.Data
+                                && parts[0] != DICCommandStrings.GDROM)
+                                return false;
+
+                            this[DICFlag.NoFixSubRtoW] = true;
+                            break;
+
                         case DICFlagStrings.NoFixSubQSecuROM:
                             if (parts[0] != DICCommandStrings.Audio
                                 && parts[0] != DICCommandStrings.CompactDisc
@@ -1131,14 +1297,28 @@ namespace DICUI.Utilities
                             this[DICFlag.NoFixSubQSecuROM] = true;
                             break;
 
-                        case DICFlagStrings.NoFixSubRtoW:
-                            if (parts[0] != DICCommandStrings.Audio
-                                && parts[0] != DICCommandStrings.CompactDisc
-                                && parts[0] != DICCommandStrings.Data
-                                && parts[0] != DICCommandStrings.GDROM)
+                        case DICFlagStrings.NoSkipSS:
+                            if (parts[0] != DICCommandStrings.XBOX
+                                && parts[0] != DICCommandStrings.XBOXSwap
+                                && parts[0] != DICCommandStrings.XGD2Swap
+                                && parts[0] != DICCommandStrings.XGD3Swap)
+                                return false;
+                            else if (!DoesExist(parts, i + 1))
+                            {
+                                this[DICFlag.NoSkipSS] = true;
+                                break;
+                            }
+                            else if (IsFlag(parts[i + 1]))
+                            {
+                                this[DICFlag.NoSkipSS] = true;
+                                break;
+                            }
+                            else if (!IsValidNumber(parts[i + 1], lowerBound: 0))
                                 return false;
 
-                            this[DICFlag.NoFixSubRtoW] = true;
+                            this[DICFlag.NoSkipSS] = true;
+                            ForceUnitAccessValue = Int32.Parse(parts[i + 1]);
+                            i++;
                             break;
 
                         case DICFlagStrings.Raw:
@@ -1150,7 +1330,8 @@ namespace DICUI.Utilities
 
                         case DICFlagStrings.Reverse:
                             if (parts[0] != DICCommandStrings.CompactDisc
-                                && parts[0] != DICCommandStrings.Data)
+                                && parts[0] != DICCommandStrings.Data
+                                && parts[0] != DICCommandStrings.DigitalVideoDisc)
                                 return false;
 
                             this[DICFlag.Reverse] = true;
@@ -1165,7 +1346,8 @@ namespace DICUI.Utilities
 
                         case DICFlagStrings.ScanFileProtect:
                             if (parts[0] != DICCommandStrings.CompactDisc
-                                && parts[0] != DICCommandStrings.Data)
+                                && parts[0] != DICCommandStrings.Data
+                                && parts[0] != DICCommandStrings.DigitalVideoDisc)
                                 return false;
                             else if (!DoesExist(parts, i + 1))
                             {
@@ -1240,6 +1422,34 @@ namespace DICUI.Utilities
                             i++;
                             break;
 
+                        case DICFlagStrings.VideoNow:
+                            if (parts[0] != DICCommandStrings.CompactDisc)
+                                return false;
+                            else if (!DoesExist(parts, i + 1))
+                            {
+                                this[DICFlag.VideoNow] = true;
+                                break;
+                            }
+                            else if (IsFlag(parts[i + 1]))
+                            {
+                                this[DICFlag.VideoNow] = true;
+                                break;
+                            }
+                            else if (!IsValidNumber(parts[i + 1], lowerBound: 0))
+                                return false;
+
+                            this[DICFlag.VideoNow] = true;
+                            VideoNowValue = Int32.Parse(parts[i + 1]);
+                            i++;
+                            break;
+
+                        case DICFlagStrings.VideoNowColor:
+                            if (parts[0] != DICCommandStrings.CompactDisc)
+                                return false;
+
+                            this[DICFlag.VideoNowColor] = true;
+                            break;
+
                         default:
                             return false;
                     }
@@ -1325,7 +1535,10 @@ namespace DICUI.Utilities
             switch (type)
             {
                 case MediaType.CDROM:
-                    Command = DICCommand.CompactDisc;
+                    if (system == KnownSystem.SuperAudioCD)
+                        Command = DICCommand.SACD;
+                    else
+                        Command = DICCommand.CompactDisc;
                     return;
                 case MediaType.DVD:
                     if (system == KnownSystem.MicrosoftXBOX
@@ -1345,7 +1558,7 @@ namespace DICUI.Utilities
                 case MediaType.BluRay:
                     Command = DICCommand.BluRay;
                     return;
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                     Command = DICCommand.DigitalVideoDisc;
                     return;
                 case MediaType.NintendoWiiOpticalDisc:
@@ -1354,6 +1567,9 @@ namespace DICUI.Utilities
                 case MediaType.FloppyDisk:
                     Command = DICCommand.Floppy;
                     return;
+                case MediaType.HardDisk:
+                    Command = DICCommand.Disk;
+                    return;
 
                 default:
                     Command = DICCommand.NONE;
@@ -1373,9 +1589,7 @@ namespace DICUI.Utilities
             // First check to see if the combination of system and MediaType is valid
             var validTypes = Validators.GetValidMediaTypes(system);
             if (!validTypes.Contains(type))
-            {
                 return;
-            }
 
             // Set the C2 reread count
             switch (rereadCount)
@@ -1392,7 +1606,6 @@ namespace DICUI.Utilities
             }
 
             // Now sort based on disc type
-            List<string> parameters = new List<string>();
             switch (type)
             {
                 case MediaType.CDROM:
@@ -1412,6 +1625,21 @@ namespace DICUI.Utilities
                                 SubchannelReadLevelValue = 2;
                             }
                             break;
+                        case KnownSystem.AtariJaguarCD:
+                            this[DICFlag.AtariJaguar] = true;
+                            break;
+                        case KnownSystem.HasbroVideoNow:
+                        case KnownSystem.HasbroVideoNowJr:
+                            this[DICFlag.VideoNow] = true;
+                            this.VideoNowValue = 18032;
+                            break;
+                        case KnownSystem.HasbroVideoNowColor:
+                            this[DICFlag.VideoNowColor] = true;
+                            break;
+                        case KnownSystem.HasbroVideoNowXP:
+                            this[DICFlag.VideoNow] = true;
+                            this.VideoNowValue = 20832;
+                            break;
                         case KnownSystem.NECPCEngineTurboGrafxCD:
                             this[DICFlag.MCN] = true;
                             break;
@@ -1423,7 +1651,10 @@ namespace DICUI.Utilities
                     break;
                 case MediaType.DVD:
                     if (paranoid)
+                    {
                         this[DICFlag.CopyrightManagementInformation] = true;
+                        this[DICFlag.ScanFileProtect] = true;
+                    }
                     break;
                 case MediaType.GDROM:
                     this[DICFlag.C2Opcode] = true;
@@ -1437,7 +1668,7 @@ namespace DICUI.Utilities
                     break;
 
                 // Special Formats
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                     this[DICFlag.Raw] = true;
                     break;
                 case MediaType.NintendoWiiOpticalDisc:

DICUI.Library/Utilities/Result.cs

@@ -5,7 +5,14 @@
     /// </summary>
     public class Result
     {
-        private bool success;
+        /// <summary>
+        /// Internal representation of success
+        /// </summary>
+        private readonly bool success;
+
+        /// <summary>
+        /// Optional message for the result
+        /// </summary>
         public string Message { get; private set; }
 
         private Result(bool success, string message)
@@ -14,14 +21,46 @@
             this.Message = message;
         }
 
+        /// <summary>
+        /// Create a default success result with no message
+        /// </summary>
         public static Result Success() => new Result(true, "");
+
+        /// <summary>
+        /// Create a success result with a custom message
+        /// </summary>
+        /// <param name="message">String to add as a message</param>
         public static Result Success(string message) => new Result(true, message);
+
+        /// <summary>
+        /// Create a success result with a custom message with format parameters
+        /// </summary>
+        /// <param name="message">String to add as a message</param>
+        /// <param name="args">Formatting parameters for the string</param>
         public static Result Success(string message, params object[] args) => new Result(true, string.Format(message, args));
 
+        /// <summary>
+        /// Create a default failure result with no message
+        /// </summary>
+        /// <returns></returns>
         public static Result Failure() => new Result(false, "");
+
+        /// <summary>
+        /// Create a failure result with a custom message
+        /// </summary>
+        /// <param name="message">String to add as a message</param>
         public static Result Failure(string message) => new Result(false, message);
+
+        /// <summary>
+        /// Create a failure result with a custom message with format parameters
+        /// </summary>
+        /// <param name="message">String to add as a message</param>
+        /// <param name="args">Formatting parameters for the string</param>
         public static Result Failure(string message, params object[] args) => new Result(false, string.Format(message, args));
 
+        /// <summary>
+        /// Results can be compared to boolean values based on the success value
+        /// </summary>
         public static implicit operator bool(Result result) => result.success;
     }
 }

DICUI.Library/Utilities/Validators.cs

@@ -25,91 +25,198 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                // https://en.wikipedia.org/wiki/Atari_Jaguar_CD
+                case KnownSystem.AtariJaguarCD:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/Playdia
                 case KnownSystem.BandaiPlaydiaQuickInteractiveSystem:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Apple_Bandai_Pippin
                 case KnownSystem.BandaiApplePippin:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Amiga_CD32
                 case KnownSystem.CommodoreAmigaCD32:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Commodore_CDTV
                 case KnownSystem.CommodoreAmigaCDTV:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/EVO_Smart_Console
+                case KnownSystem.EnvizionsEVOSmartConsole:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
+
+                // https://en.wikipedia.org/wiki/FM_Towns_Marty
+                case KnownSystem.FujitsuFMTownsMarty:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.FloppyDisk);
+                    break;
+
+                // https://en.wikipedia.org/wiki/VideoNow
+                case KnownSystem.HasbroVideoNow:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/VideoNow
+                case KnownSystem.HasbroVideoNowColor:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/VideoNow
+                case KnownSystem.HasbroVideoNowJr:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/VideoNow
+                case KnownSystem.HasbroVideoNowXP:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/HyperScan
                 case KnownSystem.MattelHyperscan:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Xbox_(console)
                 case KnownSystem.MicrosoftXBOX:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/Xbox_360
                 case KnownSystem.MicrosoftXBOX360:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/Xbox_One
                 case KnownSystem.MicrosoftXBOXOne:
                     types.Add(MediaType.BluRay);
                     break;
+
+                // https://en.wikipedia.org/wiki/TurboGrafx-16
                 case KnownSystem.NECPCEngineTurboGrafxCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/PC-FX
                 case KnownSystem.NECPCFX:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/GameCube
                 case KnownSystem.NintendoGameCube:
-                    types.Add(MediaType.NintendoGameCube);
+                    types.Add(MediaType.NintendoGameCubeGameDisc);
                     break;
+
+                // https://en.wikipedia.org/wiki/Super_NES_CD-ROM
+                case KnownSystem.NintendoSonySuperNESCDROMSystem:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/Wii
                 case KnownSystem.NintendoWii:
                     types.Add(MediaType.NintendoWiiOpticalDisc);
                     break;
+
+                // https://en.wikipedia.org/wiki/Wii_U
                 case KnownSystem.NintendoWiiU:
                     types.Add(MediaType.NintendoWiiUOpticalDisc);
                     break;
+
+                // https://en.wikipedia.org/wiki/3DO_Interactive_Multiplayer
                 case KnownSystem.Panasonic3DOInteractiveMultiplayer:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Philips_CD-i
                 case KnownSystem.PhilipsCDi:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/LaserActive
+                case KnownSystem.PioneerLaserActive:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.LaserDisc);
+                    break;
+
+                // https://en.wikipedia.org/wiki/Sega_CD
                 case KnownSystem.SegaCDMegaCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Dreamcast
                 case KnownSystem.SegaDreamcast:
-                    types.Add(MediaType.CDROM);    // Low density partition
-                    types.Add(MediaType.GDROM); // Hight density partition
+                    types.Add(MediaType.CDROM); // Low density partition, MIL-CD
+                    types.Add(MediaType.GDROM); // High density partition
                     break;
+
+                // https://en.wikipedia.org/wiki/Sega_Saturn
                 case KnownSystem.SegaSaturn:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Neo_Geo_CD
                 case KnownSystem.SNKNeoGeoCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/PlayStation_(console)
                 case KnownSystem.SonyPlayStation:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/PlayStation_2
                 case KnownSystem.SonyPlayStation2:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/PlayStation_3
                 case KnownSystem.SonyPlayStation3:
                     types.Add(MediaType.BluRay);
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/PlayStation_4
                 case KnownSystem.SonyPlayStation4:
                     types.Add(MediaType.BluRay);
                     break;
+
+                // https://en.wikipedia.org/wiki/PlayStation_Portable
                 case KnownSystem.SonyPlayStationPortable:
                     types.Add(MediaType.UMD);
-                    types.Add(MediaType.DVD); // TODO: Confirm this
+                    types.Add(MediaType.CDROM); // Development discs only
+                    types.Add(MediaType.DVD); // Development discs only
                     break;
+
+                // https://en.wikipedia.org/wiki/Tandy_Video_Information_System
+                case KnownSystem.TandyMemorexVisualInformationSystem:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://en.wikipedia.org/wiki/Nuon_(DVD_technology)
                 case KnownSystem.VMLabsNuon:
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/V.Flash
                 case KnownSystem.VTechVFlashVSmilePro:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Game_Wave_Family_Entertainment_System
                 case KnownSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem:
                     types.Add(MediaType.DVD);
                     break;
@@ -118,208 +225,367 @@ namespace DICUI.Utilities
 
                 #region Computers
 
+                // https://en.wikipedia.org/wiki/Acorn_Archimedes
                 case KnownSystem.AcornArchimedes:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.FloppyDisk);
                     break;
+
+                // https://en.wikipedia.org/wiki/Macintosh
                 case KnownSystem.AppleMacintosh:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     types.Add(MediaType.FloppyDisk);
+                    types.Add(MediaType.HardDisk);
                     break;
-                case KnownSystem.CommodoreAmigaCD:
+
+                // https://en.wikipedia.org/wiki/Amiga
+                case KnownSystem.CommodoreAmiga:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.FloppyDisk);
                     break;
+
+                // https://en.wikipedia.org/wiki/FM_Towns
                 case KnownSystem.FujitsuFMTowns:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/IBM_PC_compatible
                 case KnownSystem.IBMPCCompatible:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     types.Add(MediaType.FloppyDisk);
+                    types.Add(MediaType.HardDisk);
                     break;
+
+                // https://en.wikipedia.org/wiki/PC-8800_series
                 case KnownSystem.NECPC88:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.FloppyDisk);
                     break;
+
+                // https://en.wikipedia.org/wiki/PC-9800_series
                 case KnownSystem.NECPC98:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    types.Add(MediaType.FloppyDisk);
                     break;
+
+                // https://en.wikipedia.org/wiki/X68000
                 case KnownSystem.SharpX68000:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.FloppyDisk);
                     break;
 
                 #endregion
 
                 #region Arcade
 
+                // https://www.bigbookofamigahardware.com/bboah/product.aspx?id=36
                 case KnownSystem.AmigaCUBOCD32:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Orbatak
                 case KnownSystem.AmericanLaserGames3DO:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=779
                 case KnownSystem.Atari3DO:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://newlifegames.net/nlg/index.php?topic=22003.0
+                // http://newlifegames.net/nlg/index.php?topic=5486.msg119440
                 case KnownSystem.Atronic:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // https://www.arcade-museum.com/members/member_detail.php?member_id=406530
                 case KnownSystem.AUSCOMSystem1:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://newlifegames.net/nlg/index.php?topic=285.0
                 case KnownSystem.BallyGameMagic:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/CP_System_III
                 case KnownSystem.CapcomCPSystemIII:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.GlobalVRVarious:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://service.globalvr.com/troubleshooting/vortek.html
                 case KnownSystem.GlobalVRVortek:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://service.globalvr.com/downloads/v3/040-1001-01c-V3-System-Manual.pdf
                 case KnownSystem.GlobalVRVortekV3:
-                    types.Add(MediaType.DVD); // TODO: Confirm
+                    types.Add(MediaType.CDROM);
                     break;
+
+                // https://www.icegame.com/games
                 case KnownSystem.ICEPCHardware:
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://github.com/mamedev/mame/blob/master/src/mame/drivers/iteagle.cpp
                 case KnownSystem.IncredibleTechnologiesEagle:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.IncredibleTechnologiesVarious:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/E-Amusement
                 case KnownSystem.KonamieAmusement:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=828
                 case KnownSystem.KonamiFirebeat:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=577
                 case KnownSystem.KonamiGVSystem:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=575
                 case KnownSystem.KonamiM2:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=586
+                // http://system16.com/hardware.php?id=977
                 case KnownSystem.KonamiPython:
-                    types.Add(MediaType.DVD); // TODO: Confirm
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=976
+                // http://system16.com/hardware.php?id=831
                 case KnownSystem.KonamiPython2:
-                    types.Add(MediaType.DVD); // TODO: Confirm
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=582
+                // http://system16.com/hardware.php?id=822
+                // http://system16.com/hardware.php?id=823
                 case KnownSystem.KonamiSystem573:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=827
                 case KnownSystem.KonamiTwinkle:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.KonamiVarious:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://www.meritgames.com/Support_Center/manuals/PM0591-01.pdf
                 case KnownSystem.MeritIndustriesBoardwalk:
-                    types.Add(MediaType.CDROM); // TODO: Confirm
-                    break;
-                case KnownSystem.MeritIndustriesMegaTouchAurora:
-                    types.Add(MediaType.CDROM); // TODO: Confirm
-                    break;
-                case KnownSystem.MeritIndustriesMegaTouchForce:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://www.meritgames.com/Support_Center/Force%20Elite/PM0380-09.pdf
+                // http://www.meritgames.com/Support_Center/Force%20Upright/PM0382-07%20FORCE%20Upright%20manual.pdf
+                // http://www.meritgames.com/Support_Center/Force%20Upright/PM0383-07%20FORCE%20Upright%20manual.pdf
+                case KnownSystem.MeritIndustriesMegaTouchForce:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // http://www.meritgames.com/Service%20Center/Ion%20Troubleshooting.pdf
                 case KnownSystem.MeritIndustriesMegaTouchION:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://www.meritgames.com/Support_Center/EZ%20Maxx/Manuals/MAXX%20Elite%20with%20coin.pdf
+                // http://www.meritgames.com/Support_Center/EZ%20Maxx/Manuals/MAXX%20Elite.pdf
+                // http://www.meritgames.com/Support_Center/manuals/90003010%20Maxx%20TSM_Rev%20C.pdf
                 case KnownSystem.MeritIndustriesMegaTouchMaxx:
-                    types.Add(MediaType.DVD);
+                    types.Add(MediaType.CDROM);
                     break;
+
+                // http://www.meritgames.com/Support_Center/manuals/pm0076_OA_Megatouch%20XL%20Trouble%20Shooting%20Manual.pdf
+                // http://www.meritgames.com/Support_Center/MEGA%20XL/manuals/Megatouch_XL_pm0109-0D.pdf
+                // http://www.meritgames.com/Support_Center/MEGA%20XL/manuals/Megatouch_XL_Super_5000_manual.pdf
                 case KnownSystem.MeritIndustriesMegaTouchXL:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=546
+                // http://system16.com/hardware.php?id=872
                 case KnownSystem.NamcoCapcomSystem256:
+                    types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=543
                 case KnownSystem.NamcoCapcomTaitoSystem246:
                     types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=545
                 case KnownSystem.NamcoSegaNintendoTriforce:
-                    types.Add(MediaType.GDROM);
+                    types.Add(MediaType.CDROM); // Low density partition
+                    types.Add(MediaType.GDROM); // High density partition
                     break;
+
+                // http://system16.com/hardware.php?id=535
                 case KnownSystem.NamcoSystem12:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=900
                 case KnownSystem.NamcoSystem357:
+                    types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
                     types.Add(MediaType.BluRay);
                     break;
+
+                // https://www.arcade-history.com/?n=the-yakyuuken-part-1&page=detail&id=33049
                 case KnownSystem.NewJatreCDi:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://blog.system11.org/?p=2499
                 case KnownSystem.NichibutsuHighRateSystem:
-                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://blog.system11.org/?p=2514
                 case KnownSystem.NichibutsuSuperCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://collectedit.com/collectors/shou-time-213/arcade-pcbs-281/x-rate-dvd-series-17-newlywed-life-japan-by-nichibutsu-32245
                 case KnownSystem.NichibutsuXRateSystem:
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/Panasonic_M2
                 case KnownSystem.PanasonicM2:
                     types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
+
+                // https://github.com/mamedev/mame/blob/master/src/mame/drivers/photoply.cpp
                 case KnownSystem.PhotoPlayVarious:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.RawThrillsVarious:
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=729
                 case KnownSystem.SegaChihiro:
-                    types.Add(MediaType.GDROM);
+                    types.Add(MediaType.CDROM); // Low density partition
+                    types.Add(MediaType.GDROM); // High density partition
                     break;
+
+                // http://system16.com/hardware.php?id=907
                 case KnownSystem.SegaEuropaR:
-                    types.Add(MediaType.DVD); // TODO: Confirm
+                    types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=985
+                // http://system16.com/hardware.php?id=731
+                // http://system16.com/hardware.php?id=984
+                // http://system16.com/hardware.php?id=986
                 case KnownSystem.SegaLindbergh:
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=721
+                // http://system16.com/hardware.php?id=723
+                // http://system16.com/hardware.php?id=906
+                // http://system16.com/hardware.php?id=722
                 case KnownSystem.SegaNaomi:
-                    types.Add(MediaType.GDROM);
+                    types.Add(MediaType.CDROM); // Low density partition
+                    types.Add(MediaType.GDROM); // High density partition
                     break;
+
+                // http://system16.com/hardware.php?id=725
+                // http://system16.com/hardware.php?id=726
+                // http://system16.com/hardware.php?id=727
                 case KnownSystem.SegaNaomi2:
-                    types.Add(MediaType.GDROM);
+                    types.Add(MediaType.CDROM); // Low density partition
+                    types.Add(MediaType.GDROM); // High density partition
                     break;
+
+                // http://system16.com/hardware.php?id=975
+                // https://en.wikipedia.org/wiki/List_of_Sega_arcade_system_boards#Sega_Nu
                 case KnownSystem.SegaNu:
-                    types.Add(MediaType.DVD);
                     types.Add(MediaType.BluRay);
                     break;
+
+                // http://system16.com/hardware.php?id=910
+                // https://en.wikipedia.org/wiki/List_of_Sega_arcade_system_boards#Sega_Ring_series
                 case KnownSystem.SegaRingEdge:
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=982
+                // https://en.wikipedia.org/wiki/List_of_Sega_arcade_system_boards#Sega_Ring_series
                 case KnownSystem.SegaRingEdge2:
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=911
+                // https://en.wikipedia.org/wiki/List_of_Sega_arcade_system_boards#Sega_Ring_series
                 case KnownSystem.SegaRingWide:
                     types.Add(MediaType.DVD);
                     break;
+
+                // http://system16.com/hardware.php?id=711
                 case KnownSystem.SegaTitanVideo:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://system16.com/hardware.php?id=709
+                // http://system16.com/hardware.php?id=710
                 case KnownSystem.SegaSystem32:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://github.com/mamedev/mame/blob/master/src/mame/drivers/seibucats.cpp
                 case KnownSystem.SeibuCATSSystem:
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://www.tab.at/en/support/support/downloads
                 case KnownSystem.TABAustriaQuizard:
                     types.Add(MediaType.CDROM);
                     break;
-                case KnownSystem.TandyMemorexVisualInformationSystem:
-                    types.Add(MediaType.CDROM);
-                    break;
+
+                // https://primetimeamusements.com/product/tsumo-multi-game-motion-system/
+                // https://www.highwaygames.com/arcade-machines/tsumo-tsunami-motion-8117/
                 case KnownSystem.TsunamiTsuMoMultiGameMotionSystem:
                     types.Add(MediaType.CDROM);
                     break;
@@ -328,51 +594,77 @@ namespace DICUI.Utilities
 
                 #region Others
 
+                // https://en.wikipedia.org/wiki/Audio_CD
                 case KnownSystem.AudioCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Blu-ray#Player_profiles
                 case KnownSystem.BDVideo:
                     types.Add(MediaType.BluRay);
                     break;
+
+                // https://en.wikipedia.org/wiki/DVD-Video
                 case KnownSystem.DVDVideo:
                     types.Add(MediaType.DVD);
                     break;
+
+                // https://en.wikipedia.org/wiki/Blue_Book_(CD_standard)
                 case KnownSystem.EnhancedCD:
                     types.Add(MediaType.CDROM);
                     break;
-                case KnownSystem.EnhancedDVD:
-                    types.Add(MediaType.DVD);
-                    break;
-                case KnownSystem.EnhancedBD:
-                    types.Add(MediaType.BluRay);
-                    break;
-                case KnownSystem.HasbroVideoNow:
-                    types.Add(MediaType.CDROM);
-                    break;
+
+                // https://en.wikipedia.org/wiki/HD_DVD
                 case KnownSystem.HDDVDVideo:
                     types.Add(MediaType.HDDVD);
                     break;
+
+                // UNKNOWN
+                case KnownSystem.NavisoftNaviken21:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // UNKNOWN
                 case KnownSystem.PalmOS:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.PhilipsCDiDigitalVideo:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Photo_CD
                 case KnownSystem.PhotoCD:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // UNKNOWN
                 case KnownSystem.PlayStationGameSharkUpdates:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Doors_and_Windows_(EP)
                 case KnownSystem.RainbowDisc:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Super_Audio_CD
+                case KnownSystem.SuperAudioCD:
+                    types.Add(MediaType.CDROM);
+                    break;
+
+                // https://www.cnet.com/products/tao-music-iktv-karaoke-station-karaoke-system-series/
                 case KnownSystem.TaoiKTV:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // http://ultimateconsoledatabase.com/golden/kiss_site.htm
                 case KnownSystem.TomyKissSite:
                     types.Add(MediaType.CDROM);
                     break;
+
+                // https://en.wikipedia.org/wiki/Video_CD
                 case KnownSystem.VideoCD:
                     types.Add(MediaType.CDROM);
                     break;
@@ -410,9 +702,13 @@ namespace DICUI.Utilities
         /// </remarks>
         public static List<Drive> CreateListOfDrives()
         {
-            var drives = new List<Drive>();
+            // Get all supported drive types
+            var drives = DriveInfo.GetDrives()
+                .Where(d => d.DriveType == DriveType.CDRom || d.DriveType == DriveType.Fixed || d.DriveType == DriveType.Removable)
+                .Select(d => new Drive(Converters.ToInternalDriveType(d.DriveType), d))
+                .ToList();
 
-            // Get the floppy drives
+            // Get the floppy drives and set the flag from removable
             try
             {
                 ManagementObjectSearcher searcher =
@@ -426,7 +722,7 @@ namespace DICUI.Utilities
                     if (mediaType != null && ((mediaType > 0 && mediaType < 11) || (mediaType > 12 && mediaType < 22)))
                     {
                         char devId = queryObj["DeviceID"].ToString()[0];
-                        drives.Add(Drive.Floppy(devId));
+                        drives.ForEach(d => { if (d.Letter == devId) { d.InternalDriveType = InternalDriveType.Floppy; } });
                     }
                 }
             }
@@ -435,36 +731,38 @@ namespace DICUI.Utilities
                 // No-op
             }
 
-            // Get the optical disc drives
-            List<Drive> discDrives = DriveInfo.GetDrives()
-                .Where(d => d.DriveType == DriveType.CDRom)
-                .Select(d => Drive.Optical(d.Name[0], (d.IsReady ? d.VolumeLabel : Template.DiscNotDetected), d.IsReady))                
-                .ToList();
-
-            // Add the two lists together and order
-            drives.AddRange(discDrives);
+            // Order the drives by drive letter
             drives = drives.OrderBy(i => i.Letter).ToList();
 
             return drives;
         }
 
         /// <summary>
-        /// Get the current disc type from drive letter
+        /// Get the current media type from drive letter
         /// </summary>
-        /// <param name="driveLetter"></param>
+        /// <param name="drive"></param>
         /// <returns></returns>
         /// <remarks>
         /// https://stackoverflow.com/questions/11420365/detecting-if-disc-is-in-dvd-drive
         /// </remarks>
-        public static MediaType? GetDiscType(char? driveLetter)
+        public static MediaType? GetMediaType(Drive drive)
         {
+            // Take care of the non-optical stuff first
+            // TODO: See if any of these can be more granular, like Optical is
+            if (drive.InternalDriveType == InternalDriveType.Floppy)
+                return MediaType.FloppyDisk;
+            else if (drive.InternalDriveType == InternalDriveType.HardDisk)
+                return MediaType.HardDisk;
+            else if (drive.InternalDriveType == InternalDriveType.Removable)
+                return MediaType.FlashDrive;
+
             // Get the DeviceID from the current drive letter
             string deviceId = null;
             try
             {
                 ManagementObjectSearcher searcher =
                     new ManagementObjectSearcher("root\\CIMV2",
-                    "SELECT * FROM Win32_CDROMDrive WHERE Id = '" + driveLetter + ":\'");
+                    "SELECT * FROM Win32_CDROMDrive WHERE Id = '" + drive.Letter + ":\'");
 
                 var collection = searcher.Get();
                 foreach (ManagementObject queryObj in collection)
@@ -503,7 +801,7 @@ namespace DICUI.Utilities
                 dataWriter.Recorder = recorder;
                 var media = dataWriter.CurrentPhysicalMediaType;
                 if (media != IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_UNKNOWN)
-                    return Converters.IMAPIDiskTypeToMediaType(media);
+                    return Converters.ToMediaType(media);
             }
             catch
             {
@@ -513,6 +811,79 @@ namespace DICUI.Utilities
             return null;
         }
 
+        /// <summary>
+        /// Get the current system from drive
+        /// </summary>
+        /// <param name="drive"></param>
+        /// <returns></returns>
+        public static KnownSystem? GetKnownSystem(Drive drive)
+        {
+            // If drive or drive letter are provided, we can't do anything
+            if (drive?.Letter == null)
+                return null;
+
+            string drivePath = $"{drive.Letter}:\\";
+
+            // If we can't read the media in that drive, we can't do anything
+            if (!Directory.Exists(drivePath))
+                return null;
+
+            // We're going to assume for floppies, HDDs, and removable drives
+            // TODO: Try to be smarter about this
+            if (drive.InternalDriveType != InternalDriveType.Optical)
+                return KnownSystem.IBMPCCompatible;
+
+            // Sega Dreamcast
+            if (File.Exists(Path.Combine(drivePath, "IP.BIN")))
+            {
+                return KnownSystem.SegaDreamcast;
+            }
+
+            // Sega Mega-CD / Sega-CD
+            if (File.Exists(Path.Combine(drivePath, "_BOOT", "IP.BIN"))
+                || File.Exists(Path.Combine(drivePath, "_BOOT", "SP.BIN"))
+                || File.Exists(Path.Combine(drivePath, "_BOOT", "SP_AS.BIN"))
+                || File.Exists(Path.Combine(drivePath, "FILESYSTEM.BIN")))
+            {
+                return KnownSystem.SegaCDMegaCD;
+            }
+
+            // Sony PlayStation and Sony PlayStation 2
+            if (File.Exists(Path.Combine(drivePath, "SYSTEM.CNF")))
+            {
+                // Check for either BOOT or BOOT2
+                using (StreamReader reader = File.OpenText(Path.Combine(drivePath, "SYSTEM.CNF")))
+                {
+                    while (!reader.EndOfStream)
+                    {
+                        string line = reader.ReadLine();
+                        if (line.Contains("BOOT2"))
+                            return KnownSystem.SonyPlayStation2;
+                        else if (line.Contains("BOOT"))
+                            return KnownSystem.SonyPlayStation;
+                    }
+                }
+
+                // If we have a weird disc, just assume PS1
+                return KnownSystem.SonyPlayStation;
+            }
+            
+            // Sony PlayStation 4
+            if (drive.VolumeLabel.Equals("PS4VOLUME", StringComparison.OrdinalIgnoreCase))
+            {
+                return KnownSystem.SonyPlayStation4;
+            }
+
+            // V.Tech V.Flash / V.Smile Pro
+            if (File.Exists(Path.Combine(drivePath, "0SYSTEM")))
+            {
+                return KnownSystem.VTechVFlashVSmilePro;
+            }
+
+            // Default return
+            return KnownSystem.NONE;
+        }
+
         /// <summary>
         /// Verify that, given a system and a media type, they are correct
         /// </summary>
@@ -530,26 +901,30 @@ namespace DICUI.Utilities
                 case MediaType.CDROM:
                 case MediaType.DVD:
                 case MediaType.FloppyDisk:
+                case MediaType.HardDisk:
+                case MediaType.CompactFlash:
+                case MediaType.SDCard:
+                case MediaType.FlashDrive:
                 case MediaType.HDDVD:
-                    return Result.Success("{0} ready to dump", type.Name());
+                    return Result.Success("{0} ready to dump", type.LongName());
 
                 // Partially supported types
                 case MediaType.GDROM:
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
-                    return Result.Success("{0} partially supported for dumping", type.Name());
+                    return Result.Success("{0} partially supported for dumping", type.LongName());
 
                 // Special case for other supported tools
                 case MediaType.UMD:
-                    return Result.Success("{0} supported for submission info parsing", type.Name());
+                    return Result.Success("{0} supported for submission info parsing", type.LongName());
 
                 // Specifically unknown type
                 case MediaType.NONE:
-                    return Result.Failure("Please select a valid disc type");
+                    return Result.Failure("Please select a valid media type");
 
                 // Undumpable but recognized types
                 default:
-                    return Result.Failure("{0} discs are not supported for dumping", type.Name());
+                    return Result.Failure("{0} media are not supported for dumping", type.LongName());
             }
         }
 
@@ -572,9 +947,9 @@ namespace DICUI.Utilities
 
                 return string.Join("\n", found.Select(kvp => kvp.Key + ": " + kvp.Value).ToArray());
             }
-            catch
+            catch (Exception ex)
             {
-                return "Disc could not be scanned!";
+                return $"Path could not be scanned! {ex}";
             }
         }
     }

DICUI.Library/Web/CookieAwareWebClient.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Net;
+
+namespace DICUI.Web
+{
+    // https://stackoverflow.com/questions/1777221/using-cookiecontainer-with-webclient-class
+    public class CookieAwareWebClient : WebClient
+    {
+        private readonly CookieContainer m_container = new CookieContainer();
+
+        protected override WebRequest GetWebRequest(Uri address)
+        {
+            WebRequest request = base.GetWebRequest(address);
+            HttpWebRequest webRequest = request as HttpWebRequest;
+            if (webRequest != null)
+            {
+                webRequest.CookieContainer = m_container;
+            }
+
+            return request;
+        }
+
+        /// <summary>
+        /// Get the last downloaded filename, if possible
+        /// </summary>
+        /// <returns></returns>
+        public string GetLastFilename()
+        {
+            // Try to extract the filename from the Content-Disposition header
+            if (!string.IsNullOrEmpty(this.ResponseHeaders["Content-Disposition"]))
+                return this.ResponseHeaders["Content-Disposition"].Substring(this.ResponseHeaders["Content-Disposition"].IndexOf("filename=") + 9).Replace("\"", "");
+
+            return null;
+        }
+    }
+}

DICUI.Library/Web/RedumpAccess.cs

@@ -0,0 +1,385 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI.Web
+{
+    public class RedumpAccess
+    {
+        #region Base URLs
+
+        private const string loginUrl = "http://forum.redump.org/login/";
+
+        #endregion
+
+        #region Disc URLs and Extensions
+
+        private const string discPageUrl = @"http://redump.org/disc/{0}/";
+        private const string wipDiscPageUrl = @"http://redump.org/newdisc/{0}/";
+
+        private const string changesExt = "/changes/";
+        private const string cueExt = "cue/";
+        private const string gdiExt = "gdi/";
+        private const string keyExt = "key/";
+        private const string md5Ext = "md5/";
+        private const string sbiExt = "sbi/";
+        private const string sfvExt = "sfv/";
+        private const string sha1Ext = "sha1/";
+
+        #endregion
+
+        #region List URLs
+
+        private const string lastModifiedUrl = @"http://redump.org/discs/sort/modified/dir/desc?page={0}";
+        private const string quickSearchUrl = @"http://redump.org/discs/quicksearch/{0}/?page={1}";
+        private const string userDumpsUrl = @"http://redump.org/discs/dumper/{0}/?page={1}";
+        private const string wipDumpsUrl = @"http://redump.org/discs-wip/";
+
+        #endregion
+
+        #region Pack URLs
+
+        private const string packCuesUrl = @"http://redump.org/cues/{0}/";
+        private const string packDatfileUrl = @"http://redump.org/datfile/{0}/";
+        private const string packDkeysUrl = @"http://redump.org/dkeys/{0}/";
+        private const string packGdiUrl = @"http://redump.org/gdi/{0}/";
+        private const string packKeysUrl = @"http://redump.org/keys/{0}/";
+        private const string packSbiUrl = @"http://redump.org/sbi/{0}/";
+
+        #endregion
+
+        #region Regexes
+
+        private readonly Regex discRegex = new Regex(@"<a href=""/disc/(\d+)/"">");
+        private readonly Regex newDiscRegex = new Regex(@"<a href=""/newdisc/(\d+)/"">");
+        private readonly Regex tokenRegex = new Regex(@"<input type=""hidden"" name=""csrf_token"" value=""(.*?)"" />");
+
+        #endregion
+
+        /// <summary>
+        /// Login to Redump, if possible
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        /// <param name="username">Redump username to log in for protected systems</param>
+        /// <param name="password">Redump password to log in for protected systems</param>
+        /// <returns>True login was successful, false otherwise</returns>
+        public bool RedumpLogin(CookieAwareWebClient wc, string username, string password)
+        {
+            if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
+                return false;
+
+            var loginPage = wc.DownloadString(loginUrl);
+            string token = this.tokenRegex.Match(loginPage).Groups[1].Value;
+
+            wc.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
+            wc.Encoding = Encoding.UTF8;
+            var response = wc.UploadString(loginUrl, $"form_sent=1&redirect_url=&csrf_token={token}&req_username={username}&req_password={password}&save_pass=0");
+
+            if (response.Contains("Incorrect username and/or password."))
+                return false;
+            else
+                return true;
+        }
+
+        #region Process IDs and Pages
+
+        /// <summary>
+        /// Get the list of the last modified IDs, in order of appearance
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        /// <param name="pageCount">Number of pages to grab until stopping; -1 means continue until end</param>
+        /// <returns>A list of IDs in order of last modified</returns>
+        private List<int> ProcessLastModified(CookieAwareWebClient wc, int pageCount = -1)
+        {
+            List<int> ids = new List<int>();
+
+            // If we have a -1 page count, set the maximum page limit
+            if (pageCount == -1)
+                pageCount = Int32.MaxValue;
+
+            // Keep getting last modified pages until there are none left
+            int pageNumber = 1;
+            while (pageNumber < pageCount)
+            {
+                List<int> pageIds = CheckSingleSitePage(wc, string.Format(lastModifiedUrl, pageNumber++));
+                ids.AddRange(pageIds);
+                if (pageIds.Count < 2)
+                    break;
+            }
+
+            return ids;
+        }
+
+        /// <summary>
+        /// Retrieve premade packs from Redump
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        private void ProcessAllPacks(CookieAwareWebClient wc)
+        {
+            var cuesPacks = this.DownloadPacks(wc, packCuesUrl, Extensions.HasCues, "CUEs");
+            var datPacks = this.DownloadPacks(wc, packDatfileUrl, Extensions.HasDat, "DATs");
+            var dkeyPacks = this.DownloadPacks(wc, packDkeysUrl, Extensions.HasDkeys, "Decrypted KEYS");
+            var gdiPacks = this.DownloadPacks(wc, packGdiUrl, Extensions.HasGdi, "GDIs");
+            var keysPacks = this.DownloadPacks(wc, packKeysUrl, Extensions.HasKeys, "KEYS");
+            var sbiPacks = this.DownloadPacks(wc, packSbiUrl, Extensions.HasSbi, "SBIs");
+        }
+
+        /// <summary>
+        /// Retrieve premade packs from Redump
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        /// <param name="system">RedumpSystem to get all possible packs for</param>
+        private void ProcessPacksForSystem(CookieAwareWebClient wc, RedumpSystem system)
+        {
+            var packs = new Dictionary<string, byte[]>();
+
+            if (Extensions.HasCues.Contains(system))
+                packs.Add("cues", this.DownloadPack(wc, packCuesUrl, system, "CUEs"));
+
+            if (Extensions.HasDat.Contains(system))
+                packs.Add("dat", this.DownloadPack(wc, packDatfileUrl, system, "DATs"));
+
+            if (Extensions.HasDkeys.Contains(system))
+                packs.Add("dkeys", this.DownloadPack(wc, packDkeysUrl, system, "Decrypted KEYS"));
+
+            if (Extensions.HasGdi.Contains(system))
+                packs.Add("gdi", this.DownloadPack(wc, packGdiUrl, system, "GDIs"));
+
+            if (Extensions.HasKeys.Contains(system))
+                packs.Add("keys", this.DownloadPack(wc, packKeysUrl, system, "KEYS"));
+
+            if (Extensions.HasSbi.Contains(system))
+                packs.Add("sbi", this.DownloadPack(wc, packSbiUrl, system, "SBIs"));
+        }
+
+        /// <summary>
+        /// Get the list of IDs that associate with a given string
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        /// <param name="query">Value to search for in Redump</param>
+        /// <returns>A list of IDs associated with that value</returns>
+        public List<int> ProcessSearch(CookieAwareWebClient wc, string query)
+        {
+            List<int> ids = new List<int>();
+
+            // Keep getting quicksearch pages until there are none left
+            int pageNumber = 1;
+            while (true)
+            {
+                List<int> pageIds = CheckSingleSitePage(wc, string.Format(quickSearchUrl, query, pageNumber++));
+                ids.AddRange(pageIds);
+                if (pageIds.Count < 2)
+                    break;
+            }
+
+            return ids;
+        }
+
+        /// <summary>
+        /// Get the list of IDs associated with the given user
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to hold the login state</param>
+        /// <param name="username">Redump username to get the list of IDs for</param>
+        /// <returns>A list of IDs associated with that user</returns>
+        private List<int> ProcessUser(CookieAwareWebClient wc, string username)
+        {
+            List<int> ids = new List<int>();
+
+            // Keep getting user pages until there are none left
+            int pageNumber = 1;
+            while (true)
+            {
+                List<int> pageIds = CheckSingleSitePage(wc, string.Format(userDumpsUrl, username, pageNumber++));
+                ids.AddRange(pageIds);
+                if (pageIds.Count < 2)
+                    break;
+            }
+
+            return ids;
+        }
+
+        #endregion
+
+        #region Single item processing
+
+        /// <summary>
+        /// Process a Redump site page as a list of possible IDs or disc page
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the pages</param>
+        /// <param name="url">Page URL to check and parse</param>
+        /// <returns>List of matching IDs</returns>
+        private List<int> CheckSingleSitePage(CookieAwareWebClient wc, string url)
+        {
+            List<int> ids = new List<int>();
+
+            var dumpsPage = wc.DownloadString(url);
+
+            // If we have no dumps left
+            if (dumpsPage.Contains("No discs found."))
+                return ids;
+
+            // If we have a single disc page already
+            if (dumpsPage.Contains("<b>Download:</b>"))
+            {
+                var value = Regex.Match(dumpsPage, @"/disc/(\d+)/sfv/").Groups[1].Value;
+                if (Int32.TryParse(value, out int id))
+                    ids.Add(id);
+
+                return ids;
+            }
+
+            // Otherwise, traverse each dump on the page
+            var matches = discRegex.Matches(dumpsPage);
+            foreach (Match match in matches)
+            {
+                try
+                {
+                    if (Int32.TryParse(match.Groups[1].Value, out int value))
+                        ids.Add(value);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"An exception has occurred: {ex}");
+                    continue;
+                }
+            }
+
+            return ids;
+        }
+
+        /// <summary>
+        /// Process a Redump WIP page as a list of possible IDs or disc page
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the pages</param>
+        /// <param name="url">Page URL to check and parse</param>
+        /// <returns>List of matching IDs</returns>
+        private List<int> CheckSingleWIPPage(CookieAwareWebClient wc, string url)
+        {
+            List<int> ids = new List<int>();
+
+            var wipDumpsPage = wc.DownloadString(url);
+
+            // If we have no WIP dumps left
+            if (wipDumpsPage.Contains("No WIP discs found."))
+                return ids;
+
+            // Otherwise, traverse each dump on the page
+            var matches = newDiscRegex.Matches(wipDumpsPage);
+            foreach (Match match in matches)
+            {
+                try
+                {
+                    if (Int32.TryParse(match.Groups[1].Value, out int value))
+                        ids.Add(value);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"An exception has occurred: {ex}");
+                    continue;
+                }
+            }
+
+            return ids;
+        }
+
+        /// <summary>
+        /// Download an individual pack
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the packs</param>
+        /// <param name="url">Base URL to download using</param>
+        /// <param name="system">System to download packs for</param>
+        /// <param name="title">Name of the pack that is downloading</param>
+        private byte[] DownloadPack(CookieAwareWebClient wc, string url, RedumpSystem system, string title)
+        {
+            Console.WriteLine($"Downloading {title}");
+            Console.Write($"\r{system.LongName()}{new string(' ', Console.BufferWidth - system.LongName().Length - 1)}");
+            var pack = wc.DownloadData(string.Format(url, system.ShortName()));
+
+            Console.Write($"\rComplete!{new string(' ', Console.BufferWidth - 10)}");
+            Console.WriteLine();
+
+            return pack;
+        }
+
+        /// <summary>
+        /// Download a set of packs
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the packs</param>
+        /// <param name="url">Base URL to download using</param>
+        /// <param name="systems">List of systems to download packs for</param>
+        /// <param name="title">Name of the pack that is downloading</param>
+        private Dictionary<RedumpSystem, byte[]> DownloadPacks(CookieAwareWebClient wc, string url, RedumpSystem[] systems, string title)
+        {
+            var dict = new Dictionary<RedumpSystem, byte[]>();
+
+            Console.WriteLine($"Downloading {title}");
+            foreach (var system in systems)
+            {
+                Console.Write($"\r{system.LongName()}{new string(' ', Console.BufferWidth - system.LongName().Length - 1)}");
+                dict.Add(system, wc.DownloadData(string.Format(url, system.ShortName())));
+            }
+
+            Console.Write($"\rComplete!{new string(' ', Console.BufferWidth - 10)}");
+            Console.WriteLine();
+
+            return dict;
+        }
+
+        /// <summary>
+        /// Download an individual site ID page as a string, if possible
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the pages</param>
+        /// <param name="id">Redump disc ID to retrieve</param>
+        /// <returns>Disc page as a string, null on error</returns>
+        public string DownloadSingleSiteID(CookieAwareWebClient wc, int id)
+        {
+            string paddedId = id.ToString().PadLeft(5, '0');
+            Console.WriteLine($"Processing ID: {paddedId}");
+            try
+            {
+                string discPage = wc.DownloadString(string.Format(discPageUrl, +id));
+                if (discPage.Contains($"Disc with ID \"{id}\" doesn't exist"))
+                    return null;
+                else
+                    return discPage;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"An exception has occurred: {ex}");
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Download an individual WIP ID page as a string, if possible
+        /// </summary>
+        /// <param name="wc">CookieAwareWebClient to access the pages</param>
+        /// <param name="id">Redump disc ID to retrieve</param>
+        /// <returns>WIP disc page as a string, null on error</returns>
+        private string DownloadSingleWIPID(CookieAwareWebClient wc, int id)
+        {
+            string paddedId = id.ToString().PadLeft(5, '0');
+            Console.WriteLine($"Processing WIP ID: {paddedId}");
+            try
+            {
+                string discPage = wc.DownloadString(string.Format(wipDiscPageUrl, +id));
+                if (discPage.Contains($"WIP Disc with ID \"{id}\" doesn't exist"))
+                    return null;
+                else
+                    return discPage;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"An exception has occurred: {ex}");
+                return null;
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BurnOutSharp" version="1.3.7.1" targetFramework="net461" />
-  <package id="LessIO" version="0.5.0" targetFramework="net461" />
-  <package id="libmspack4n" version="0.8.0" targetFramework="net461" />
-  <package id="UnshieldSharp" version="1.4.2.2" targetFramework="net461" />
-  <package id="zlib.net" version="1.0.4.0" targetFramework="net461" />
-</packages>

DICUI.Test/DICUI.Test.csproj

@@ -1,85 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.props" Condition="Exists('..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.props')" />
-  <Import Project="..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.props" Condition="Exists('..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.props')" />
-  <Import Project="..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
-  <Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CC064D2-38AB-4A05-8519-28660DE4562A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DICUI.Test</RootNamespace>
-    <AssemblyName>DICUI.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.CodeCoverage.Shim, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeCoverage.15.8.0\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="UI\AllowedSpeedsTest.cs" />
-    <Compile Include="Utilities\DICFlagExtensionsTest.cs" />
-    <Compile Include="Utilities\DumpEnvironmentTest.cs" />
-    <Compile Include="ResultTest.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\DriveTest.cs" />
-    <Compile Include="Utilities\ConvertersTest.cs" />
-    <Compile Include="Utilities\DICCommandExtensionsTest.cs" />
-    <Compile Include="Utilities\KnownSystemExtensionsTest.cs" />
-    <Compile Include="Utilities\MediaTypeExtensionsTest.cs" />
-    <Compile Include="Utilities\ParametersTest.cs" />
-    <Compile Include="Utilities\ValidatorsTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
       <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>
@@ -90,22 +15,19 @@
       <Name>DICUI</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.targets'))" />
-  </Target>
-  <Import Project="..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
-  <Import Project="..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.targets" Condition="Exists('..\packages\Microsoft.CodeCoverage.15.8.0\build\netstandard1.0\Microsoft.CodeCoverage.targets')" />
-  <Import Project="..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.targets" Condition="Exists('..\packages\Microsoft.NET.Test.Sdk.15.8.0\build\net45\Microsoft.Net.Test.Sdk.targets')" />
-</Project>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeCoverage" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
+    <PackageReference Include="xunit.analyzers" Version="0.10.0" />
+    <PackageReference Include="xunit.assert" Version="2.4.1" />
+    <PackageReference Include="xunit.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+  </ItemGroup>
+
+</Project>

DICUI.Test/Properties/AssemblyInfo.cs

@@ -1,20 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("DICUI.Test")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Test")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: Guid("7cc064d2-38ab-4a05-8519-28660de4562a")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

DICUI.Test/Utilities/ConvertersTest.cs

@@ -19,6 +19,7 @@ namespace DICUI.Test.Utilities
         [InlineData(DICCommand.GDROM, MediaType.GDROM)]
         [InlineData(DICCommand.MDS, null)]
         [InlineData(DICCommand.Reset, null)]
+        [InlineData(DICCommand.SACD, MediaType.CDROM)]
         [InlineData(DICCommand.Start, null)]
         [InlineData(DICCommand.Stop, null)]
         [InlineData(DICCommand.Sub, null)]
@@ -26,7 +27,7 @@ namespace DICUI.Test.Utilities
         [InlineData(DICCommand.XBOX, MediaType.DVD)]
         public void BaseCommandToMediaTypeTest(DICCommand command, MediaType? expected)
         {
-            MediaType? actual = Converters.BaseCommmandToMediaType(command);
+            MediaType? actual = command.ToMediaType();
             Assert.Equal(expected, actual);
         }
 
@@ -42,6 +43,7 @@ namespace DICUI.Test.Utilities
         [InlineData(DICCommand.GDROM, KnownSystem.SegaDreamcast)]
         [InlineData(DICCommand.MDS, null)]
         [InlineData(DICCommand.Reset, null)]
+        [InlineData(DICCommand.SACD, KnownSystem.SuperAudioCD)]
         [InlineData(DICCommand.Start, null)]
         [InlineData(DICCommand.Stop, null)]
         [InlineData(DICCommand.Sub, null)]
@@ -49,7 +51,7 @@ namespace DICUI.Test.Utilities
         [InlineData(DICCommand.XBOX, KnownSystem.MicrosoftXBOX)]
         public void BaseCommandToKnownSystemTest(DICCommand command, KnownSystem? expected)
         {
-            KnownSystem? actual = Converters.BaseCommandToKnownSystem(command);
+            KnownSystem? actual = Converters.ToKnownSystem(command);
             Assert.Equal(expected, actual);
         }
 
@@ -63,7 +65,7 @@ namespace DICUI.Test.Utilities
         [InlineData(MediaType.NONE, null)]
         public void MediaTypeToExtensionTest(MediaType? mediaType, string expected)
         {
-            string actual = Converters.MediaTypeToExtension(mediaType);
+            string actual = Converters.Extension(mediaType);
             Assert.Equal(expected, actual);
         }
 
@@ -73,7 +75,7 @@ namespace DICUI.Test.Utilities
         [InlineData(MediaType.NONE, "Unknown")]
         public void MediaTypeToStringTest(MediaType? mediaType, string expected)
         {
-            string actual = Converters.MediaTypeToString(mediaType);
+            string actual = Converters.LongName(mediaType);
             Assert.Equal(expected, actual);
         }
 
@@ -85,7 +87,7 @@ namespace DICUI.Test.Utilities
         [InlineData(KnownSystem.NONE, "Unknown")]
         public void KnownSystemToStringTest(KnownSystem? knownSystem, string expected)
         {
-            string actual = Converters.KnownSystemToString(knownSystem);
+            string actual = Converters.LongName(knownSystem);
             Assert.Equal(expected, actual);
         }
 
@@ -93,7 +95,7 @@ namespace DICUI.Test.Utilities
         public void KnownSystemHasValidCategory()
         {
             var values = Validators.CreateListOfSystems();
-            KnownSystem[] markers = { KnownSystem.MarkerArcadeEnd, KnownSystem.MarkerConsoleEnd, KnownSystem.MarkerComputerEnd, KnownSystem.MarkerOtherEnd };
+            KnownSystem[] markers = { KnownSystem.MarkerArcadeEnd, KnownSystem.MarkerDiscBasedConsoleEnd, /* KnownSystem.MarkerOtherConsoleEnd, */ KnownSystem.MarkerComputerEnd, KnownSystem.MarkerOtherEnd };
 
             values.ForEach(system => {
                 if (system == KnownSystem.NONE)
@@ -106,7 +108,8 @@ namespace DICUI.Test.Utilities
                 switch (category)
                 {
                     case KnownSystemCategory.Arcade: marker = KnownSystem.MarkerArcadeEnd; break;
-                    case KnownSystemCategory.Console: marker = KnownSystem.MarkerConsoleEnd; break;
+                    case KnownSystemCategory.DiscBasedConsole: marker = KnownSystem.MarkerDiscBasedConsoleEnd; break;
+                    /* case KnownSystemCategory.OtherConsole: marker = KnownSystem.MarkerOtherConsoleEnd; break; */
                     case KnownSystemCategory.Computer: marker = KnownSystem.MarkerComputerEnd; break;
                     case KnownSystemCategory.Other: marker = KnownSystem.MarkerOtherEnd; break;
                 }

DICUI.Test/Utilities/DICCommandExtensionsTest.cs

@@ -1,23 +0,0 @@
-using System;
-using DICUI.Data;
-using DICUI.Utilities;
-using Xunit;
-
-namespace DICUI.Test.Utilities
-{
-    public class DICCommandExtensionsTest
-    {
-        [Fact]
-        public void NameTest()
-        {
-            var values = (DICCommand[])Enum.GetValues(typeof(DICCommand));
-            foreach(var command in values)
-            {
-                string expected = Converters.DICCommandToString(command);
-                string actual = command.Name();
-
-                Assert.Equal(expected, actual);
-            }
-        }
-    }
-}

DICUI.Test/Utilities/DICFlagExtensionsTest.cs

@@ -1,23 +0,0 @@
-using System;
-using DICUI.Data;
-using DICUI.Utilities;
-using Xunit;
-
-namespace DICUI.Test.Utilities
-{
-    public class DICFlagExtensionsTest
-    {
-        [Fact]
-        public void NameTest()
-        {
-            var values = (DICFlag[])Enum.GetValues(typeof(DICFlag));
-            foreach(var command in values)
-            {
-                string expected = Converters.DICFlagToString(command);
-                string actual = command.Name();
-
-                Assert.Equal(expected, actual);
-            }
-        }
-    }
-}

DICUI.Test/Utilities/DriveTest.cs

@@ -1,15 +0,0 @@
-using DICUI.Utilities;
-using Xunit;
-
-namespace DICUI.Test.Utilities
-{
-    public class DriveTest
-    {
-        [Fact]
-        public void DriveConstructorsTest()
-        {
-            Assert.True(Drive.Floppy('a').IsFloppy);
-            Assert.False(Drive.Optical('d', "test", true).IsFloppy);
-        }
-    }
-}

DICUI.Test/Utilities/DumpEnvironmentTest.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.IO;
 using DICUI.Data;
 using DICUI.Utilities;
 using Xunit;
@@ -20,7 +19,9 @@ namespace DICUI.Test
             var env = new DumpEnvironment
             {
                 DICParameters = new Parameters(parameters),
-                Drive = isFloppy ? Drive.Floppy(letter) : Drive.Optical(letter, "", true),
+                Drive = isFloppy
+                    ? new Drive(InternalDriveType.Floppy, new DriveInfo(letter.ToString()))
+                    : new Drive(InternalDriveType.Optical, new DriveInfo(letter.ToString())),
                 Type = mediaType,
             };
 
@@ -33,8 +34,8 @@ namespace DICUI.Test
         [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.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 FixOutputPathsTest(string outputDirectory, string outputFilename, string expectedOutputDirectory, string expectedOutputFilename)
@@ -57,37 +58,6 @@ namespace DICUI.Test
             Assert.True(true);
         }
 
-        [Theory]
-        [InlineData(MediaType.CDROM)]
-        [InlineData(MediaType.DVD)]
-        [InlineData(MediaType.FloppyDisk)]
-        [InlineData(MediaType.LaserDisc)]
-        public void FoundAllFilesTest(MediaType? mediaType)
-        {
-            // TODO: Implement
-            // TODO: Get sample output data for each of the major types
-            Assert.True(true);
-        }
-
-        [Theory]
-        [InlineData(KnownSystem.AppleMacintosh, MediaType.CDROM)]
-        [InlineData(KnownSystem.PhilipsCDi, MediaType.CDROM)]
-        [InlineData(KnownSystem.SegaSaturn, MediaType.CDROM)]
-        [InlineData(KnownSystem.SonyPlayStation, MediaType.CDROM)]
-        [InlineData(KnownSystem.SonyPlayStation2, MediaType.CDROM)]
-        [InlineData(KnownSystem.AppleMacintosh, MediaType.DVD)]
-        [InlineData(KnownSystem.DVDVideo, MediaType.DVD)]
-        [InlineData(KnownSystem.MicrosoftXBOX, MediaType.DVD)]
-        [InlineData(KnownSystem.SonyPlayStation2, MediaType.DVD)]
-        [InlineData(KnownSystem.BDVideo, MediaType.BluRay)]
-        [InlineData(KnownSystem.AUSCOMSystem1, MediaType.Cassette)]
-        public void ExtractOutputInformation(KnownSystem? knownSystem, MediaType? mediaType)
-        {
-            // TODO: Implement
-            // TODO: Get sample output data for each of the major types
-            Assert.True(true);
-        }
-
         [Fact]
         public void FormatOutputDataTest()
         {

DICUI.Test/Utilities/KnownSystemExtensionsTest.cs

@@ -7,19 +7,6 @@ namespace DICUI.Test.Utilities
 {
     public class KnownSystemExtensionsTest
     {
-        [Fact]
-        public void NameTest()
-        {
-            var values = (KnownSystem[])Enum.GetValues(typeof(KnownSystem));
-            foreach(var system in values)
-            {
-                string expected = Converters.KnownSystemToString(system);
-                string actual = ((KnownSystem?)system).Name();
-
-                Assert.Equal(expected, actual);
-            }
-        }
-
         [Fact]
         public void IsMarkerTest()
         {
@@ -27,7 +14,8 @@ namespace DICUI.Test.Utilities
             foreach(var system in values)
             {
                 bool expected = system == KnownSystem.MarkerArcadeEnd || system == KnownSystem.MarkerComputerEnd ||
-                                system == KnownSystem.MarkerOtherEnd || system == KnownSystem.MarkerConsoleEnd;
+                                system == KnownSystem.MarkerOtherEnd || system == KnownSystem.MarkerDiscBasedConsoleEnd;
+                                // || system == KnownSystem.MarkerOtherConsoleEnd;
 
                 bool actual = ((KnownSystem?)system).IsMarker();
 
@@ -41,7 +29,7 @@ namespace DICUI.Test.Utilities
             var values = (KnownSystemCategory[])Enum.GetValues(typeof(KnownSystemCategory));
             foreach (var system in values)
             {
-                string actual = ((KnownSystem?)system).Name();
+                string actual = ((KnownSystem?)system).LongName();
                 Assert.NotEqual("", actual);
             }
         }

DICUI.Test/Utilities/MediaTypeExtensionsTest.cs

@@ -7,27 +7,25 @@ namespace DICUI.Test.Utilities
     public class MediaTypeExtensionsTest
     {
         [Theory]
-        [InlineData(MediaType.CDROM)]
-        [InlineData(MediaType.LaserDisc)]
-        [InlineData(MediaType.NONE)]
-        public void NameTest(MediaType? mediaType)
+        [InlineData(MediaType.CDROM, "CD-ROM")]
+        [InlineData(MediaType.LaserDisc, "LD-ROM / LV-ROM")]
+        [InlineData(MediaType.NONE, "Unknown")]
+        public void NameTest(MediaType? mediaType, string expected)
         {
-            string expected = Converters.MediaTypeToString(mediaType);
-            string actual = mediaType.Name();
+            string actual = mediaType.LongName();
 
             Assert.NotNull(actual);
             Assert.Equal(expected, actual);
         }
 
         [Theory]
-        [InlineData(MediaType.CDROM)]
-        [InlineData(MediaType.DVD)]
-        [InlineData(MediaType.LaserDisc)]
-        [InlineData(MediaType.FloppyDisk)]
-        [InlineData(MediaType.NONE)]
-        public void ExtensionTest(MediaType? mediaType)
+        [InlineData(MediaType.CDROM, ".bin")]
+        [InlineData(MediaType.DVD, ".iso")]
+        [InlineData(MediaType.LaserDisc, ".raw")]
+        [InlineData(MediaType.FloppyDisk, ".img")]
+        [InlineData(MediaType.NONE, null)]
+        public void ExtensionTest(MediaType? mediaType, string expected)
         {
-            string expected = Converters.MediaTypeToExtension(mediaType);
             string actual = mediaType.Extension();
 
             Assert.Equal(expected, actual);

DICUI.Test/Utilities/ParametersTest.cs

@@ -23,12 +23,12 @@ namespace DICUI.Test.Utilities
 
         [Theory]
         [InlineData(KnownSystem.AppleMacintosh, MediaType.LaserDisc, true, 20, null, null)]
-        [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCube, false, 20, null, new DICFlag[] { DICFlag.Raw })]
+        [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc, false, 20, null, new DICFlag[] { DICFlag.Raw })]
         [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 20, null, new DICFlag[] { })]
         /* paranoid mode tests */
         [InlineData(KnownSystem.IBMPCCompatible, MediaType.CDROM, true, 1000, 2, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect, DICFlag.ScanSectorProtect, DICFlag.SubchannelReadLevel })]
         [InlineData(KnownSystem.AppleMacintosh, MediaType.CDROM, false, 20, null, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect })]
-        [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation })]
+        [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation, DICFlag.ScanFileProtect })]
         [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation })]
         [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 500, null, new DICFlag[] { })]
         [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, false, 500, null, new DICFlag[] { })]
@@ -55,7 +55,7 @@ namespace DICUI.Test.Utilities
         [InlineData("", null, null, null, null)]
         [InlineData("cd F test.bin 8 /c2 20", MediaType.CDROM, KnownSystem.IBMPCCompatible, "F", "test.bin")]
         [InlineData("fd A blah\\test.img", MediaType.FloppyDisk, KnownSystem.IBMPCCompatible, "A", "blah\\test.img")]
-        [InlineData("dvd X super\\blah\\test.iso 8 /raw", MediaType.NintendoGameCube, KnownSystem.NintendoGameCube, "X", "super\\blah\\test.iso")]
+        [InlineData("dvd X super\\blah\\test.iso 8 /raw", MediaType.NintendoGameCubeGameDisc, KnownSystem.NintendoGameCube, "X", "super\\blah\\test.iso")]
         [InlineData("stop D", null, null, "D", null)]
         public void DetermineFlagsTest(string parameters, MediaType? expectedMediaType, KnownSystem? expectedKnownSystem, string expectedDriveLetter, string expectedPath)
         {

DICUI.Test/Utilities/ValidatorsTest.cs

@@ -10,7 +10,7 @@ namespace DICUI.Test.Utilities
         [Theory]
         [InlineData(KnownSystem.BandaiApplePippin, MediaType.CDROM)]
         [InlineData(KnownSystem.MicrosoftXBOX, MediaType.DVD)]
-        [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCube)]
+        [InlineData(KnownSystem.NintendoGameCube, MediaType.NintendoGameCubeGameDisc)]
         [InlineData(KnownSystem.NintendoWii, MediaType.NintendoWiiOpticalDisc)]
         [InlineData(KnownSystem.NintendoWiiU, MediaType.NintendoWiiUOpticalDisc)]
         [InlineData(KnownSystem.SonyPlayStationPortable, MediaType.UMD)]

DICUI.Test/packages.config

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.CodeCoverage" version="15.8.0" targetFramework="net461" />
-  <package id="Microsoft.NET.Test.Sdk" version="15.8.0" targetFramework="net461" />
-  <package id="xunit" version="2.3.1" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
-  <package id="xunit.assert" version="2.3.1" targetFramework="net461" />
-  <package id="xunit.core" version="2.3.1" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net461" />
-  <package id="xunit.runner.console" version="2.3.1" targetFramework="net461" developmentDependency="true" />
-  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net461" developmentDependency="true" />
-</packages>

DICUI.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI", "DICUI\DICUI.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}"
 EndProject
@@ -9,7 +9,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Test", "DICUI.Test\DI
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Library", "DICUI.Library\DICUI.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Forms", "DICUI.Forms\DICUI.Forms.csproj", "{A6719A99-BF0E-4637-9A8E-CB38B1E16971}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}"
+	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
+		CHANGELIST.md = CHANGELIST.md
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,10 +36,10 @@ Global
 		{51AB0928-13F9-44BF-A407-B6957A43A056}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51AB0928-13F9-44BF-A407-B6957A43A056}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DICUI/App.config

@@ -1,14 +1,22 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
     <add key="DICPath" value="Programs\DiscImageCreator.exe"/>
     <add key="SubDumpPath" value="subdump.exe"/>
     <add key="DefaultOutputPath" value="ISO"/>
-    <add key="preferredDumpSpeedCD" value="72"/>
-    <add key="preferredDumpSpeedDVD" value="24"/>
+    <add key="PreferredDumpSpeedCD" value="72"/>
+    <add key="PreferredDumpSpeedDVD" value="24"/>
+    <add key="PreferredDumpSpeedBD" value="16"/>
     <add key="QuietMode" value="false"/>
+    <add key="ParanoidMode" value="false"/>
+    <add key="ScanForProtection" value="true"/>
+    <add key="SkipMediaTypeDetection" value="false"/>
+    <add key="SkipSystemDetection" value="false"/>
     <add key="RereadAmountForC2" value="20"/>
     <add key="VerboseLogging" value="true"/>
     <add key="OpenLogWindowAtStartup" value="true"/>
+    <add key="AddPlaceholders" value="true"/>    
+    <add key="Username" value=""/>
+    <add key="Password" value=""/>
   </appSettings>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

DICUI/ComboBoxItems/CategoryComboBoxItem.cs

@@ -0,0 +1,29 @@
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI
+{
+    /// <summary>
+    /// Represents a single item in the Category combo box
+    /// </summary>
+    public class CategoryComboBoxItem
+    {
+        private object data;
+
+        public CategoryComboBoxItem(Category? category) => data = category;
+
+        public static implicit operator Category? (CategoryComboBoxItem item) => item.data as Category?;
+
+        public string Name
+        {
+            get { return (data as Category?).LongName(); }
+        }
+
+        public bool IsChecked { get; set; }
+
+        public Category? Value
+        {
+            get { return data as Category?; }
+        }
+    }
+}

DICUI/ComboBoxItems/KnownSystemComboBoxItem.cs

@@ -26,9 +26,9 @@ namespace DICUI
             get
             {
                 if (IsHeader())
-                    return "---------- " + (data as KnownSystemCategory?).Name() + " ----------";
+                    return "---------- " + (data as KnownSystemCategory?).LongName() + " ----------";
                 else
-                    return (data as KnownSystem?).Name();
+                    return (data as KnownSystem?).LongName();
             }
         }
     }

DICUI/ComboBoxItems/LanguageComboBoxItem.cs

@@ -0,0 +1,29 @@
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI
+{
+    /// <summary>
+    /// Represents a single item in the Language combo box
+    /// </summary>
+    public class LanguageComboBoxItem
+    {
+        private object data;
+
+        public LanguageComboBoxItem(Language? region) => data = region;
+
+        public static implicit operator Language? (LanguageComboBoxItem item) => item.data as Language?;
+
+        public string Name
+        {
+            get { return (data as Language?).LongName(); }
+        }
+
+        public bool IsChecked { get; set; }
+
+        public Language? Value
+        {
+            get { return data as Language?; }
+        }
+    }
+}

DICUI/ComboBoxItems/MediaTypeComboBoxItem.cs

@@ -14,7 +14,7 @@ namespace DICUI
 
         public static implicit operator MediaType? (MediaTypeComboBoxItem item) => item.data;
 
-        public string Name { get { return data.Name(); }
+        public string Name { get { return data.LongName(); }
         }
     }
 }

DICUI/ComboBoxItems/RegionComboBoxItem.cs

@@ -0,0 +1,30 @@
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI
+{
+    /// <summary>
+    /// Represents a single item in the Region combo box
+    /// </summary>
+    public class RegionComboBoxItem
+    {
+        private object data;
+
+        public RegionComboBoxItem(Region? region) => data = region;
+
+        public static implicit operator Region? (RegionComboBoxItem item) => item.data as Region?;
+
+        public string Name
+        {
+            get
+            {
+                return (data as Region?).LongName();
+            }
+        }
+
+        public Region? Value
+        {
+            get { return data as Region?; }
+        }
+    }
+}

DICUI/Constants.cs

@@ -36,7 +36,7 @@ namespace DICUI
                     return cd;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     return dvd;
                 case MediaType.BluRay:

DICUI/DICUI.csproj

@@ -1,153 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B1B75EB-8940-466F-BD51-76471A57F9BE}</ProjectGuid>
+    <TargetFrameworks>net462;net472;netcoreapp3.0</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>DICUI</RootNamespace>
-    <AssemblyName>DICUI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>C:\Users\admin\Desktop\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
+    <UseWindowsForms>true</UseWindowsForms>
+    <UseWPF>true</UseWPF>
+    <Prefer32Bit>true</Prefer32Bit>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>654CEE5FEAF46C8C1C369D7ED34DA157828A8D2F</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>WpfApp1_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>false</SignManifests>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Constants.cs" />
-    <Compile Include="EnumDescriptionConverter.cs" />
-    <Compile Include="MediaTypeComboBoxItem.cs" />
-    <Compile Include="Options.cs" />
-    <Compile Include="Windows\LogWindow.xaml.cs">
-      <DependentUpon>LogWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\OptionsWindow.xaml.cs">
-      <DependentUpon>OptionsWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="KnownSystemComboBoxItem.cs" />
-    <Compile Include="ViewModels.cs" />
-    <Page Include="Windows\LogWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Windows\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Windows\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Windows\OptionsWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
+
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+
   <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Icon.ico" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
       <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>
       <Name>DICUI.Library</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>

DICUI/EnumDescriptionConverter.cs

@@ -14,13 +14,13 @@ namespace DICUI
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if (value is DICCommand)
-                return ((DICCommand)value).Name();
+                return ((DICCommand)value).LongName();
             else if (value is DICFlag)
-                return ((DICFlag)value).Name();
+                return ((DICFlag)value).LongName();
             else if (value is MediaType?)
-                return ((MediaType?)value).Name();
+                return ((MediaType?)value).LongName();
             else if (value is KnownSystem?)
-                return ((KnownSystem?)value).Name();
+                return ((KnownSystem?)value).LongName();
             else
                 return "";
         }

DICUI/Options.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Configuration;
+using System.Linq;
 using System.Reflection;
 using DICUI.Data;
 
@@ -19,12 +20,18 @@ namespace DICUI
         public bool ParanoidMode { get; set; }
         public bool ScanForProtection { get; set; }
         public int RereadAmountForC2 { get; set; }
+        public bool AddPlaceholders { get; set; }
+        public bool PromptForDiscInformation { get; set; }
 
         public bool SkipMediaTypeDetection { get; set; }
+        public bool SkipSystemDetection { get; set; }
 
         public bool VerboseLogging { get; set; }
         public bool OpenLogWindowAtStartup { get; set; }
 
+        public string Username { get; set; }
+        public string Password { get; set; }
+
         public void Save()
         {
             Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
@@ -44,24 +51,119 @@ namespace DICUI
 
         public void Load()
         {
+            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
             //TODO: hardcoded, we should find a better way
-            DICPath = ConfigurationManager.AppSettings["DICPath"] ?? @"Programs\DiscImageCreator.exe";
-            SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe";
-            DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO";
+            this.DICPath = GetStringSetting(configFile, "DICPath", "Programs\\DiscImageCreator.exe");
+            this.SubDumpPath = GetStringSetting(configFile, "SubDumpPath", "subdump.exe");
+            this.DefaultOutputPath = GetStringSetting(configFile, "DefaultOutputPath", "ISO");
 
-            this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
-            this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
-            this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
+            this.PreferredDumpSpeedCD = GetInt32Setting(configFile, "PreferredDumpSpeedCD", 72);
+            this.PreferredDumpSpeedDVD = GetInt32Setting(configFile, "PreferredDumpSpeedDVD", 24);
+            this.PreferredDumpSpeedBD = GetInt32Setting(configFile, "PreferredDumpSpeedBD", 16);
 
-            this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false;
-            this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false;
-            this.ScanForProtection = Boolean.TryParse(ConfigurationManager.AppSettings["ScanForProtection"], out bool scanForProtection) ? scanForProtection : true;
-            this.SkipMediaTypeDetection = Boolean.TryParse(ConfigurationManager.AppSettings["SkipMediaTypeDetection"], out bool skipMediaTypeDetection) ? skipMediaTypeDetection : false;
-            this.RereadAmountForC2 = Int32.TryParse(ConfigurationManager.AppSettings["RereadAmountForC2"], out int rereadAmountForC2) ? rereadAmountForC2 : 20;
-            this.VerboseLogging = Boolean.TryParse(ConfigurationManager.AppSettings["VerboseLogging"], out bool verboseLogging) ? verboseLogging : true;
-            this.OpenLogWindowAtStartup = Boolean.TryParse(ConfigurationManager.AppSettings["OpenLogWindowAtStartup"], out bool openLogWindowAtStartup) ? openLogWindowAtStartup : true;
+            this.QuietMode = GetBooleanSetting(configFile, "QuietMode", false);
+            this.ParanoidMode = GetBooleanSetting(configFile, "ParanoidMode", false);
+            this.ScanForProtection = GetBooleanSetting(configFile, "ScanForProtection", true);
+            this.SkipMediaTypeDetection = GetBooleanSetting(configFile, "SkipMediaTypeDetection", false);
+            this.SkipSystemDetection = GetBooleanSetting(configFile, "SkipSystemDetection", false);
+            this.RereadAmountForC2 = GetInt32Setting(configFile, "RereadAmountForC2", 20);
+            this.VerboseLogging = GetBooleanSetting(configFile, "VerboseLogging", true);
+            this.OpenLogWindowAtStartup = GetBooleanSetting(configFile, "OpenLogWindowAtStartup", true);
+            this.AddPlaceholders = GetBooleanSetting(configFile, "AddPlaceholders", true);
+            this.PromptForDiscInformation = GetBooleanSetting(configFile, "PromptForDiscInformation", true);
+
+            this.Username = GetStringSetting(configFile, "Username", "");
+            this.Password = GetStringSetting(configFile, "Password", "");
         }
 
+        /// <summary>
+        /// Get a boolean setting from a configuration
+        /// </summary>
+        /// <param name="configFile">Current configuration file</param>
+        /// <param name="key">Setting key to get a value for</param>
+        /// <param name="defaultValue">Default value to return if no value is found</param>
+        /// <returns>Setting value if possible, default value otherwise</returns>
+        public bool GetBooleanSetting(Configuration configFile, string key, bool defaultValue)
+        {
+            var settings = configFile.AppSettings.Settings;
+            if (settings.AllKeys.Contains(key))
+            {
+                if (Boolean.TryParse(settings[key].Value, out bool value))
+                    return value;
+                else
+                    return defaultValue;
+
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Get a boolean setting from a configuration
+        /// </summary>
+        /// <param name="configFile">Current configuration file</param>
+        /// <param name="key">Setting key to get a value for</param>
+        /// <param name="defaultValue">Default value to return if no value is found</param>
+        /// <returns>Setting value if possible, default value otherwise</returns>
+        public int GetInt32Setting(Configuration configFile, string key, int defaultValue)
+        {
+            var settings = configFile.AppSettings.Settings;
+            if (settings.AllKeys.Contains(key))
+            {
+                if (Int32.TryParse(settings[key].Value, out int value))
+                    return value;
+                else
+                    return defaultValue;
+
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Get a boolean setting from a configuration
+        /// </summary>
+        /// <param name="configFile">Current configuration file</param>
+        /// <param name="key">Setting key to get a value for</param>
+        /// <param name="defaultValue">Default value to return if no value is found</param>
+        /// <returns>Setting value if possible, default value otherwise</returns>
+        public long GetInt64Setting(Configuration configFile, string key, long defaultValue)
+        {
+            var settings = configFile.AppSettings.Settings;
+            if (settings.AllKeys.Contains(key))
+            {
+                if (Int64.TryParse(settings[key].Value, out long value))
+                    return value;
+                else
+                    return defaultValue;
+
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Get a boolean setting from a configuration
+        /// </summary>
+        /// <param name="configFile">Current configuration file</param>
+        /// <param name="key">Setting key to get a value for</param>
+        /// <param name="defaultValue">Default value to return if no value is found</param>
+        /// <returns>Setting value if possible, default value otherwise</returns>
+        public string GetStringSetting(Configuration configFile, string key, string defaultValue)
+        {
+            var settings = configFile.AppSettings.Settings;
+            if (settings.AllKeys.Contains(key))
+                return settings[key].Value;
+            else
+                return defaultValue;
+        }
 
         //TODO: probably should be generic for non-string options
         //TODO: using reflection for Set and Get is orthodox but it works, should be changed to a key,value map probably
@@ -84,7 +186,7 @@ namespace DICUI
                     return PreferredDumpSpeedCD;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     return PreferredDumpSpeedDVD;
                 case MediaType.BluRay:

DICUI/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DICUI")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,8 +51,8 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.11")]
-[assembly: AssemblyFileVersion("1.11.0.0")]
+[assembly: AssemblyVersion("1.15")]
+[assembly: AssemblyFileVersion("1.15.0.0")]
 
 // Anything marked as internal can be used by the test methods
 [assembly: InternalsVisibleTo("DICUI.Test")]

DICUI/ViewModels.cs

@@ -37,6 +37,12 @@ namespace DICUI
             set { _options.SkipMediaTypeDetection = value; }
         }
 
+        public bool SkipSystemDetection
+        {
+            get { return _options.SkipSystemDetection; }
+            set { _options.SkipSystemDetection = value; }
+        }
+
         public string RereadAmountForC2
         {
             get { return Convert.ToString(_options.RereadAmountForC2); }

DICUI/Windows/DiscInformationWindow.xaml

@@ -0,0 +1,156 @@
+<Window x:Class="DICUI.Windows.DiscInformationWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:DICUI"
+        mc:Ignorable="d"
+        Title="Disc Information" Height="705" Width="515.132" ResizeMode="NoResize"
+        Closed="OnClosed">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="585"/>
+            <RowDefinition Height="80"/>
+        </Grid.RowDefinitions>
+
+        <GroupBox Grid.Row="0" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Common Disc Information">
+            <Grid Margin="10,15,10,10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                    <RowDefinition Height="25"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Title" />
+                <TextBox x:Name="TitleTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Foreign Title (Non-Latin)" />
+                <TextBox x:Name="ForeignTitleTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Disc Number / Letter" />
+                <TextBox x:Name="DiscNumberLetterTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Disc Title" />
+                <TextBox x:Name="DiscTitleTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Category" />
+                <ComboBox x:Name="CategoryComboBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" >
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Path=Name}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Region" />
+                <ComboBox x:Name="RegionComboBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" >
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Path=Name}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <Label Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Languages" />
+                <ListBox x:Name="LanguagesComboBox" Grid.Row="6" Grid.Column="1" Height="24" HorizontalAlignment="Stretch" SelectionMode="Multiple">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <CheckBox IsChecked="{Binding IsChecked}" Content="{Binding Path=Name}" />
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+
+                <Label Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Serial" />
+                <TextBox x:Name="SerialTextBox" Grid.Row="7" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <!-- Layer 0 / Data Side -->
+                <Label Grid.Row="8" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mastering Ring" />
+                <TextBox x:Name="L0MasteringRingTextBox" Grid.Row="8" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsTab="True" />
+
+                <Label Grid.Row="9" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mastering SID" />
+                <TextBox x:Name="L0MasteringSIDTextBox" Grid.Row="9" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Toolstamp/Mastering Code" />
+                <TextBox x:Name="L0ToolstampTextBox" Grid.Row="10" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="11" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mould SID" />
+                <TextBox x:Name="L0MouldSIDTextBox" Grid.Row="11" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Additional Mould" />
+                <TextBox x:Name="L0AdditionalMouldTextBox" Grid.Row="12" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <!-- Layer 1 / Label Side -->
+                <Label Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mastering Ring" />
+                <TextBox x:Name="L1MasteringRingTextBox" Grid.Row="13" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsTab="True" />
+
+                <Label Grid.Row="14" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mastering SID" />
+                <TextBox x:Name="L1MasteringSIDTextBox" Grid.Row="14" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="15" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Toolstamp/Mastering Code" />
+                <TextBox x:Name="L1ToolstampTextBox" Grid.Row="15" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="16" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mould SID" />
+                <TextBox x:Name="L1MouldSIDTextBox" Grid.Row="16" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="17" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Additional Mould" />
+                <TextBox x:Name="L1AdditionalMouldTextBox" Grid.Row="17" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="18" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Barcode" />
+                <TextBox x:Name="BarcodeTextBox" Grid.Row="18" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <!-- This needs to be a multiline textbox -->
+                <Label Grid.Row="19" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Comments" />
+                <TextBox x:Name="CommentsTextBox" Grid.Row="19" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True" />
+
+                <!-- This needs to be a multiline textbox -->
+                <Label Grid.Row="20" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Contents" />
+                <TextBox x:Name="ContentsTextBox" Grid.Row="20" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True"/>
+            </Grid>
+        </GroupBox>
+
+        <GroupBox Grid.Row="1" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Version and Editions">
+            <Grid Height="60">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="24"/>
+                    <RowDefinition Height="24"/>
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Version" />
+                <TextBox x:Name="VersionTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Edition" />
+                <TextBox x:Name="EditionTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+            </Grid>
+        </GroupBox>
+    </Grid>
+</Window>

DICUI/Windows/DiscInformationWindow.xaml.cs

@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using DICUI.Data;
+
+namespace DICUI.Windows
+{
+    /// <summary>
+    /// Interaction logic for DiscInformationWindow.xaml
+    /// </summary>
+    public partial class DiscInformationWindow : Window
+    {
+        private readonly MainWindow _mainWindow;
+        private readonly SubmissionInfo _submissionInfo;
+
+        private List<CategoryComboBoxItem> _categories;
+        private List<RegionComboBoxItem> _regions;
+        private List<LanguageComboBoxItem> _languages;
+
+        public DiscInformationWindow(MainWindow mainWindow, SubmissionInfo submissionInfo)
+        {
+            InitializeComponent();
+            _mainWindow = mainWindow;
+            _submissionInfo = submissionInfo;
+
+            PopulateCategories();
+            PopulateRegions();
+            PopulateLanguages();
+        }
+
+        public void Refresh()
+        {
+            TitleTextBox.Text = _submissionInfo.CommonDiscInfo.Title ?? "";
+            ForeignTitleTextBox.Text = _submissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
+            DiscNumberLetterTextBox.Text = _submissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
+            DiscTitleTextBox.Text = _submissionInfo.CommonDiscInfo.DiscTitle ?? "";
+            CategoryComboBox.SelectedIndex = _categories.FindIndex(r => r == _submissionInfo.CommonDiscInfo.Category);
+            RegionComboBox.SelectedIndex = _regions.FindIndex(r => r == _submissionInfo.CommonDiscInfo.Region);
+            if (_submissionInfo.CommonDiscInfo.Languages != null)
+            {
+                foreach (var language in _submissionInfo.CommonDiscInfo.Languages)
+                    _languages.Find(l => l == language).IsChecked = true;
+            }
+            SerialTextBox.Text = _submissionInfo.CommonDiscInfo.Serial ?? "";
+            L0MasteringRingTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
+            L0MasteringSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
+            L0ToolstampTextBox.Text = _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
+            L0MouldSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
+            L0AdditionalMouldTextBox.Text = _submissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
+            L1MasteringRingTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
+            L1MasteringSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
+            L1ToolstampTextBox.Text = _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
+            L1MouldSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
+            L1AdditionalMouldTextBox.Text = _submissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
+            BarcodeTextBox.Text = _submissionInfo.CommonDiscInfo.Barcode ?? "";
+            CommentsTextBox.Text = _submissionInfo.CommonDiscInfo.Comments ?? "";
+            ContentsTextBox.Text = _submissionInfo.CommonDiscInfo.Contents ?? "";
+
+            VersionTextBox.Text = _submissionInfo.VersionAndEditions.Version ?? "";
+            EditionTextBox.Text = _submissionInfo.VersionAndEditions.OtherEditions ?? "";
+        }
+
+        /// <summary>
+        /// Get a complete list of categories and fill the combo box
+        /// </summary>
+        private void PopulateCategories()
+        {
+            var categories = Enum.GetValues(typeof(Category)).OfType<Category?>().ToList();
+
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating categories, {0} categories found.", categories.Count);
+
+            _categories = new List<CategoryComboBoxItem>();
+            foreach (var category in categories)
+            {
+                _categories.Add(new CategoryComboBoxItem(category));
+            }
+
+            CategoryComboBox.ItemsSource = _categories;
+            CategoryComboBox.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Get a complete list of regions and fill the combo box
+        /// </summary>
+        private void PopulateRegions()
+        {
+            var regions = Enum.GetValues(typeof(Region)).OfType<Region?>().ToList();
+
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating regions, {0} regions found.", regions.Count);
+
+            _regions = new List<RegionComboBoxItem>();
+            foreach (var region in regions)
+            {
+                _regions.Add(new RegionComboBoxItem(region));
+            }
+
+            RegionComboBox.ItemsSource = _regions;
+            RegionComboBox.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Get a complete list of languages and fill the combo box
+        /// </summary>
+        private void PopulateLanguages()
+        {
+            var languages = Enum.GetValues(typeof(Language)).OfType<Language?>().ToList();
+
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating languages, {0} languages found.", languages.Count);
+
+            _languages = new List<LanguageComboBoxItem>();
+            foreach (var language in languages)
+            {
+                _languages.Add(new LanguageComboBoxItem(language));
+            }
+
+            LanguagesComboBox.ItemsSource = _languages;
+            LanguagesComboBox.SelectedIndex = 0;
+        }
+
+        #region Event Handlers
+
+        private void OnClosed(object sender, EventArgs e)
+        {
+            _submissionInfo.CommonDiscInfo.Title = TitleTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.ForeignTitleNonLatin = ForeignTitleTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.DiscNumberLetter = DiscNumberLetterTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.DiscTitle = DiscTitleTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.Category = (CategoryComboBox.SelectedItem as CategoryComboBoxItem)?.Value ?? Category.Games;
+            _submissionInfo.CommonDiscInfo.Region = (RegionComboBox.SelectedItem as RegionComboBoxItem)?.Value ?? Region.World;
+            var languages = new List<Language?>();
+            foreach (var language in _languages)
+            {
+                if (language.IsChecked)
+                    languages.Add(language.Value);
+            }
+            if (languages.Count == 0)
+                languages.Add(null);
+            _submissionInfo.CommonDiscInfo.Languages = languages.ToArray();
+            _submissionInfo.CommonDiscInfo.Serial = SerialTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = L0MasteringRingTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = L0MasteringSIDTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = L0ToolstampTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = L0MouldSIDTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = L0AdditionalMouldTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = L1MasteringRingTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = L1MasteringSIDTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = L1ToolstampTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = L1MouldSIDTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = L1AdditionalMouldTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.Barcode = BarcodeTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.Comments = CommentsTextBox.Text ?? "";
+            _submissionInfo.CommonDiscInfo.Contents = ContentsTextBox.Text ?? "";
+
+            _submissionInfo.VersionAndEditions.Version = VersionTextBox.Text ?? "";
+            _submissionInfo.VersionAndEditions.OtherEditions = EditionTextBox.Text ?? "";
+
+            Hide();
+        }
+
+        #endregion
+    }
+}

DICUI/Windows/LogWindow.xaml.cs

@@ -192,12 +192,12 @@ namespace DICUI.Windows
         // this is used to optimize the work since we need to process A LOT of text
         struct Matcher
         {
-            private readonly String prefix;
+            private readonly string prefix;
             private readonly Regex regex;
             private readonly int start;
             private readonly Action<Match> lambda;
 
-            public Matcher(String prefix, String regex, Action<Match> lambda)
+            public Matcher(string prefix, string regex, Action<Match> lambda)
             {
                 this.prefix = prefix;
                 this.regex = new Regex(regex);

DICUI/Windows/MainWindow.xaml.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using WinForms = System.Windows.Forms;
@@ -16,7 +17,7 @@ namespace DICUI.Windows
         // Private UI-related variables
         private List<Drive> _drives;
         private MediaType? _currentMediaType;
-        private List<KnownSystem?> _systems;
+        private List<KnownSystemComboBoxItem> _systems;
         private List<MediaType?> _mediaTypes;
         private bool _alreadyShown;
 
@@ -26,6 +27,9 @@ namespace DICUI.Windows
         private Options _options;
         private OptionsWindow _optionsWindow;
 
+        // User input related
+        private DiscInformationWindow _discInformationWindow;
+
         private LogWindow _logWindow;
 
         public MainWindow()
@@ -132,6 +136,7 @@ namespace DICUI.Windows
 
             ViewModels.LoggerViewModel.VerboseLogLn("Changed system to: {0}", (SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem).Name);
             PopulateMediaType();
+            GetOutputNames(false);
             EnsureDiscInformation();
         }
 
@@ -144,7 +149,7 @@ namespace DICUI.Windows
                 SetSupportedDriveSpeed();
             }
 
-            GetOutputNames();
+            GetOutputNames(false);
             EnsureDiscInformation();
         }
 
@@ -152,7 +157,7 @@ namespace DICUI.Windows
         {
             CacheCurrentDiscType();
             SetCurrentDiscType();
-            GetOutputNames();
+            GetOutputNames(true);
             SetSupportedDriveSpeed();
         }
 
@@ -245,7 +250,7 @@ namespace DICUI.Windows
 
         public void OnOptionsUpdated()
         {
-            GetOutputNames();
+            GetOutputNames(false);
             SetSupportedDriveSpeed();
             EnsureDiscInformation();
         }
@@ -282,30 +287,29 @@ namespace DICUI.Windows
         /// </summary>
         private void PopulateSystems()
         {
-            _systems = Validators.CreateListOfSystems();
+            var knownSystems = Validators.CreateListOfSystems();
 
-            ViewModels.LoggerViewModel.VerboseLogLn("Populating systems, {0} systems found.", _systems.Count);
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating systems, {0} systems found.", knownSystems.Count);
 
-            Dictionary<KnownSystemCategory, List<KnownSystem?>> mapping = _systems
+            Dictionary<KnownSystemCategory, List<KnownSystem?>> mapping = knownSystems
                 .GroupBy(s => s.Category())
                 .ToDictionary(
                     k => k.Key,
                     v => v
-                        .OrderBy(s => s.Name())
+                        .OrderBy(s => s.LongName())
                         .ToList()
                 );
 
-            List<KnownSystemComboBoxItem> comboBoxItems = new List<KnownSystemComboBoxItem>();
-
-            comboBoxItems.Add(new KnownSystemComboBoxItem(KnownSystem.NONE));
+            _systems = new List<KnownSystemComboBoxItem>();
+            _systems.Add(new KnownSystemComboBoxItem(KnownSystem.NONE));
 
             foreach (var group in mapping)
             {
-                comboBoxItems.Add(new KnownSystemComboBoxItem(group.Key));
-                group.Value.ForEach(system => comboBoxItems.Add(new KnownSystemComboBoxItem(system)));
+                _systems.Add(new KnownSystemComboBoxItem(group.Key));
+                group.Value.ForEach(system => _systems.Add(new KnownSystemComboBoxItem(system)));
             }
 
-            SystemTypeComboBox.ItemsSource = comboBoxItems;
+            SystemTypeComboBox.ItemsSource = _systems;
             SystemTypeComboBox.SelectedIndex = 0;
 
             StartStopButton.IsEnabled = false;
@@ -328,13 +332,40 @@ namespace DICUI.Windows
 
             if (DriveLetterComboBox.Items.Count > 0)
             {
-                int index = _drives.FindIndex(d => d.MarkedActive);
+                // Check for active optical drives first
+                int index = _drives.FindIndex(d => d.MarkedActive && d.InternalDriveType == InternalDriveType.Optical);
+
+                // Then we check for floppy drives
+                if (index == -1)
+                    index = _drives.FindIndex(d => d.MarkedActive && d.InternalDriveType == InternalDriveType.Floppy);
+
+                // Then we try all other drive types
+                if (index == -1)
+                    index = _drives.FindIndex(d => d.MarkedActive);
+
+                // Set the selected index
                 DriveLetterComboBox.SelectedIndex = (index != -1 ? index : 0);
                 StatusLabel.Content = "Valid drive found! Choose your Media Type";
-                StartStopButton.IsEnabled = true;
-                CopyProtectScanButton.IsEnabled = true;
+                                CopyProtectScanButton.IsEnabled = true;
 
-                ViewModels.LoggerViewModel.VerboseLogLn("Found {0} drives: {1}", _drives.Count, String.Join(", ", _drives.Select(d => d.Letter)));
+                // Get the current media type
+                if (!_options.SkipSystemDetection && index != -1)
+                {
+                    ViewModels.LoggerViewModel.VerboseLog("Trying to detect system for drive {0}.. ", _drives[index].Letter);
+                    var currentSystem = Validators.GetKnownSystem(_drives[index]);
+                    ViewModels.LoggerViewModel.VerboseLogLn(currentSystem == null || currentSystem == KnownSystem.NONE ? "unable to detect." : ("detected " + currentSystem.LongName() + "."));
+
+                    if (currentSystem != null && currentSystem != KnownSystem.NONE)
+                    {
+                        int sysIndex = _systems.FindIndex(s => s == currentSystem);
+                        SystemTypeComboBox.SelectedIndex = sysIndex;
+                    }
+                }
+
+                // Only enable the start/stop if we don't have the default selected
+                StartStopButton.IsEnabled = (SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem) != KnownSystem.NONE;
+
+                ViewModels.LoggerViewModel.VerboseLogLn("Found {0} drives: {1}", _drives.Count, string.Join(", ", _drives.Select(d => d.Letter)));
             }
             else
             {
@@ -386,6 +417,11 @@ namespace DICUI.Windows
                 ParanoidMode = _options.ParanoidMode,
                 ScanForProtection = _options.ScanForProtection,
                 RereadAmountC2 = _options.RereadAmountForC2,
+                AddPlaceholders = _options.AddPlaceholders,
+                PromptForDiscInformation = _options.PromptForDiscInformation,
+
+                Username = _options.Username,
+                Password = _options.Password,
 
                 System = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem,
                 Type = MediaTypeComboBox.SelectedItem as MediaType?,
@@ -471,6 +507,30 @@ namespace DICUI.Windows
                 progress.ProgressChanged += ProgressUpdated;
                 Result result = await _env.StartDumping(progress);
 
+                if (result)
+                {
+                    // Verify dump output and save it
+                    result = _env.VerifyAndSaveDumpOutput(progress,
+                        (si) =>
+                        {
+                            // lazy initialization
+                            if (_discInformationWindow == null)
+                            {
+                                _discInformationWindow = new DiscInformationWindow(this, si);
+                                _discInformationWindow.Closed += delegate
+                                {
+                                    _discInformationWindow = null;
+                                };
+                            }
+
+                            _discInformationWindow.Owner = this;
+                            _discInformationWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                            _discInformationWindow.Refresh();
+                            return _discInformationWindow.ShowDialog();
+                        }
+                    );
+                }
+
                 StatusLabel.Content = result ? "Dumping complete!" : result.Message;
                 ViewModels.LoggerViewModel.VerboseLogLn(result ? "Dumping complete!" : result.Message);
             }
@@ -529,14 +589,24 @@ namespace DICUI.Windows
         /// <summary>
         /// Get the default output directory name from the currently selected drive
         /// </summary>
-        private void GetOutputNames()
+        /// <param name="driveChanged">Force an updated name if the drive letter changes</param>
+        private void GetOutputNames(bool driveChanged)
         {
             Drive drive = DriveLetterComboBox.SelectedItem as Drive;
             KnownSystem? systemType = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem;
             MediaType? mediaType = MediaTypeComboBox.SelectedItem as MediaType?;
 
-            OutputDirectoryTextBox.Text = Path.Combine(_options.DefaultOutputPath, drive?.VolumeLabel ?? string.Empty);
-            OutputFilenameTextBox.Text = (drive?.VolumeLabel ?? "disc") + (mediaType.Extension() ?? ".bin");
+            // Set the output directory, if we changed drives or it's not already
+            if (driveChanged || string.IsNullOrEmpty(OutputDirectoryTextBox.Text))
+                OutputDirectoryTextBox.Text = Path.Combine(_options.DefaultOutputPath, drive?.VolumeLabel ?? string.Empty);
+
+            // Set the output filename, if we changed drives or it's not already
+            if (driveChanged || string.IsNullOrEmpty(OutputFilenameTextBox.Text))
+                OutputFilenameTextBox.Text = (drive?.VolumeLabel ?? systemType.LongName()) + (mediaType.Extension() ?? ".bin");
+
+            // If the extension for the file changed, update that automatically
+            else if (Path.GetExtension(OutputFilenameTextBox.Text) != mediaType.Extension())
+                OutputFilenameTextBox.Text = Path.GetFileNameWithoutExtension(OutputFilenameTextBox.Text) + (mediaType.Extension() ?? ".bin");
         }
 
         /// <summary>
@@ -589,7 +659,7 @@ namespace DICUI.Windows
                     break;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
-                case MediaType.NintendoGameCube:
+                case MediaType.NintendoGameCubeGameDisc:
                 case MediaType.NintendoWiiOpticalDisc:
                     preferred = _options.PreferredDumpSpeedDVD;
                     break;
@@ -620,15 +690,15 @@ namespace DICUI.Windows
         {
             // Get the drive letter from the selected item
             Drive drive = DriveLetterComboBox.SelectedItem as Drive;
-            if (drive == null || drive.IsFloppy)
+            if (drive == null)
                 return;
 
-            // Get the current optical disc type
+            // Get the current media type
             if (!_options.SkipMediaTypeDetection)
             {
                 ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
-                _currentMediaType = Validators.GetDiscType(drive.Letter);
-                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType == null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
+                _currentMediaType = Validators.GetMediaType(drive);
+                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType == null ? "unable to detect." : ("detected " + _currentMediaType.LongName() + "."));
             }
         }
 
@@ -646,7 +716,7 @@ namespace DICUI.Windows
             if (index != -1)
                 MediaTypeComboBox.SelectedIndex = index;
             else
-                StatusLabel.Content = $"Disc of type '{Converters.MediaTypeToString(_currentMediaType)}' found, but the current system does not support it!";
+                StatusLabel.Content = $"Disc of type '{Converters.LongName(_currentMediaType)}' found, but the current system does not support it!";
         }
 
         /// <summary>
@@ -669,16 +739,16 @@ namespace DICUI.Windows
             string trimmedPath = _env.DICParameters.Filename?.Trim('"') ?? string.Empty;
             string outputDirectory = Path.GetDirectoryName(trimmedPath);
             string outputFilename = Path.GetFileName(trimmedPath);
-            if (!String.IsNullOrWhiteSpace(outputDirectory))
+            if (!string.IsNullOrWhiteSpace(outputDirectory))
                 OutputDirectoryTextBox.Text = outputDirectory;
             else
                 outputDirectory = OutputDirectoryTextBox.Text;
-            if (!String.IsNullOrWhiteSpace(outputFilename))
+            if (!string.IsNullOrWhiteSpace(outputFilename))
                 OutputFilenameTextBox.Text = outputFilename;
             else
                 outputFilename = OutputFilenameTextBox.Text;
 
-            MediaType? mediaType = Converters.BaseCommmandToMediaType(_env.DICParameters.Command);
+            MediaType? mediaType = _env.DICParameters.Command.ToMediaType();
             int mediaTypeIndex = _mediaTypes.IndexOf(mediaType);
             if (mediaTypeIndex > -1)
                 MediaTypeComboBox.SelectedIndex = mediaTypeIndex;

DICUI/Windows/OptionsWindow.xaml

@@ -5,13 +5,14 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:DICUI"
         mc:Ignorable="d"
-        Title="Options" Height="480" Width="515.132">
+        Title="Options" Height="580" Width="515.132">
 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="150"/>
             <RowDefinition Height="100"/>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
 
@@ -30,7 +31,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DicImageCreator Path" />
+            <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DiscImageCreator Path" />
             <TextBox x:Name="DICPathTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
             <Button x:Name="DICPathButton" Grid.Row="0" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick" />
 
@@ -83,20 +84,21 @@
                 </Grid.ColumnDefinitions>
 
                 <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
+                    <RowDefinition Height="24*" />
+                    <RowDefinition Height="13*" />
+                    <RowDefinition Height="11*"/>
                 </Grid.RowDefinitions>
 
 
                 <CheckBox Grid.Column="0" VerticalAlignment="Center" Content="Quiet Mode" 
                           DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
                           IsChecked="{Binding Path=QuietMode}" 
-                          ToolTip="Disable DiscImageCreator sounds" 
+                          ToolTip="Disable DiscImageCreator sounds" Margin="0,4" 
                           />
                 <CheckBox Grid.Column="1" VerticalAlignment="Center" Content="Paranoid Mode" 
                           DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
                           IsChecked="{Binding Path=ParanoidMode}"
-                          ToolTip="Enable pedantic and super-safe flags" 
+                          ToolTip="Enable pedantic and super-safe flags" Margin="0,4" 
                           />
                 <Grid Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0">
                     <Grid.ColumnDefinitions>
@@ -112,22 +114,55 @@
                              />
                 </Grid>
 
-                <CheckBox Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Top" Content="Automatically Scan for Protection" 
+                <CheckBox Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Top" Content="Protection Scan" 
                           DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
                           IsChecked="{Binding Path=ScanForProtection}"
-                          ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0"
+                          ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0" Grid.RowSpan="2"
                           />
 
-                <CheckBox Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Center" Content="Skip Media Type Detection" 
+                <CheckBox Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" Content="Skip Type Detect" 
                           DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
                           IsChecked="{Binding Path=SkipMediaTypeDetection}"
-                          ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" 
+                          ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" Margin="0,4" Grid.RowSpan="2" 
+                          />
+
+                <CheckBox Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" Content="Add Placeholders" 
+                          DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
+                          IsChecked="{Binding Path=AddPlaceholders}"
+                          ToolTip="Enable adding placeholder text in the submissioninfo output for required and optional fields" Margin="0,4" Grid.RowSpan="2" 
+                          />
+
+                <CheckBox Grid.Column="3" Grid.Row="1" VerticalAlignment="Center" Content="Show Disc Info" 
+                          DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
+                          IsChecked="{Binding Path=PromptForDiscInformation}"
+                          ToolTip="Enable showing the disc information output after dumping" Margin="0,4" Grid.RowSpan="2" 
                           />
             </Grid>
 
         </GroupBox>
 
-        <Grid Height="22" Grid.Row="3" Grid.Column="0">
+        <GroupBox Grid.Row="3" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump Login" Padding="10">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
+                <TextBox x:Name="RedumpUsernameTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+
+                <Label Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Password" />
+                <TextBox x:Name="RedumpPasswordTextBox" Grid.Row="0" Grid.Column="3" Height="22" HorizontalAlignment="Stretch" />
+            </Grid>
+        </GroupBox>
+
+        <Grid Height="22" Grid.Row="4" Grid.Column="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*"/>
                 <ColumnDefinition Width="1*"/>

DICUI/Windows/OptionsWindow.xaml.cs

@@ -103,6 +103,9 @@ namespace DICUI.Windows
             DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
             DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
             DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
+
+            RedumpUsernameTextBox.Text = _options.Username;
+            RedumpPasswordTextBox.Text = _options.Password;
         }
 
         #region Event Handlers
@@ -115,6 +118,9 @@ namespace DICUI.Windows
             _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
             _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
 
+            _options.Username = RedumpUsernameTextBox.Text;
+            _options.Password = RedumpPasswordTextBox.Text;
+
             _options.Save();
             Hide();
 

README.md

@@ -15,7 +15,7 @@ This project relies on two open-source code ports to help perform copy protectio
 Even though this is written in C#, this program can only be used on Windows systems due to the base program, DiscImageCreator, being Windows-only. There is some preliminary support for Linux underway, and we will try to integrate with that when the time comes.
 
 - Windows 7 (newest version of Windows recommended)
-- .NET Framework 4.6.1 Runtimes
+- .NET Framework 4.6.2, .NET Framework 4.7.2, or .NET Core 3.0 Runtimes
 - 128 MB of free RAM
 - As much hard drive space as amount of discs you will be dumping (20+ GB recommended)
 
@@ -23,8 +23,10 @@ Ensure that your operating system is as up-to-date as possible, since some featu
 
 ## Releases
 
-Download the latest release here:
-[https://github.com/SabreTools/DICUI/releases](https://github.com/SabreTools/DICUI/releases)
+For those who would rather the most recently stable build, ownload the latest release here:
+[Releases Page](https://github.com/SabreTools/DICUI/releases)
+
+For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts)
 
 ## Changelist
 

appveyor.yml

@@ -1,12 +1,12 @@
 # version format
-version: 1.12-{build}
+version: 1.15-{build}
 
 # pull request template
 pull_requests:
   do_not_increment_build_number: true
 
 # vm template
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 # environment variables
 environment:
@@ -32,20 +32,23 @@ build:
 
 # post-build step
 after_build:
-- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/2500541/DiscImageCreator_20181022.zip
-- ps: appveyor DownloadFile http://www.rawdump.net/tools/subdump_fua_0x28.zip
-- 7z e DiscImageCreator_20181022.zip -oDICUI\bin\Debug\Programs Release_ANSI\*
-- 7z e DiscImageCreator_20181022.zip -oDICUI.Forms\bin\Debug\Programs Release_ANSI\*
-- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug *
-- 7z e subdump_fua_0x28.zip -oDICUI.Forms\bin\Debug *
-- mv DICUI\bin\Debug\subdump_fua_0x28.exe DICUI\bin\Debug\subdump.exe
-- mv DICUI.Forms\bin\Debug\subdump_fua_0x28.exe DICUI.Forms\bin\Debug\subdump.exe
+- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/3854216/DiscImageCreator_20191116.zip
+- ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip
+- 7z e DiscImageCreator_20191116.zip -oDICUI\bin\Debug\net462\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20191116.zip -oDICUI\bin\Debug\net472\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20191116.zip -oDICUI\bin\Debug\netcoreapp3.0\Programs Release_ANSI\*
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net462 *
+- mv DICUI\bin\Debug\net462\subdump_fua_0x28.exe DICUI\bin\Debug\net462\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net472 *
+- mv DICUI\bin\Debug\net472\subdump_fua_0x28.exe DICUI\bin\Debug\net472\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.0 *
+- mv DICUI\bin\Debug\netcoreapp3.0\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.0\subdump.exe
 - 7z a DICUI.zip DICUI\bin\Debug\*
-- 7z a DICUI-Winforms.zip DICUI.Forms\bin\Debug\*
+- 7z a DICUI-Check.zip DICUI.Check\bin\Debug\*
 
 # artifact linking
 artifacts:
 - path: DICUI.zip
   name: DICUI
-- path: DICUI-Winforms.zip
-  name: DICUI Winforms
+- path: DICUI-Check.zip
+  name: DICUI Check