Bump version to 1.18

Note that it still downloaads the subdump executable and puts it in the same place. This won't be changing anytime soon since it's useful. It also is flat out removing the option in the menu without replacing or reshaping the menu. This will be addressed at a later date.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,27 @@
+---
+name: Feature Request
+about: For when you know better than me what you want
+title: "[Request]"
+labels: enhancement
+assignees: mnadareski
+
+---
+
+**Before You Submit**
+- Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts) to see if the feature already exists.
+- .NET Core 3.1 has known limitations, so make sure that what you're asking for isn't already in another build.
+- Check [previous issues](https://github.com/SabreTools/DICUI/issues) to see if any of those are related to what you're about to ask for.
+
+If none of those apply, then continue...
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/issue-report.md

@@ -0,0 +1,48 @@
+---
+name: Issue Report
+about: Tell me what's wrong, seriously
+title: "[Problem]"
+labels: bug
+assignees: mnadareski
+
+---
+
+**Before You Submit**
+- Remember to try the [latest WIP build](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts) to see if the issue has already been addressed.
+- .NET Core 3.1 has known issues, please try using another build to reproduce the error
+- Check multiple discs to help narrow down the issue
+- Check the Options to see if changing any of those affects your issue.
+
+If all of those fail, then continue...
+
+**Version**
+What version are you using? 
+
+- [ ] Stable release (version here)
+- [ ] WIP release (version here)
+
+**Build**
+What runtime version are you using?
+
+- [ ] .NET Framework 4.7.2 running on (Operating System)
+- [ ] .NET Framework 4.8 running on (Operating System)
+- [ ] .NET Core 3.1 running on (Operating System)
+
+**Describe the issue**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "DICUI.Library/Aaru/CICMMetadata"]
+	path = DICUI.Library/Aaru/CICMMetadata
+	url = https://github.com/claunia/CICMMetadata

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/DICUI/bin/Debug/netcoreapp3.1/DICUI.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/DICUI",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/DICUI/DICUI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/DICUI/DICUI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/DICUI/DICUI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

CHANGELIST.md

@@ -1,3 +1,112 @@
+### 1.18 (2020-11-10)
+- Add more information extraction and generation for Aaru
+- Remove instances of CD Check from copy protection (again, sorry)
+- Fix multiline submission info outputs
+- Fix PVD retrieval for multi-session discs
+- Updated to DIC version 20200921
+- Add and fix multiple Sega disc header pieces or submission info
+- Fixed issues in parsing the alternate mainInfo format
+- Fixed issue with logging clear not working properly
+- ~~Updated to BurnOutSharp 1.4.1~~
+- Added split archives for AppVeyor builds
+- Remove subdump from both UI and run steps
+- Removed default config file
+- Fixed copy protect scan using wrong drive when using UI option
+- Changed default to skip fixed drives
+- Fixed default media type when skipping type detection
+- Attempt sector reading for Saturn system detection
+- Fixed default media type when detection fails
+- Add option to allow users to select dumping program
+- ~~Updated to DIC version 20201101~~
+- Add support for `/ps` DIC flag
+- Updated to BurnOutSharp 1.5.0
+- Added HD-DVD-Video detection
+
+### 1.17.1 (2020-09-14)
+- Shuffled some shared, internal UI variables
+- Synced WPF and Avalonia UI internals
+- Made the disc information window less prone to bugs
+- Fixed DIC flags based on code (not documentation)
+- Added support for old(?) DIC flags: `/fix` and `/re`
+
+### 1.17 (2020-09-12)
+- Updated to Aaru version 5.1
+- Updated to BurnOutSharp version 1.4.0
+- Updated to DIC version 20200716
+- Added experimental Avalonia UI
+- Created wiki
+- Removed .NET 4.6.2 and .NET Core 3.0 builds
+- Added .NET 4.8 and .NET Core 3.1 builds
+- Fix numerous things related to PS1/PS2
+- Make subdump running optional
+- Overhaul DICUI.Check with more options
+- Numerous small bug- and regression-fixes
+
+### 1.16.1 (2020-05-07)
+
+- Add preliminary support for DD for Windows (end to end still NW)
+- Add CNF parsing for Konami Python 2 discs (PS2-based)
+- Updated included Aaru version
+- Massive cleanup effort to detangle large chunks of code
+- Miscellaneous bugfixes that came from the above
+
+### 1.16 (2020-04-13)
+
+- Updated to DIC version 20200403
+- UI updates based on user feedback
+- Added support for Aaru (formerly DiscImageChef)
+- Added more support for different output file formats (such as CleanRip)
+- Add PS1/PS2 serial extraction and matching
+- Fix PS1 date support when both PSX.EXE and normal executable are both present
+- Update BurnOutSharp
+- Many MANY bits of internal cleanup
+
+### 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
+- Fixed Audio CD handling
+- Added Sega CD / Mega CD header extraction
+- Readded Floppy Disk as a supported format
+- And more! See the full Git commit list for more details
+
 ### 1.11 (2018-09-20)
 
 - Fix formatting of XBOX and XBOX 360 security sector output

DICUI.Avalonia/App.axaml

@@ -0,0 +1,8 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="DICUI.Avalonia.App">
+    <Application.Styles>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+    </Application.Styles>
+</Application>

DICUI.Avalonia/App.axaml.cs

@@ -0,0 +1,24 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace DICUI.Avalonia
+{
+    public class App : Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                desktop.MainWindow = new MainWindow();
+            }
+
+            base.OnFrameworkInitializationCompleted();
+        }
+    }
+}

DICUI.Avalonia/ComboBoxItems/CategoryComboBoxItem.cs

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

DICUI.Avalonia/ComboBoxItems/InternalProgramComboBoxItem.cs

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

DICUI.Avalonia/ComboBoxItems/KnownSystemComboBoxItem.cs

@@ -1,8 +1,8 @@
-using System.Windows.Media;
+using Avalonia.Media;
 using DICUI.Data;
 using DICUI.Utilities;
 
-namespace DICUI
+namespace DICUI.Avalonia
 {
     /// <summary>
     /// Represents a single item in the System combo box
@@ -14,7 +14,7 @@ namespace DICUI
         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 ISolidColorBrush Foreground { get => IsHeader() ? Brushes.Gray : Brushes.Black; }
 
         public bool IsHeader() => data is KnownSystemCategory?;
         public bool IsSystem() => data is KnownSystem?;
@@ -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.Avalonia/ComboBoxItems/LanguageComboBoxItem.cs

@@ -0,0 +1,29 @@
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    /// <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.Avalonia/ComboBoxItems/MediaTypeComboBoxItem.cs

@@ -0,0 +1,20 @@
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI.Avalonia
+{
+    /// <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.LongName(); }
+        }
+    }
+}

DICUI.Avalonia/ComboBoxItems/RegionComboBoxItem.cs

@@ -0,0 +1,30 @@
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    /// <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.Avalonia/Constants.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using DICUI.Data;
+
+namespace DICUI.Avalonia
+{
+    /// <summary>
+    /// Variables for UI elements
+    /// </summary>
+    public static class Constants
+    {
+        public const int LogWindowMarginFromMainWindow = 40;
+
+        // 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();
+
+        // Create collections for UI based on known drive speeds
+        public static List<double> SpeedsForCDAsCollection { get; } = GetDoubleCollectionFromIntList(cd);
+        public static List<double> SpeedsForDVDAsCollection { get; } = GetDoubleCollectionFromIntList(dvd);
+        public static List<double> SpeedsForBDAsCollection { get; } = GetDoubleCollectionFromIntList(bd);
+        private static List<double> GetDoubleCollectionFromIntList(IReadOnlyList<int> list)
+            => new List<double>(list.Select(i => Convert.ToDouble(i)).ToList());
+    }
+}

DICUI.Avalonia/DICUI.Avalonia.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
+    <OutputType>WinExe</OutputType>
+    <ApplicationIcon>Icon.ico</ApplicationIcon>
+    <Prefer32Bit>true</Prefer32Bit>
+    <Title>DICUI</Title>
+    <AssemblyName>DICUI.Avalonia</AssemblyName>
+    <Description>Frontend for various dumping programs</Description>
+    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
+    <Copyright>Copyright (c)2019-2020</Copyright>
+    <RepositoryUrl>https://github.com/SabreTools/DICUI</RepositoryUrl>
+    <Version>1.18</Version>
+    <AssemblyVersion>1.18</AssemblyVersion>
+    <FileVersion>1.18</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.9.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
+  </ItemGroup>
+    
+  <ItemGroup>
+    <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Update="DiscInformationWindow.axaml.cs">
+      <DependentUpon>DiscInformationWindow.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="LogWindow.axaml.cs">
+      <DependentUpon>LogWindow.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="MainWindow.axaml.cs">
+      <DependentUpon>MainWindow.axaml</DependentUpon>
+    </Compile>
+    <Compile Update="OptionsWindow.axaml.cs">
+      <DependentUpon>OptionsWindow.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <AvaloniaResource Include="Icon.ico" />
+  </ItemGroup>
+</Project>

DICUI.Avalonia/DiscInformationWindow.axaml

@@ -0,0 +1,120 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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"
+        mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="705" Width="515.132" Height="705"
+        x:Class="DICUI.Avalonia.DiscInformationWindow" Icon="Icon.ico" CanResize="False"
+        Title="Disc Information" Closed="OnClosed">
+
+  <Grid RowDefinitions="585,80,25">
+
+    <!-- Common Disc Information -->
+    <Border Grid.Row="0" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Common Disc Information" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="0" Margin="10,15,10,10" ColumnDefinitions="1*,1*" RowDefinitions="1*,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25">
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Title" />
+      <TextBox Name="TitleTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Foreign Title (Non-Latin)" />
+      <TextBox Name="ForeignTitleTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Disc Number / Letter" />
+      <TextBox Name="DiscNumberLetterTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Disc Title" />
+      <TextBox Name="DiscTitleTextBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Category" />
+      <ComboBox Name="CategoryComboBox" Grid.Row="5" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" >
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=Name}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <TextBlock Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Region" />
+      <ComboBox Name="RegionComboBox" Grid.Row="6" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" >
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=Name}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <TextBlock Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Languages" />
+      <ComboBox Name="LanguagesComboBox" Grid.Row="7" Grid.Column="1" Height="24" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" >
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <CheckBox IsChecked="{Binding IsChecked}" Content="{Binding Path=Name}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <TextBlock Grid.Row="8" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Serial" />
+      <TextBox Name="SerialTextBox" Grid.Row="8" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <!-- Layer 0 / Data Side -->
+      <TextBlock Grid.Row="9" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Data/L0 Mastering Ring" />
+      <TextBox Name="L0MasteringRingTextBox" Grid.Row="9" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" AcceptsTab="True" />
+
+      <TextBlock Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Data/L0 Mastering SID" />
+      <TextBox Name="L0MasteringSIDTextBox" Grid.Row="10" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="11" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Data/L0 Toolstamp/Mastering Code" />
+      <TextBox Name="L0ToolstampTextBox" Grid.Row="11" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Data/L0 Mould SID" />
+      <TextBox Name="L0MouldSIDTextBox" Grid.Row="12" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Data/L0 Additional Mould" />
+      <TextBox Name="L0AdditionalMouldTextBox" Grid.Row="13" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <!-- Layer 1 / Label Side -->
+      <TextBlock Grid.Row="14" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Label/L1 Mastering Ring" />
+      <TextBox Name="L1MasteringRingTextBox" Grid.Row="14" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" AcceptsTab="True" />
+
+      <TextBlock Grid.Row="15" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Label/L1 Mastering SID" />
+      <TextBox Name="L1MasteringSIDTextBox" Grid.Row="15" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="16" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Label/L1 Toolstamp/Mastering Code" />
+      <TextBox Name="L1ToolstampTextBox" Grid.Row="16" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="17" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Label/L1 Mould SID" />
+      <TextBox Name="L1MouldSIDTextBox" Grid.Row="17" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="18" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Label/L1 Additional Mould" />
+      <TextBox Name="L1AdditionalMouldTextBox" Grid.Row="18" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="19" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Barcode" />
+      <TextBox Name="BarcodeTextBox" Grid.Row="19" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <!-- This needs to be a multiline textbox -->
+      <TextBlock Grid.Row="20" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Comments" />
+      <TextBox Name="CommentsTextBox" Grid.Row="20" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True" />
+
+      <!-- This needs to be a multiline textbox -->
+      <TextBlock Grid.Row="21" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Contents" />
+      <TextBox Name="ContentsTextBox" Grid.Row="21" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True"/>
+    </Grid>
+
+    <!-- Version and Editions -->
+    <Border Grid.Row="1" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Version and Editions" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="1" Margin="10,15,10,10" ColumnDefinitions="1*,1*" RowDefinitions="25,25">
+      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Version" />
+      <TextBox Name="VersionTextBox" Grid.Row="0" Grid.Column="1" Height="25" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Edition" />
+      <TextBox Name="EditionTextBox" Grid.Row="1" Grid.Column="1" Height="25" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    </Grid>
+
+    <!-- Accept / Cancel -->
+    <Grid Height="25" Grid.Row="2" Grid.Column="0" ColumnDefinitions="2*,1*,1*">
+      <Button Name="AcceptButton" Grid.Row="0" Grid.Column="1" Height="25" Width="80" Content="Accept" Click="OnAcceptClick" />
+      <Button Name="CancelButton" Grid.Row="0" Grid.Column="2" Height="25" Width="80" Content="Cancel" Click="OnCancelClick" />
+    </Grid>
+  </Grid>
+</Window>

DICUI.Avalonia/DiscInformationWindow.axaml.cs

@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    public class DiscInformationWindow : Window
+    {
+        #region Fields
+
+        /// <summary>
+        /// List of available disc categories
+        /// </summary>
+        public List<CategoryComboBoxItem> Categories { get; private set; }
+
+        /// <summary>
+        /// SubmissionInfo object to fill and save
+        /// </summary>
+        public SubmissionInfo SubmissionInfo { get; set; }
+
+        /// <summary>
+        /// List of available regions
+        /// </summary>
+        public List<RegionComboBoxItem> Regions { get; private set; }
+
+        /// <summary>
+        /// List of available languages
+        /// </summary>
+        public List<LanguageComboBoxItem> Languages { get; private set; }
+
+        #endregion
+
+        public DiscInformationWindow()
+            : this(new SubmissionInfo())
+        {
+        }
+
+        public DiscInformationWindow(SubmissionInfo submissionInfo)
+        {
+            this.SubmissionInfo = submissionInfo;
+            this.InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+            private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            PopulateCategories();
+            PopulateRegions();
+            PopulateLanguages();
+            DisableFieldsIfNeeded();
+        }
+
+        #region Helpers
+
+        /// <summary>
+        /// Disable fields that aren't applicable to the current disc
+        /// </summary>
+        private void DisableFieldsIfNeeded()
+        {
+            // Only disable for single-layer discs
+            if (SubmissionInfo?.SizeAndChecksums?.Layerbreak == default(long))
+            {
+                this.Find<TextBox>("L1MasteringRingTextBox").IsEnabled = false;
+                this.Find<TextBox>("L1MasteringRingTextBox").Background = Brushes.Gray;
+
+                this.Find<TextBox>("L1MasteringSIDTextBox").IsEnabled = false;
+                this.Find<TextBox>("L1MasteringSIDTextBox").Background = Brushes.Gray;
+
+                this.Find<TextBox>("L1ToolstampTextBox").IsEnabled = false;
+                this.Find<TextBox>("L1ToolstampTextBox").Background = Brushes.Gray;
+
+                this.Find<TextBox>("L1MouldSIDTextBox").IsEnabled = false;
+                this.Find<TextBox>("L1MouldSIDTextBox").Background = Brushes.Gray;
+
+                this.Find<TextBox>("L1AdditionalMouldTextBox").IsEnabled = false;
+                this.Find<TextBox>("L1AdditionalMouldTextBox").Background = Brushes.Gray;
+            }
+        }
+
+        /// <summary>
+        /// Load the current contents of the base SubmissionInfo to the UI
+        /// </summary>
+        public void Load()
+        {
+            // Common Disc Info
+            if (SubmissionInfo.CommonDiscInfo == null)
+                SubmissionInfo.CommonDiscInfo = new CommonDiscInfoSection();
+
+            this.Find<TextBox>("TitleTextBox").Text = SubmissionInfo.CommonDiscInfo.Title ?? "";
+            this.Find<TextBox>("ForeignTitleTextBox").Text = SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
+            this.Find<TextBox>("DiscNumberLetterTextBox").Text = SubmissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
+            this.Find<TextBox>("DiscTitleTextBox").Text = SubmissionInfo.CommonDiscInfo.DiscTitle ?? "";
+            this.Find<ComboBox>("CategoryComboBox").SelectedIndex = Categories.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Category);
+            this.Find<ComboBox>("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;
+            }
+
+            this.Find<TextBox>("SerialTextBox").Text = SubmissionInfo.CommonDiscInfo.Serial ?? "";
+            this.Find<TextBox>("L0MasteringRingTextBox").Text = SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
+            this.Find<TextBox>("L0MasteringSIDTextBox").Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
+            this.Find<TextBox>("L0ToolstampTextBox").Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
+            this.Find<TextBox>("L0MouldSIDTextBox").Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
+            this.Find<TextBox>("L0AdditionalMouldTextBox").Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
+            this.Find<TextBox>("L1MasteringRingTextBox").Text = SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
+            this.Find<TextBox>("L1MasteringSIDTextBox").Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
+            this.Find<TextBox>("L1ToolstampTextBox").Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
+            this.Find<TextBox>("L1MouldSIDTextBox").Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
+            this.Find<TextBox>("L1AdditionalMouldTextBox").Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
+            this.Find<TextBox>("BarcodeTextBox").Text = SubmissionInfo.CommonDiscInfo.Barcode ?? "";
+            this.Find<TextBox>("CommentsTextBox").Text = SubmissionInfo.CommonDiscInfo.Comments ?? "";
+            this.Find<TextBox>("ContentsTextBox").Text = SubmissionInfo.CommonDiscInfo.Contents ?? "";
+            
+            // Version and Editions
+            if (SubmissionInfo.VersionAndEditions == null)
+                SubmissionInfo.VersionAndEditions = new VersionAndEditionsSection();
+
+            this.Find<TextBox>("VersionTextBox").Text = SubmissionInfo.VersionAndEditions.Version ?? "";
+            this.Find<TextBox>("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(DiscCategory)).OfType<DiscCategory?>().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));
+            }
+
+            this.Find<ComboBox>("CategoryComboBox").Items = Categories;
+            this.Find<ComboBox>("CategoryComboBox").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));
+            }
+
+            this.Find<ComboBox>("LanguagesComboBox").Items = Languages;
+            this.Find<ComboBox>("LanguagesComboBox").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));
+            }
+
+            this.Find<ComboBox>("RegionComboBox").Items = Regions;
+            this.Find<ComboBox>("RegionComboBox").SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Save the current contents of the UI to the base SubmissionInfo
+        /// </summary>
+        private void Save()
+        {
+            // Common Disc Info
+            if (SubmissionInfo.CommonDiscInfo == null)
+                SubmissionInfo.CommonDiscInfo = new CommonDiscInfoSection();
+
+            SubmissionInfo.CommonDiscInfo.Title = this.Find<TextBox>("TitleTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin = this.Find<TextBox>("ForeignTitleTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscNumberLetter = this.Find<TextBox>(" DiscNumberLetterTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscTitle = this.Find<TextBox>("DiscTitleTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Category = (this.Find<ComboBox>("CategoryComboBox").SelectedItem as CategoryComboBoxItem)?.Value ?? DiscCategory.Games;
+            SubmissionInfo.CommonDiscInfo.Region = (this.Find<ComboBox>("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 = this.Find<TextBox>("SerialTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = this.Find<TextBox>("L0MasteringRingTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = this.Find<TextBox>("L0MasteringSIDTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = this.Find<TextBox>("L0ToolstampTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = this.Find<TextBox>("L0MouldSIDTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = this.Find<TextBox>("L0AdditionalMouldTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = this.Find<TextBox>("L1MasteringRingTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = this.Find<TextBox>("L1MasteringSIDTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = this.Find<TextBox>("L1ToolstampTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = this.Find<TextBox>("L1MouldSIDTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = this.Find<TextBox>("L1AdditionalMouldTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Barcode = this.Find<TextBox>("BarcodeTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Comments = this.Find<TextBox>("CommentsTextBox").Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Contents = this.Find<TextBox>("ContentsTextBox").Text ?? "";
+
+            // Version and Editions
+            if (SubmissionInfo.VersionAndEditions == null)
+                SubmissionInfo.VersionAndEditions = new VersionAndEditionsSection();
+
+            SubmissionInfo.VersionAndEditions.Version = this.Find<TextBox>("VersionTextBox").Text ?? "";
+            SubmissionInfo.VersionAndEditions.OtherEditions = this.Find<TextBox>("EditionTextBox").Text ?? "";
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for AcceptButton Click event
+        /// </summary>
+        private void OnAcceptClick(object sender, RoutedEventArgs e)
+        {
+            Save();
+            Hide();
+        }
+
+        /// <summary>
+        /// Handler for CancelButton Click event
+        /// </summary>
+        private void OnCancelClick(object sender, RoutedEventArgs e)
+        {
+            Hide();
+        }
+
+        /// <summary>
+        /// Handler for DiscInformationWindow Closed event
+        /// </summary>
+        private void OnClosed(object sender, EventArgs e)
+        {
+            Hide();
+        }
+
+        #endregion
+    }
+}

DICUI.Avalonia/EnumDescriptionConverter.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Globalization;
-using System.Windows.Data;
+using Avalonia.Data.Converters;
 using DICUI.Data;
 using DICUI.Utilities;
 
-namespace DICUI.Forms
+namespace DICUI.Avalonia
 {
     /// <summary>
     /// Used to provide a converter to XAML files to render comboboxes with enum values
@@ -13,14 +13,13 @@ namespace DICUI.Forms
     {
         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();
+            // Common
+            if (value is MediaType?)
+                return ((MediaType?)value).LongName();
             else if (value is KnownSystem?)
-                return ((KnownSystem?)value).Name();
+                return ((KnownSystem?)value).LongName();
+
+            // Default
             else
                 return "";
         }

DICUI.Avalonia/LogWindow.axaml

@@ -0,0 +1,40 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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.Avalonia"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="350" Width="600" Height="350"
+        x:Class="DICUI.Avalonia.LogWindow" Icon="Icon.ico" CanResize="False"
+        Title="Log Window">
+
+  <Grid RowDefinitions="40,250,40">
+
+    <!-- Progress Bar -->
+    <Grid Grid.Row="0" Height="25" Margin="10 10 10 0">
+      <ProgressBar Name="ProgressBar" />
+      <TextBlock Name="ProgressLabel" Grid.Row="0" Height="25" HorizontalAlignment="Center" VerticalAlignment="Center" />
+    </Grid>
+
+    <!-- Log Area -->
+    <Border Grid.Row="1" Background="White" BorderBrush="Gainsboro" BorderThickness="1" Margin="10">
+      <ScrollViewer Name="OutputViewer">
+        <TextBox Name="Output" FontFamily="Consolas" Background="Gray" IsReadOnly="True" />
+      </ScrollViewer>
+    </Border>
+
+    <!-- Options -->
+    <Grid Grid.Row="2" RowDefinitions="Auto" ColumnDefinitions="Auto,Auto,3*,Auto,Auto,Auto">
+      <CheckBox Name="VerboseCheckBox" Grid.Column="0" Height="25" VerticalAlignment="Center" Margin="10 0 0 10"
+                Content="Verbose" DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=VerboseLogging}"
+                ToolTip.Tip="Enable verbose logging of tasks" />
+      <CheckBox Name="OpenAtStartupCheckBox" Grid.Column="1" Grid.ColumnSpan="2" Height="25" VerticalAlignment="Center" Margin="10 0 0 10"
+                Content="Open at startup" DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=OpenLogWindowAtStartup}"
+                ToolTip.Tip="Open this window at startup" />
+      <Button Margin="0 0 10 10" Grid.Column="3" Height="25" Width="60" Content="Clear" HorizontalAlignment="Right" Click="OnClearButton" />
+      <Button Margin="0 0 10 10" Grid.Column="4" Height="25" Width="60" Content="Hide" HorizontalAlignment="Right" Click="OnHideButton" />
+      <Button Margin="0 0 10 10" Grid.Column="5" Height="25" Width="60" Content="Save" HorizontalAlignment="Right" Click="OnSaveButton" />
+    </Grid>
+  </Grid>
+</Window>

DICUI.Avalonia/LogWindow.axaml.cs

@@ -0,0 +1,82 @@
+using System.IO;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+
+namespace DICUI.Avalonia
+{
+    public class LogWindow : Window
+    {
+        public LogWindow()
+        {
+            this.InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        /// <summary>
+        /// Adjust the position of the log window if the main window is moved
+        /// </summary>
+        public void AdjustPositionToMainWindow()
+        {
+            var owner = Owner as Window;
+            Position = new PixelPoint(
+                owner.Position.X,
+                owner.Position.Y + (int)owner.Height + Constants.LogWindowMarginFromMainWindow);
+        }
+
+        /// <summary>
+        /// Append rich text to the scrolling element
+        /// </summary>
+        /// <param name="text">Text to add, including newlines</param>
+        /// <param name="color">Color to format the text</param>
+        public void AppendToTextBox(string text, ISolidColorBrush color)
+        {
+            // TODO: Use brush color
+            this.Find<TextBox>("Output").Text += $"{text}\n";
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for ClearButton Click event
+        /// </summary>
+        private void OnClearButton(object sender, RoutedEventArgs e)
+        {
+            this.Find<TextBox>("Output").Text = string.Empty;
+        }
+
+        /// <summary>
+        /// Handler for HideButton Click event
+        /// </summary>
+        private void OnHideButton(object sender, RoutedEventArgs 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
+            (Owner as MainWindow).Find<CheckBox>("ShowLogCheckBox").IsChecked = false;
+        }
+
+        /// <summary>
+        /// Handler for SaveButton Click event
+        /// </summary>
+        private void OnSaveButton(object sender, RoutedEventArgs e)
+        {
+            using (StreamWriter tw = new StreamWriter(File.OpenWrite("console.log")))
+            {
+                tw.Write(this.Find<TextBox>("Output").Text);
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Avalonia/MainWindow.axaml

@@ -0,0 +1,109 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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.Avalonia"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450" Width="600" Height="450"
+        x:Class="DICUI.Avalonia.MainWindow"  Icon="Icon.ico" CanResize="False"
+        Title="DICUI" WindowStartupLocation="CenterScreen"
+        PositionChanged="MainWindowLocationChanged" Activated="MainWindowActivated" Closing="MainWindowClosing">
+
+  <Window.Resources>
+    <local:EnumDescriptionConverter x:Key="enumConverter" />
+  </Window.Resources>
+  
+  <Grid ColumnDefinitions="4*,13*" RowDefinitions="30,4*,1*,1*">
+
+    <!-- Menu Bar -->
+    <StackPanel VerticalAlignment="Top" Grid.ColumnSpan="4">
+      <Menu Height="20" >
+        <MenuItem Header="_File">
+          <MenuItem Name="AppExitMenuItem" Header="E_xit" HorizontalAlignment="Left" Width="185" Click="AppExitMenuItemClick" />
+        </MenuItem>
+        <MenuItem Header="_Tools">
+          <MenuItem Name="OptionsMenuItem" Header="_Options" HorizontalAlignment="Left" Width="185" Click="OptionsMenuItemClick" />
+          <MenuItem Name="ShowLogMenuItem" Header="Show _Log Window" HorizontalAlignment="Left" Width="185">
+            <MenuItem.Icon>
+              <CheckBox Name="ShowLogCheckBox" BorderThickness="0" DataContext="{Binding Source={x:Static local:ViewModels.LoggerViewModel}}" IsChecked="{Binding Path=WindowVisible}" />
+            </MenuItem.Icon>
+          </MenuItem>
+        </MenuItem>
+        <MenuItem Header="_Help">
+          <MenuItem Name="AboutMenuItem" Header="_About" HorizontalAlignment="Left" Width="185" Click="AboutMenuItemClick" />
+          <MenuItem Name="CheckForUpdatesMenuItem" Header="_Check for Updates" HorizontalAlignment="Left" Width="185" Click="CheckForUpdatesMenuItemClick" />
+        </MenuItem>
+      </Menu>
+    </StackPanel>
+
+    <!-- Settings -->
+    <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5.2,5.4" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch">
+      <TextBlock Text="Settings" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="1" Grid.Column="0" Margin="15,25,15.2,10.4" Grid.ColumnSpan="2" ColumnDefinitions="1*,2.5*" RowDefinitions="1*,1*,1*,1*,1*,1*">
+
+      <!-- System / Media Type Selection -->
+      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Text="System/Media Type" />
+      <ComboBox Name="SystemTypeComboBox" Grid.Row="0" Grid.Column="1" Height="25" Width="250" HorizontalAlignment="Left" AutoScrollToSelectedItem="True" SelectionChanged="SystemTypeComboBoxSelectionChanged">
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=Name}" Foreground="{Binding Path=Foreground}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+      <ComboBox Name="MediaTypeComboBox" Grid.Row="0" Grid.Column="1" Height="25" Width="140" HorizontalAlignment="Right" AutoScrollToSelectedItem="True" SelectionChanged="MediaTypeComboBoxSelectionChanged">
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Converter={StaticResource enumConverter}}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <!-- Output Filename -->
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Text="Output Filename" />
+      <TextBox Name="OutputFilenameTextBox" Grid.Row="1" Grid.Column="1" Height="25" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextInput="OutputFilenameTextBoxTextChanged" />
+
+      <!-- Output Directory -->
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Text="Output Directory" />
+      <TextBox Name="OutputDirectoryTextBox" Grid.Row="2" Grid.Column="1" Height="25" Width="345" HorizontalAlignment="Left" ScrollViewer.VerticalScrollBarVisibility="Disabled" TextInput="OutputDirectoryTextBoxTextChanged" />
+      <Button Name="OutputDirectoryBrowseButton" Grid.Row="2" Grid.Column="1" Height="25" Width="50" HorizontalAlignment="Right" Content="Browse" Click="OutputDirectoryBrowseButtonClick" />
+
+      <!-- Drive Letter -->
+      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Text="Drive Letter" />
+      <ComboBox Name="DriveLetterComboBox" Grid.Row="3" Grid.Column="1" Height="25" Width="60" HorizontalAlignment="Left" SelectionChanged="DriveLetterComboBoxSelectionChanged">
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=Letter}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <!-- Drive Speed -->
+      <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Text="Drive Speed" />
+      <ComboBox Name="DriveSpeedComboBox" Grid.Row="4" Grid.Column="1" Height="25" Width="60" HorizontalAlignment="Left" SelectionChanged="DriveSpeedComboBoxSelectionChanged" />
+
+      <!-- Parameters -->
+      <TextBlock Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Text="Parameters" />
+      <TextBox Name="ParametersTextBox" Grid.Row="5" Grid.Column="1" Height="25" Width="370" HorizontalAlignment="Left" ScrollViewer.VerticalScrollBarVisibility="Disabled" IsEnabled="False" />
+      <CheckBox Name="EnableParametersCheckBox" Grid.Row="5" Grid.Column="1" Height="25" HorizontalAlignment="Right" IsChecked="False" Click="EnableParametersCheckBoxClick" />
+    </Grid>
+
+    <!-- Controls -->
+    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,4.6,5.2,4.8" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch">
+      <TextBlock Text="Controls" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="2" Grid.Column="0" Margin="15,19.6,15.2,9.8" Grid.ColumnSpan="2" ColumnDefinitions="1*,1*,1*,1*" RowDefinitions="1*">
+      <Button Name="StartStopButton" Grid.Row="0" Grid.Column="0" Height="25" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="StartStopButtonClick" IsEnabled="False" />
+      <Button Name="MediaScanButton" Grid.Row="0" Grid.Column="1" Height="25" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan For Media" Click="MediaScanButtonClick" />
+      <Button Name="CopyProtectScanButton" Grid.Row="0" Grid.Column="2" Height="25" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan For Protection" Click="CopyProtectScanButtonClick" />
+      <CheckBox Name="EjectWhenDoneCheckBox" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Eject When Done" IsChecked="False" />
+    </Grid>
+
+    <!-- Status -->
+    <Border Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5.2,5.2,4.8" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch">
+      <TextBlock Text="Status" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="3" Grid.Column="0" Margin="15,20.2,15.2,9.8" Grid.ColumnSpan="2" ColumnDefinitions="1*" RowDefinitions="1*">
+      <TextBlock Name="StatusLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="Waiting for media..." />
+    </Grid>
+  </Grid>
+</Window>

DICUI.Avalonia/MainWindow.axaml.cs

@@ -0,0 +1,837 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using BurnOutSharp;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    public class MainWindow : Window
+    {
+        #region Fields
+
+        /// <summary>
+        /// Currently selected or detected media type
+        /// </summary>
+        public MediaType? CurrentMediaType { get; private set; }
+
+        /// <summary>
+        /// Current list of drives
+        /// </summary>
+        public List<Drive> Drives { get; private set; }
+
+        /// <summary>
+        /// Current dumping environment
+        /// </summary>
+        public DumpEnvironment Env { get; private set; }
+
+        /// <summary>
+        /// Current list of supported media types
+        /// </summary>
+        public List<MediaType?> MediaTypes { get; private set; } = new List<MediaType?>();
+
+        /// <summary>
+        /// Current list of supported system profiles
+        /// </summary>
+        public List<KnownSystemComboBoxItem> Systems { get; private set; }
+
+        /// <summary>
+        /// Current UI options
+        /// </summary>
+        public UIOptions UIOptions { get; private set; } = new UIOptions();
+
+        #endregion
+
+        #region Private Instance Variables
+
+        /// <summary>
+        /// Current attached LogWindow
+        /// </summary>
+        private LogWindow logWindow;
+
+        #endregion
+
+        public MainWindow()
+        {
+            InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            // Load the options
+            ViewModels.OptionsViewModel = new OptionsViewModel(UIOptions);
+
+            // Load the log window
+            logWindow = new LogWindow();
+            logWindow.Owner = this;
+            ViewModels.LoggerViewModel.SetWindow(logWindow);
+
+            // Disable buttons until we load
+            this.Find<Button>("StartStopButton").IsEnabled = false;
+            this.Find<Button>("MediaScanButton").IsEnabled = false;
+            this.Find<Button>("CopyProtectScanButton").IsEnabled = false;
+
+            // TODO: If log window open, "dock" it to the current Window
+
+            if (UIOptions.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
+                this.Find<CheckBox>("ShowLogCheckBox").IsChecked = true;
+                ViewModels.LoggerViewModel.WindowVisible = true;
+            }
+
+            // Populate the list of systems
+            this.Find<TextBlock>("StatusLabel").Text = "Creating system list, please wait!";
+            PopulateSystems();
+
+            // Populate the list of drives
+            this.Find<TextBlock>("StatusLabel").Text = "Creating drive list, please wait!";
+            PopulateDrives();
+        }
+
+        #region Helpers
+
+        /// <summary>
+        /// Browse for an output folder
+        /// </summary>
+        private async void BrowseFolder()
+        {
+            OpenFolderDialog folderDialog = new OpenFolderDialog { Directory = AppDomain.CurrentDomain.BaseDirectory };
+            string directory = await folderDialog.ShowAsync(this);
+            if (!string.IsNullOrWhiteSpace(directory))
+                this.Find<TextBox>("OutputDirectoryTextBox").Text = directory;
+        }
+
+        /// <summary>
+        /// Cache the current disc type to internal variable
+        /// </summary>
+        private void CacheCurrentDiscType()
+        {
+            // Get the drive letter from the selected item
+            if (this.Find<ComboBox>("DriveLetterComboBox").SelectedItem is Drive drive)
+            {
+                // Get the current media type, if possible
+                if (UIOptions.Options.SkipMediaTypeDetection)
+                {
+                    ViewModels.LoggerViewModel.VerboseLog("Media type detection disabled, defaulting to CD-ROM");
+                    CurrentMediaType = MediaType.CDROM;
+                }
+                else
+                {
+                    ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
+                    CurrentMediaType = Validators.GetMediaType(drive);
+                    ViewModels.LoggerViewModel.VerboseLogLn(CurrentMediaType == null ? "unable to detect, defaulting to CD-ROM." : ($"detected {CurrentMediaType.LongName()}."));
+                    if (CurrentMediaType == null)
+                        CurrentMediaType = MediaType.CDROM;
+                }
+            }
+        }
+
+        /// <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(UIOptions.Options,
+                this.Find<TextBox>("OutputDirectoryTextBox").Text,
+                this.Find<TextBox>("OutputFilenameTextBox").Text,
+                this.Find<ComboBox>("DriveLetterComboBox").SelectedItem as Drive,
+                this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem,
+                this.Find<ComboBox>("MediaTypeComboBox").SelectedItem as MediaType?,
+                this.Find<TextBox>("ParametersTextBox").Text);
+
+            // Disable automatic reprocessing of the textboxes until we're done
+            this.Find<TextBox>("OutputDirectoryTextBox").TextInput -= OutputDirectoryTextBoxTextChanged;
+            this.Find<TextBox>("OutputFilenameTextBox").TextInput -= OutputFilenameTextBoxTextChanged;
+
+            this.Find<TextBox>("OutputDirectoryTextBox").Text = env.OutputDirectory;
+            this.Find<TextBox>("OutputFilenameTextBox").Text = env.OutputFilename;
+
+            this.Find<TextBox>("OutputDirectoryTextBox").TextInput += OutputDirectoryTextBoxTextChanged;
+            this.Find<TextBox>("OutputFilenameTextBox").TextInput += OutputFilenameTextBoxTextChanged;
+
+            return env;
+        }
+
+        /// <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);
+            this.Find<TextBlock>("StatusLabel").Text = result.Message;
+
+            // Set the index for the current disc type
+            SetCurrentDiscType();
+
+            this.Find<Button>("StartStopButton").IsEnabled = result && (Drives != null && Drives.Count > 0 ? true : false);
+
+            // If we're in a type that doesn't support drive speeds
+            this.Find<ComboBox>("DriveSpeedComboBox").IsEnabled = Env.Type.DoesSupportDriveSpeed();
+
+            // If input params are not enabled, generate the full parameters from the environment
+            if (!this.Find<TextBox>("ParametersTextBox").IsEnabled)
+            {
+                string generated = Env.GetFullParameters((int?)this.Find<ComboBox>("DriveSpeedComboBox").SelectedItem);
+                if (generated != null)
+                    this.Find<TextBox>("ParametersTextBox").Text = generated;
+            }
+        }
+
+        /// <summary>
+        /// Get the default output directory name from the currently selected drive
+        /// </summary>
+        /// <param name="driveChanged">Force an updated name if the drive letter changes</param>
+        private void GetOutputNames(bool driveChanged)
+        {
+            Drive drive = this.Find<ComboBox>("DriveLetterComboBox").SelectedItem as Drive;
+            KnownSystem? systemType = this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem;
+            MediaType? mediaType = this.Find<ComboBox>("MediaTypeComboBox").SelectedItem as MediaType?;
+
+            // Set the output directory, if we changed drives or it's not already
+            if (driveChanged || string.IsNullOrEmpty(this.Find<TextBox>("OutputDirectoryTextBox").Text))
+                this.Find<TextBox>("OutputDirectoryTextBox").Text = Path.Combine(UIOptions.Options.DefaultOutputPath, drive?.VolumeLabel ?? string.Empty);
+
+            // Get the extension for the file for the next two statements
+            string extension = Env?.GetExtension(mediaType);
+
+            // Set the output filename, if we changed drives or it's not already
+            if (driveChanged || string.IsNullOrEmpty(this.Find<TextBox>("OutputFilenameTextBox").Text))
+                this.Find<TextBox>("OutputFilenameTextBox").Text = (drive?.VolumeLabel ?? systemType.LongName()) + (extension ?? ".bin");
+
+            // If the extension for the file changed, update that automatically
+            else if (Path.GetExtension(this.Find<TextBox>("OutputFilenameTextBox").Text) != extension)
+                this.Find<TextBox>("OutputFilenameTextBox").Text = Path.GetFileNameWithoutExtension(this.Find<TextBox>("OutputFilenameTextBox").Text) + (extension ?? ".bin");
+        }
+
+        /// <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
+            this.Find<Button>("MediaScanButton").IsEnabled = true;
+
+            // Populate the list of drives and add it to the combo box
+            Drives = Validators.CreateListOfDrives(UIOptions.Options.IgnoreFixedDrives);
+            this.Find<ComboBox>("DriveLetterComboBox").Items = Drives;
+
+            if (Drives.Any())
+            {
+                // 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
+                this.Find<ComboBox>("DriveLetterComboBox").SelectedIndex = (index != -1 ? index : 0);
+                this.Find<TextBlock>("StatusLabel").Text = "Valid drive found! Choose your Media Type";
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = true;
+
+                // Get the current media type
+                if (!UIOptions.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);
+                        this.Find<ComboBox>("SystemTypeComboBox").SelectedIndex = sysIndex;
+                    }
+                }
+
+                // Only enable the start/stop if we don't have the default selected
+                this.Find<Button>("StartStopButton").IsEnabled = (this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem) != KnownSystem.NONE;
+
+                ViewModels.LoggerViewModel.VerboseLogLn("Found {0} drives: {1}", Drives.Count, string.Join(", ", Drives.Select(d => d.Letter)));
+            }
+            else
+            {
+                this.Find<ComboBox>("DriveLetterComboBox").SelectedIndex = -1;
+                this.Find<TextBlock>("StatusLabel").Text = "No valid drive found!";
+                this.Find<Button>("StartStopButton").IsEnabled = false;
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = false;
+
+                ViewModels.LoggerViewModel.VerboseLogLn("Found no drives");
+            }
+        }
+
+        /// <summary>
+        /// Populate media type according to system type
+        /// </summary>
+        private void PopulateMediaType()
+        {
+            KnownSystem? currentSystem = this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem;
+
+            if (currentSystem != null)
+            {
+                MediaTypes = Validators.GetValidMediaTypes(currentSystem);
+                this.Find<ComboBox>("MediaTypeComboBox").Items = MediaTypes;
+                this.Find<ComboBox>("MediaTypeComboBox").IsEnabled = MediaTypes.Count > 1;
+                this.Find<ComboBox>("MediaTypeComboBox").SelectedIndex = (MediaTypes.IndexOf(CurrentMediaType) >= 0 ? MediaTypes.IndexOf(CurrentMediaType) : 0);
+            }
+            else
+            {
+                this.Find<ComboBox>("MediaTypeComboBox").Items = null;
+                this.Find<ComboBox>("MediaTypeComboBox").IsEnabled = false;
+                this.Find<ComboBox>("MediaTypeComboBox").SelectedIndex = -1;
+            }
+        }
+
+        /// <summary>
+        /// Get a complete list of supported systems and fill the combo box
+        /// </summary>
+        private void PopulateSystems()
+        {
+            var knownSystems = Validators.CreateListOfSystems();
+
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating systems, {0} systems found.", knownSystems.Count);
+
+            Dictionary<KnownSystemCategory, List<KnownSystem?>> mapping = knownSystems
+                .GroupBy(s => s.Category())
+                .ToDictionary(
+                    k => k.Key,
+                    v => v
+                        .OrderBy(s => s.LongName())
+                        .ToList()
+                );
+
+            Systems = new List<KnownSystemComboBoxItem>()
+            {
+                new KnownSystemComboBoxItem(KnownSystem.NONE),
+            };
+
+            foreach (var group in mapping)
+            {
+                Systems.Add(new KnownSystemComboBoxItem(group.Key));
+                group.Value.ForEach(system => Systems.Add(new KnownSystemComboBoxItem(system)));
+            }
+
+            this.Find<ComboBox>("SystemTypeComboBox").Items = Systems;
+            this.Find<ComboBox>("SystemTypeComboBox").SelectedIndex = 0;
+
+            this.Find<Button>("StartStopButton").IsEnabled = false;
+        }
+
+        /// <summary>
+        /// Process the current custom parameters back into UI values
+        /// </summary>
+        private void ProcessCustomParameters()
+        {
+            Env.SetParameters(this.Find<TextBox>("ParametersTextBox").Text);
+            if (Env.Parameters == null)
+                return;
+
+            int driveIndex = Drives.Select(d => d.Letter).ToList().IndexOf(Env.Parameters.InputPath()[0]);
+            if (driveIndex > -1)
+                this.Find<ComboBox>("DriveLetterComboBox").SelectedIndex = driveIndex;
+
+            int driveSpeed = Env.Parameters.GetSpeed() ?? -1;
+            if (driveSpeed > 0)
+                this.Find<ComboBox>("DriveSpeedComboBox").SelectedItem = driveSpeed;
+            else
+                Env.Parameters.SetSpeed((int?)this.Find<ComboBox>("DriveSpeedComboBox").SelectedItem);
+
+            string trimmedPath = Env.Parameters.OutputPath()?.Trim('"') ?? string.Empty;
+            string outputDirectory = Path.GetDirectoryName(trimmedPath);
+            string outputFilename = Path.GetFileName(trimmedPath);
+            if (!string.IsNullOrWhiteSpace(outputDirectory))
+                this.Find<TextBox>("OutputDirectoryTextBox").Text = outputDirectory;
+            else
+                outputDirectory = this.Find<TextBox>("OutputDirectoryTextBox").Text;
+
+            if (!string.IsNullOrWhiteSpace(outputFilename))
+                this.Find<TextBox>("OutputFilenameTextBox").Text = outputFilename;
+            else
+                outputFilename = this.Find<TextBox>("OutputFilenameTextBox").Text;
+
+            MediaType? mediaType = Env.Parameters.GetMediaType();
+            int mediaTypeIndex = MediaTypes.IndexOf(mediaType);
+            if (mediaTypeIndex > -1)
+                this.Find<ComboBox>("MediaTypeComboBox").SelectedIndex = mediaTypeIndex;
+        }
+
+        /// <summary>
+        /// Scan and show copy protection for the current disc
+        /// </summary>
+        private async void ScanAndShowProtection()
+        {
+            // Determine current environment, just in case
+            if (Env == null)
+                Env = DetermineEnvironment();
+
+            // Pull the drive letter from the UI directly, just in case
+            var drive = this.Find<ComboBox>("DriveLetterComboBox").SelectedItem as Drive;
+            if (drive.Letter != default(char))
+            {
+                ViewModels.LoggerViewModel.VerboseLogLn("Scanning for copy protection in {0}", drive.Letter);
+
+                var tempContent = this.Find<TextBlock>("StatusLabel").Text;
+                this.Find<TextBlock>("StatusLabel").Text = "Scanning for copy protection... this might take a while!";
+                this.Find<Button>("StartStopButton").IsEnabled = false;
+                this.Find<Button>("MediaScanButton").IsEnabled = false;
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = false;
+
+                var progress = new Progress<FileProtection>();
+                progress.ProgressChanged += ProgressUpdated;
+                string protections = await Validators.RunProtectionScanOnPath(drive.Letter + ":\\");
+
+                // If SmartE is detected on the current disc, remove `/sf` from the flags for DIC only
+                if (Env.InternalProgram == InternalProgram.DiscImageCreator && protections.Contains("SmartE"))
+                {
+                    ((DiscImageCreator.Parameters)Env.Parameters)[DiscImageCreator.Flag.ScanFileProtect] = false;
+                    ViewModels.LoggerViewModel.VerboseLogLn($"SmartE detected, removing {DiscImageCreator.FlagStrings.ScanFileProtect} from parameters");
+                }
+
+                if (!ViewModels.LoggerViewModel.WindowVisible)
+                {
+                    new Window()
+                    {
+                        Title = "Detected Protection",
+                        Content = protections,
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    }.ShowDialog(this);
+                }
+
+                ViewModels.LoggerViewModel.VerboseLog("Detected the following protections in {0}:\r\n\r\n{1}", drive.Letter, protections);
+
+                this.Find<TextBlock>("StatusLabel").Text = tempContent;
+                this.Find<Button>("StartStopButton").IsEnabled = true;
+                this.Find<Button>("MediaScanButton").IsEnabled = true;
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = true;
+            }
+        }
+
+        /// <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)
+                this.Find<ComboBox>("MediaTypeComboBox").SelectedIndex = index;
+            else
+                this.Find<TextBlock>("StatusLabel").Text = $"Disc of type '{Converters.LongName(CurrentMediaType)}' found, but the current system does not support it!";
+        }
+
+        /// <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 = Interface.GetSpeedsForMediaType(CurrentMediaType);
+            this.Find<ComboBox>("DriveSpeedComboBox").Items = values;
+            ViewModels.LoggerViewModel.VerboseLogLn("Supported media speeds: {0}", string.Join(",", values));
+
+            // Set the selected speed
+            int speed = UIOptions.GetPreferredDumpSpeedForMediaType(CurrentMediaType);
+            ViewModels.LoggerViewModel.VerboseLogLn("Setting drive speed to: {0}", speed);
+            this.Find<ComboBox>("DriveSpeedComboBox").SelectedItem = speed;
+        }
+
+        /// <summary>
+        /// Show the disc information window
+        /// </summary>
+        /// <param name="submissionInfo">SubmissionInfo object to display and possibly change</param>
+        /// <returns>Dialog open result</returns>
+        private bool? ShowDiscInformationWindow(SubmissionInfo submissionInfo)
+        {
+            var discInformationWindow = new DiscInformationWindow(submissionInfo);
+            discInformationWindow.Load();
+            discInformationWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            discInformationWindow.ShowDialog(this).ConfigureAwait(false).GetAwaiter().GetResult();
+            return true;
+        }
+
+        /// <summary>
+        /// Begin the dumping process using the given inputs
+        /// </summary>
+        private async void StartDumping()
+        {
+            // One last check to determine environment, just in case
+            Env = DetermineEnvironment();
+
+            // If still in custom parameter mode, check that users meant to continue or not
+            if (this.Find<CheckBox>("EnableParametersCheckBox").IsChecked == true)
+            {
+                MessageBoxResult result = await MessageBox.Show(this, "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", MessageBoxButtons.YesNoCancel);
+                if (result == MessageBoxResult.Yes)
+                {
+                    this.Find<CheckBox>("EnableParametersCheckBox").IsChecked = false;
+                    this.Find<TextBox>("ParametersTextBox").IsEnabled = false;
+                    ProcessCustomParameters();
+                }
+                else if (result == MessageBoxResult.Cancel)
+                {
+                    return;
+                }
+                // If "No", then we continue with the current known environment
+            }
+
+            // Fix the output paths
+            Env.FixOutputPaths();
+
+            try
+            {
+                // Validate that the user explicitly wants an inactive drive to be considered for dumping
+                if (!Env.Drive.MarkedActive)
+                {
+                    MessageBoxResult mbresult = await MessageBox.Show(this, "The currently selected drive does not appear to contain a disc! Are you sure you want to continue?", "Missing Disc", MessageBoxButtons.YesNo);
+                    if (mbresult == MessageBoxResult.No || mbresult == MessageBoxResult.Cancel)
+                    {
+                        ViewModels.LoggerViewModel.VerboseLogLn("Dumping aborted!");
+                        return;
+                    }
+                }
+
+                // If a complete dump already exists
+                if (Env.FoundAllFiles())
+                {
+                    MessageBoxResult mbresult = await MessageBox.Show(this, "A complete dump already exists! Are you sure you want to overwrite?", "Overwrite?", MessageBoxButtons.YesNo);
+                    if (mbresult == MessageBoxResult.No || mbresult == MessageBoxResult.Cancel)
+                    {
+                        ViewModels.LoggerViewModel.VerboseLogLn("Dumping aborted!");
+                        return;
+                    }
+                }
+
+                this.Find<Button>("StartStopButton").Content = Interface.StopDumping;
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = false;
+                this.Find<TextBlock>("StatusLabel").Text = "Beginning dumping process";
+                ViewModels.LoggerViewModel.VerboseLogLn("Starting dumping process..");
+
+                // Get progress indicators
+                var resultProgress = new Progress<Result>();
+                resultProgress.ProgressChanged += ProgressUpdated;
+                var protectionProgress = new Progress<FileProtection>();
+                protectionProgress.ProgressChanged += ProgressUpdated;
+
+                // Run the program with the parameters
+                Result result = await Env.Run(resultProgress);
+
+                // If we didn't execute a dumping command we cannot get submission output
+                if (!Env.Parameters.IsDumpingCommand())
+                {
+                    ViewModels.LoggerViewModel.VerboseLogLn("No dumping command was run, submission information will not be gathered.");
+                    this.Find<TextBlock>("StatusLabel").Text = "Execution complete!";
+                    this.Find<Button>("StartStopButton").Content = Interface.StartDumping;
+                    this.Find<Button>("CopyProtectScanButton").IsEnabled = true;
+                    return;
+                }
+
+                if (result)
+                {
+                    // Verify dump output and save it
+                    result = await Env.VerifyAndSaveDumpOutput(resultProgress,
+                        protectionProgress,
+                        this.Find<CheckBox>("EjectWhenDoneCheckBox").IsChecked,
+                        UIOptions.Options.ResetDriveAfterDump,
+                        ShowDiscInformationWindow
+                    );
+                }
+            }
+            catch
+            {
+                // No-op, we don't care what it was
+            }
+            finally
+            {
+                this.Find<Button>("StartStopButton").Content = Interface.StartDumping;
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = true;
+            }
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for AboutMenuItem Click event
+        /// </summary>
+        private void AboutMenuItemClick(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show(this, $"darksabre76 - Project Lead / Backend Design"
+                + $"{Environment.NewLine}ReignStumble - Former Project Lead / UI Design"
+                + $"{Environment.NewLine}Jakz - Primary Feature Contributor"
+                + $"{Environment.NewLine}NHellFire - Feature Contributor", "About", MessageBoxButtons.Ok);
+        }
+
+        /// <summary>
+        /// Handler for AppExitMenuItem Click event
+        /// </summary>
+        private void AppExitMenuItemClick(object sender, RoutedEventArgs e)
+        {
+            logWindow?.Close();
+            Close();
+        }
+
+        /// <summary>
+        /// Handler for CheckForUpdatesMenuItem Click event
+        /// </summary>
+        private void CheckForUpdatesMenuItemClick(object sender, RoutedEventArgs e)
+        {
+            (bool different, string message, string url) = Tools.CheckForNewVersion();
+
+            // If we have a new version, put it in the clipboard
+            if (different)
+                Application.Current.Clipboard.SetTextAsync(url);
+
+            MessageBox.Show(this, message, "Version Update Check", MessageBoxButtons.Ok);
+        }
+
+        /// <summary>
+        /// Handler for CopyProtectScanButton Click event
+        /// </summary>
+        private void CopyProtectScanButtonClick(object sender, RoutedEventArgs e)
+        {
+            ScanAndShowProtection();
+        }
+
+        /// <summary>
+        /// Handler for DriveLetterComboBox SelectionChanged event
+        /// </summary>
+        private void DriveLetterComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            CacheCurrentDiscType();
+            SetCurrentDiscType();
+            GetOutputNames(true);
+            SetSupportedDriveSpeed();
+        }
+
+        /// <summary>
+        /// Handler for DriveSpeedComboBox SelectionChanged event
+        /// </summary>
+        private void DriveSpeedComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for EnableParametersCheckBox Click event
+        /// </summary>
+        private void EnableParametersCheckBoxClick(object sender, RoutedEventArgs e)
+        {
+            if (this.Find<CheckBox>("EnableParametersCheckBox").IsChecked == true)
+                this.Find<TextBox>("ParametersTextBox").IsEnabled = true;
+            else
+            {
+                this.Find<TextBox>("ParametersTextBox").IsEnabled = false;
+                ProcessCustomParameters();
+            }
+        }
+
+        /// <summary>
+        /// Handler for MediaTypeComboBox SelectionChanged event
+        /// </summary>
+        private void MediaTypeComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            // Only change the media type if the selection and not the list has changed
+            if (e.RemovedItems.Count == 1 && e.AddedItems.Count == 1)
+            {
+                CurrentMediaType = this.Find<ComboBox>("MediaTypeComboBox").SelectedItem as MediaType?;
+                SetSupportedDriveSpeed();
+            }
+
+            GetOutputNames(false);
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for MediaScanButton Click event
+        /// </summary>
+        private void MediaScanButtonClick(object sender, RoutedEventArgs e)
+        {
+            PopulateDrives();
+        }
+
+        /// <summary>
+        /// Handler for MainWindow Activated event
+        /// </summary>
+        private void MainWindowActivated(object sender, EventArgs e)
+        {
+            if (logWindow.IsVisible && !this.Topmost)
+            {
+                logWindow.Topmost = true;
+                logWindow.Topmost = false;
+            }
+        }
+
+        /// <summary>
+        /// Handler for MainWindow Closing event
+        /// </summary>
+        private void MainWindowClosing(object sender, CancelEventArgs e)
+        {
+            if (logWindow.IsVisible)
+                logWindow?.Close();
+        }
+
+        /// <summary>
+        /// Handler for MainWindow PositionChanged event
+        /// </summary>
+        private void MainWindowLocationChanged(object sender, PixelPointEventArgs e)
+        {
+            if (logWindow.IsVisible)
+                logWindow.AdjustPositionToMainWindow();
+        }
+
+        /// <summary>
+        /// Handler for OptionsMenuItem Click event
+        /// </summary>
+        private async void OptionsMenuItemClick(object sender, RoutedEventArgs e)
+        {
+            // Show the window and wait for the response
+            var optionsWindow = new OptionsWindow();
+            optionsWindow.UIOptions = UIOptions;
+            optionsWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            optionsWindow.Refresh();
+            await optionsWindow.ShowDialog(this);
+
+            // Set any new options
+            PopulateDrives();
+            GetOutputNames(false);
+            SetSupportedDriveSpeed();
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for OutputDirectoryBrowseButton Click event
+        /// </summary>
+        private void OutputDirectoryBrowseButtonClick(object sender, RoutedEventArgs e)
+        {
+            BrowseFolder();
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for OutputFilenameTextBox TextInput event
+        /// </summary>
+        // TODO: Not triggered properly
+        private void OutputDirectoryTextBoxTextChanged(object sender, TextInputEventArgs e)
+        {
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for OutputFilenameTextBox TextInput event
+        /// </summary>
+        // TODO: Not triggered properly
+        private void OutputFilenameTextBoxTextChanged(object sender, TextInputEventArgs e)
+        {
+            EnsureDiscInformation();
+        }
+
+        /// <summary>
+        /// Handler for Result ProgressChanged event
+        /// </summary>
+        private void ProgressUpdated(object sender, Result value)
+        {
+            this.Find<TextBlock>("StatusLabel").Text = value.Message;
+            ViewModels.LoggerViewModel.VerboseLogLn(value.Message);
+        }
+
+        /// <summary>
+        /// Handler for FileProtection ProgressChanged event
+        /// </summary>
+        private void ProgressUpdated(object sender, FileProtection value)
+        {
+            string message = $"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}";
+            this.Find<TextBlock>("StatusLabel").Text = message;
+            ViewModels.LoggerViewModel.VerboseLogLn(message);
+        }
+
+        /// <summary>
+        /// Handler for StartStopButton Click event
+        /// </summary>
+        private void StartStopButtonClick(object sender, RoutedEventArgs e)
+        {
+            // Dump or stop the dump
+            if ((string)this.Find<Button>("StartStopButton").Content == Interface.StartDumping)
+            {
+                StartDumping();
+            }
+            else if ((string)this.Find<Button>("StartStopButton").Content == Interface.StopDumping)
+            {
+                ViewModels.LoggerViewModel.VerboseLogLn("Canceling dumping process...");
+                Env.CancelDumping();
+                this.Find<Button>("CopyProtectScanButton").IsEnabled = true;
+
+                if (this.Find<CheckBox>("EjectWhenDoneCheckBox").IsChecked == true)
+                {
+                    ViewModels.LoggerViewModel.VerboseLogLn($"Ejecting disc in drive {Env.Drive.Letter}");
+                    Env.EjectDisc();
+                }
+
+                if (UIOptions.Options.ResetDriveAfterDump)
+                {
+                    ViewModels.LoggerViewModel.VerboseLogLn($"Resetting drive {Env.Drive.Letter}");
+                    Env.ResetDrive();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handler for SystemTypeComboBox SelectionChanged event
+        /// </summary>
+        private void SystemTypeComboBoxSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            // If we're on a separator, go to the next item and return
+            if ((this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem).IsHeader())
+            {
+                this.Find<ComboBox>("SystemTypeComboBox").SelectedIndex++;
+                return;
+            }
+
+            ViewModels.LoggerViewModel.VerboseLogLn("Changed system to: {0}", (this.Find<ComboBox>("SystemTypeComboBox").SelectedItem as KnownSystemComboBoxItem).Name);
+            PopulateMediaType();
+            GetOutputNames(false);
+            EnsureDiscInformation();
+        }
+
+        #endregion
+    }
+}

DICUI.Avalonia/MessageBox.axaml

@@ -0,0 +1,17 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" Icon="Icon.ico"
+        x:Class="DICUI.Avalonia.MessageBox" SizeToContent="WidthAndHeight" CanResize="False">
+    <StackPanel HorizontalAlignment="Center">
+        <TextBlock HorizontalAlignment="Center" Name="Text"/>
+        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Name="Buttons">
+            <StackPanel.Styles>
+                <Style Selector="Button">
+                    <Setter Property="Margin" Value="5"/>
+                </Style>
+            </StackPanel.Styles>
+        </StackPanel>
+    </StackPanel>
+</Window>

DICUI.Avalonia/MessageBox.axaml.cs

@@ -0,0 +1,83 @@
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+// https://stackoverflow.com/questions/55706291/how-to-show-a-message-box-in-avaloniaui-beta
+namespace DICUI.Avalonia
+{
+    public enum MessageBoxButtons
+    {
+        Ok,
+        OkCancel,
+        YesNo,
+        YesNoCancel
+    }
+
+    public enum MessageBoxResult
+    {
+        Ok,
+        Cancel,
+        Yes,
+        No
+    }
+
+    public class MessageBox : Window
+    {
+        public MessageBox()
+        {
+            this.InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        public static Task<MessageBoxResult> Show(Window parent, string text, string title, MessageBoxButtons buttons)
+        {
+            var msgbox = new MessageBox()
+            {
+                Title = title
+            };
+            msgbox.FindControl<TextBlock>("Text").Text = text;
+            var buttonPanel = msgbox.FindControl<StackPanel>("Buttons");
+
+            var res = MessageBoxResult.Ok;
+
+            void AddButton(string caption, MessageBoxResult r, bool def = false)
+            {
+                var btn = new Button { Content = caption };
+                btn.Click += (_, __) => {
+                    res = r;
+                    msgbox.Close();
+                };
+                buttonPanel.Children.Add(btn);
+                if (def)
+                    res = r;
+            }
+
+            if (buttons == MessageBoxButtons.Ok || buttons == MessageBoxButtons.OkCancel)
+                AddButton("Ok", MessageBoxResult.Ok, true);
+            if (buttons == MessageBoxButtons.YesNo || buttons == MessageBoxButtons.YesNoCancel)
+            {
+                AddButton("Yes", MessageBoxResult.Yes);
+                AddButton("No", MessageBoxResult.No, true);
+            }
+
+            if (buttons == MessageBoxButtons.OkCancel || buttons == MessageBoxButtons.YesNoCancel)
+                AddButton("Cancel", MessageBoxResult.Cancel, true);
+
+
+            var tcs = new TaskCompletionSource<MessageBoxResult>();
+            msgbox.Closed += delegate { tcs.TrySetResult(res); };
+            if (parent != null)
+                msgbox.ShowDialog(parent);
+            else msgbox.Show();
+            return tcs.Task;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

DICUI.Avalonia/OptionsWindow.axaml

@@ -0,0 +1,165 @@
+<Window xmlns="https://github.com/avaloniaui"
+        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.Avalonia"
+        mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="600" Width="515.132" Height="600"
+        x:Class="DICUI.Avalonia.OptionsWindow" Icon="Icon.ico" CanResize="False"
+        Title="Options">
+  
+  <Grid RowDefinitions="150,150,150,80,40">
+
+    <!-- Paths -->
+    <Border Grid.Row="0" Grid.ColumnSpan="2" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Paths" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="0" Grid.ColumnSpan="2" Margin="10,15,10,10" ColumnDefinitions="1*,2*,0.2*" RowDefinitions="Auto,Auto,Auto,Auto">
+      <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Aaru Path" />
+      <TextBox Name="AaruPathTextBox" Grid.Row="0" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=AaruPath}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+      <Button Name="AaruPathButton" Grid.Row="0" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="DiscImageCreator Path" />
+      <TextBox Name="CreatorPathTextBox" Grid.Row="1" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=CreatorPath}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+      <Button Name="CreatorPathButton" Grid.Row="1" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+
+      <!--
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="dd Path" />
+      <TextBox Name="DDPathTextBox" Grid.Row="2" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=DDPath}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+      <Button Name="DDPathButton" Grid.Row="2" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+      -->
+
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Region" />
+      <ComboBox Name="InternalProgramComboBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" ScrollViewer.VerticalScrollBarVisibility="Disabled" >
+        <ComboBox.ItemTemplate>
+          <DataTemplate>
+            <TextBlock Text="{Binding Path=Name}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
+
+      <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Default Output Path" />
+      <TextBox Name="DefaultOutputPathTextBox" Grid.Row="3" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=DefaultOutputPath}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+      <Button Name="DefaultOutputPathButton" Grid.Row="3" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+    </Grid>
+
+    <!-- Dumping Speeds -->
+    <Border Grid.Row="1" Grid.ColumnSpan="2" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Preferred Dump Speed" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="1" Grid.ColumnSpan="2" Margin="10,15,10,10" ColumnDefinitions="80,2*,40" RowDefinitions="1*,Auto,Auto,Auto">
+      <TextBlock Grid.Row="1" Grid.Column="0" Text="CD-ROM" Margin="5" />
+      <Slider Name="DumpSpeedCDSlider" Grid.Row="1" Grid.Column="1" Minimum="0" Maximum="72" Margin="5"
+              IsSnapToTickEnabled="True" TickFrequency="4"
+              DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+              Value="{Binding Path=PreferredDumpSpeedCD}" />
+              <!-- Ticks="{Binding Source={x:Static local:Constants.SpeedsForCDAsCollection}}" -->
+      <TextBox Name="DumpSpeedCDTextBox" Grid.Row="1" Grid.Column="2" Width="25" Height="25" TextAlignment="Center" VerticalAlignment="Center"
+               IsReadOnly="True" Text="{Binding ElementName=DumpSpeedCDSlider, Path=Value}"
+               Background="LightGray" Foreground="Gray" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    
+      <TextBlock Grid.Row="2" Grid.Column="0" Text="DVD-ROM" Margin="5" />
+      <Slider Name="DumpSpeedDVDSlider" Grid.Row="2" Grid.Column="1" Minimum="0" Maximum="24" Margin="5"
+              IsSnapToTickEnabled="True" TickFrequency="2"
+              DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+              Value="{Binding Path=PreferredDumpSpeedDVD}" />
+              <!-- Ticks="{Binding Source={x:Static local:Constants.SpeedsForDVDAsCollection}}" -->
+      <TextBox Name="DumpSpeedDVDTextBox" Grid.Row="2" Grid.Column="2" Width="25" Height="25" TextAlignment="Center" VerticalAlignment="Center"
+               IsReadOnly="True" Text="{Binding ElementName=DumpSpeedDVDSlider, Path=Value}"
+               Background="LightGray" Foreground="Gray" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    
+      <TextBlock Grid.Row="3" Grid.Column="0" Text="BD-ROM" Margin="5" />
+      <Slider Name="DumpSpeedBDSlider" Grid.Row="3" Grid.Column="1" Minimum="0" Maximum="16" Margin="5"
+              IsSnapToTickEnabled="True" TickFrequency="2"
+              DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+              Value="{Binding Path=PreferredDumpSpeedBD}" />
+              <!-- Ticks="{Binding Source={x:Static local:Constants.SpeedsForBDAsCollection}}" -->
+      <TextBox Name="DumpSpeedBDTextBox" Grid.Row="3" Grid.Column="2" Width="25" Height="25" TextAlignment="Center" VerticalAlignment="Center"
+               IsReadOnly="True" Text="{Binding ElementName=DumpSpeedBDSlider, Path=Value}"
+               Background="LightGray" Foreground="Gray" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    </Grid>
+  
+    <!-- Misc. Options -->
+    <Border Grid.Row="2" Grid.ColumnSpan="2" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Options" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="2" Grid.ColumnSpan="2" Margin="10,15,10,10" ColumnDefinitions="1*,1*,1*,1*" RowDefinitions="1*,Auto,Auto,Auto">
+      <CheckBox Grid.Row="1" Grid.Column="0" Margin="0,4" VerticalAlignment="Center" Content="Quiet Mode"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=QuietMode}"
+                ToolTip.Tip="Disable DiscImageCreator sounds" />
+    
+      <CheckBox Grid.Row="1" Grid.Column="1" Margin="0,4" VerticalAlignment="Center" Content="Paranoid Mode"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=ParanoidMode}"
+                ToolTip.Tip="Enable pedantic and super-safe flags" />
+    
+      <TextBlock Grid.Row="1" Grid.Column="2" Margin="5" Text="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+      <TextBox Grid.Row="1" Grid.Column="3" Margin="0,4" VerticalAlignment="Center"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=RereadAmountForC2}"
+               ToolTip.Tip="Specifies how many rereads are attempted on C2 error" />
+    
+      <CheckBox Grid.Row="2" Grid.Column="0" Margin="0,4" VerticalAlignment="Center" Content="Protection Scan"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=ScanForProtection}"
+                ToolTip.Tip="Enable automatic checking for copy protection on dumped media" />
+
+      <CheckBox Grid.Row="2" Grid.Column="1" Margin="0,4" VerticalAlignment="Center" Content="Skip Type Detect"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=SkipMediaTypeDetection}"
+                ToolTip.Tip="Disable trying to guess media type inserted (may improve performance at startup)" />
+
+      <CheckBox Grid.Row="2" Grid.Column="2" Margin="0,4" VerticalAlignment="Center" Content="Add Placeholders"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=AddPlaceholders}"
+                ToolTip.Tip="Enable adding placeholder text in the submissioninfo output for required and optional fields" />
+
+      <CheckBox Grid.Row="3" Grid.Column="0" Margin="0,4" VerticalAlignment="Center" Content="Show Disc Info"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=PromptForDiscInformation}"
+                ToolTip.Tip="Enable showing the disc information output after dumping" />
+
+      <CheckBox Grid.Row="3" Grid.Column="1" Margin="0,4" VerticalAlignment="Center" Content="No Fixed Drives"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=IgnoreFixedDrives}"
+                ToolTip.Tip="Ignore hard drives and other fixed drives" />
+
+      <CheckBox Grid.Row="3" Grid.Column="2" Margin="0,4" VerticalAlignment="Center" Content="Reset After Dump"
+                DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                IsChecked="{Binding Path=ResetDriveAfterDump}"
+                ToolTip.Tip="Reset disc drives after dumping; useful for some older machines" />
+    </Grid>
+  
+    <!-- Redump -->
+    <Border Grid.Row="3" Grid.ColumnSpan="2" Margin="5" BorderThickness="1" BorderBrush="Gray" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Redump Login" Margin="2" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" FontSize="14" Foreground="Gray" />
+    </Border>
+    <Grid Grid.Row="3" Grid.ColumnSpan="2" Margin="10,15,10,10" ColumnDefinitions="1*,1*,1*,1*,1.2*" RowDefinitions="1*,Auto">
+      <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Username" />
+      <TextBox Name="RedumpUsernameTextBox" Grid.Row="1" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=Username}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    
+      <TextBlock Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Username" />
+      <TextBox Name="RedumpPasswordTextBox" Grid.Row="1" Grid.Column="3" Height="25" HorizontalAlignment="Stretch" PasswordChar="*"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=Password}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+    
+      <Button Name="RedumpLoginTestButton" Grid.Row="1" Grid.Column="5" Height="25" Width="80" Content="Test Login" Click="OnRedumpTestClick" />
+    </Grid>
+
+    <!-- Accept / Cancel -->
+    <Grid Height="25" Grid.Row="4" Grid.Column="0" ColumnDefinitions="2*,1*,1*">
+      <Button Name="AcceptButton" Grid.Row="0" Grid.Column="1" Height="25" Width="80" Content="Accept" Click="OnAcceptClick" />
+      <Button Name="CancelButton" Grid.Row="0" Grid.Column="2" Height="25" Width="80" Content="Cancel" Click="OnCancelClick" />
+    </Grid>
+  </Grid>
+</Window>

DICUI.Avalonia/OptionsWindow.axaml.cs

@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    public class OptionsWindow : Window
+    {
+        #region Fields
+
+        /// <summary>
+        /// Current UI options
+        /// </summary>
+        public UIOptions UIOptions { get; set; }
+
+        /// <summary>
+        /// List of available internal programs
+        /// </summary>
+        public List<InternalProgramComboBoxItem> InternalPrograms { get; private set; }
+
+        #endregion
+
+        public OptionsWindow()
+        {
+            this.InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+
+            PopulateInternalPrograms();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        #region Helpers
+
+        /// <summary>
+        /// Get a complete list of internal programs and fill the combo box
+        /// </summary>
+        private void PopulateInternalPrograms()
+        {
+            // We only support certain programs for dumping
+            var internalPrograms = new List<InternalProgram> { InternalProgram.DiscImageCreator, InternalProgram.Aaru, InternalProgram.DD };
+            ViewModels.LoggerViewModel.VerboseLogLn("Populating internal programs, {0} internal programs found.", internalPrograms.Count);
+
+            InternalPrograms = new List<InternalProgramComboBoxItem>();
+            foreach (var internalProgram in internalPrograms)
+            {
+                InternalPrograms.Add(new InternalProgramComboBoxItem(internalProgram));
+            }
+
+            this.Find<ComboBox>("InternalProgramComboBox").Items = InternalPrograms;
+            this.Find<ComboBox>("InternalProgramComboBox").SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Refresh any options-related elements
+        /// </summary>
+        public void Refresh()
+        {
+            // Handle non-bindable fields
+            this.Find<ComboBox>("InternalProgramComboBox").SelectedIndex = InternalPrograms.FindIndex(r => r == Converters.ToInternalProgram(UIOptions.Options.InternalProgram));
+        }
+
+        /// <summary>
+        /// Find a TextBox by setting name
+        /// </summary>
+        /// <param name="name">Setting name to find</param>
+        /// <returns>TextBox for that setting</returns>
+        private TextBox TextBoxForPathSetting(string name)
+        {
+            return this.Find<TextBox>(name + "TextBox");
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handler for generic Click event
+        /// </summary>
+        private async void BrowseForPathClick(object sender, RoutedEventArgs 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";
+
+            // Directory
+            if (shouldBrowseForPath)
+            {
+                OpenFolderDialog dialog = new OpenFolderDialog();
+                string result = await dialog.ShowAsync(this);
+                if (!string.IsNullOrWhiteSpace(result))
+                {
+                    if (Directory.Exists(result))
+                        TextBoxForPathSetting(pathSettingName).Text = result;
+                    else
+                        Console.WriteLine($"Path '{result}' cannot be found!");
+                }
+            }
+
+            // File
+            else
+            {
+                OpenFileDialog dialog = new OpenFileDialog();
+                string[] result = await dialog.ShowAsync(this);
+                if (result != null && result.Length > 0 && !string.IsNullOrWhiteSpace(result[0]))
+                {
+                    if (File.Exists(result[0]))
+                        TextBoxForPathSetting(pathSettingName).Text = result[0];
+                    else
+                        Console.WriteLine($"Path '{result[0]}' cannot be found!");
+                }
+            }            
+        }
+
+        /// <summary>
+        /// Handler for AcceptButton Click event
+        /// </summary>
+        private void OnAcceptClick(object sender, RoutedEventArgs e)
+        {
+            // Handle non-bindable fields
+            UIOptions.Options.InternalProgram = (this.Find<ComboBox>("InternalProgramComboBox").SelectedItem as InternalProgramComboBoxItem)?.Name ?? InternalProgram.DiscImageCreator.ToString();
+
+            UIOptions.Save();
+            Hide();
+        }
+
+        /// <summary>
+        /// Handler for CancelButton Click event
+        /// </summary>
+        private void OnCancelClick(object sender, RoutedEventArgs e)
+        {
+            Hide();
+        }
+
+        /// <summary>
+        /// Handler for RedumpLoginTestButton Click event
+        /// </summary>
+        private void OnRedumpTestClick(object sender, RoutedEventArgs e)
+        {
+            using (RedumpWebClient wc = new RedumpWebClient())
+            {
+                if (wc.Login(this.Find<TextBox>("RedumpUsernameTextBox").Text, this.Find<TextBox>("RedumpPasswordTextBox").Text))
+                {
+                    new Window()
+                    {
+                        Title = "Success",
+                        Content = "Redump login credentials accepted!",
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        WindowStartupLocation = WindowStartupLocation.CenterScreen,
+                    }.ShowDialog(this);
+                }
+                else
+                {
+                    new Window()
+                    {
+                        Title = "Failure",
+                        Content = "Redump login credentials denied!",
+                        SizeToContent = SizeToContent.WidthAndHeight,
+                        WindowStartupLocation = WindowStartupLocation.CenterScreen,
+                    }.ShowDialog(this);
+                }
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Avalonia/Program.cs

@@ -0,0 +1,22 @@
+using System;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Logging.Serilog;
+
+namespace DICUI.Avalonia
+{
+    class Program
+    {
+        // Initialization code. Don't use any Avalonia, third-party APIs or any
+        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
+        // yet and stuff might break.
+        public static void Main(string[] args) => BuildAvaloniaApp()
+            .StartWithClassicDesktopLifetime(args);
+
+        // Avalonia configuration, don't remove; also used by visual designer.
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .LogToDebug();
+    }
+}

DICUI.Avalonia/UIOptions.cs

@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+using System.Configuration;
+using DICUI.Data;
+
+namespace DICUI.Avalonia
+{
+    public class UIOptions
+    {
+        // TODO: Is there any way that this can be made private?
+        public Options Options { get; set; }
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public UIOptions()
+        {
+            Load();
+        }
+
+        /// <summary>
+        /// Save a configuration from internal Options
+        /// </summary>
+        public void Save()
+        {
+            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
+            // Loop through all settings in Options and save them, overwriting existing settings
+            foreach (var kvp in Options)
+            {
+                configFile.AppSettings.Settings.Remove(kvp.Key);
+                configFile.AppSettings.Settings.Add(kvp.Key, kvp.Value);
+            }
+
+            configFile.Save(ConfigurationSaveMode.Modified);
+        }
+
+        /// <summary>
+        /// Load a configuration into internal Options
+        /// </summary>
+        private void Load()
+        {
+            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
+            var settings = ConvertToDictionary(configFile);
+            Options = new Options(settings);
+        }
+
+        /// <summary>
+        /// Get a setting value from the base Options
+        /// </summary>
+        /// <param name="key">Key to retrieve the value for</param>
+        /// <returns>String value if possible, null otherwise</returns>
+        public string Get(string key)
+        {
+            return Options[key];
+        }
+
+        /// <summary>
+        /// Set a setting value in the base Options
+        /// </summary>
+        /// <param name="key">Key to set the value for</param>
+        /// <param name="value">Value to set</param>
+        public void Set(string key, string value)
+        {
+            Options[key] = value;
+        }
+
+        /// <summary>
+        /// Get the preferred dumping speed given a media type
+        /// </summary>
+        /// <param name="type">MediaType representing the current selection</param>
+        /// <returns>Int value representing the dump speed</returns>
+        public int GetPreferredDumpSpeedForMediaType(MediaType? type)
+        {
+            switch (type)
+            {
+                case MediaType.CDROM:
+                case MediaType.GDROM:
+                    return this.Options.PreferredDumpSpeedCD;
+                case MediaType.DVD:
+                case MediaType.HDDVD:
+                case MediaType.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                    return this.Options.PreferredDumpSpeedDVD;
+                case MediaType.BluRay:
+                    return this.Options.PreferredDumpSpeedBD;
+                default:
+                    return this.Options.PreferredDumpSpeedCD;
+            }
+        }
+
+        /// <summary>
+        /// Convert the configuration app settings to a dictionary
+        /// </summary>
+        /// <param name="configFile">Configuration to load from</param>
+        /// <returns>Dictionary with all values from app settings</returns>
+        private Dictionary<string, string> ConvertToDictionary(Configuration configFile)
+        {
+            var settings = configFile.AppSettings.Settings;
+            var dict = new Dictionary<string, string>();
+
+            foreach (string key in settings.AllKeys)
+            {
+                dict[key] = settings[key]?.Value ?? string.Empty;
+            }
+
+            return dict;
+        }
+    }
+}

DICUI.Avalonia/ViewModels.cs

@@ -0,0 +1,227 @@
+using System;
+using Avalonia.Media;
+
+namespace DICUI.Avalonia
+{
+    public class OptionsViewModel
+    {
+        private UIOptions _uiOptions;
+
+        #region Internal Program
+
+        public string AaruPath
+        {
+            get { return _uiOptions.Options.AaruPath; }
+            set { _uiOptions.Options.AaruPath = value; }
+        }
+
+        public string CreatorPath
+        {
+            get { return _uiOptions.Options.CreatorPath; }
+            set { _uiOptions.Options.CreatorPath = value; }
+        }
+
+        public string DDPath
+        {
+            get { return _uiOptions.Options.DDPath; }
+            set { _uiOptions.Options.DDPath = value; }
+        }
+
+        public string InternalProgram
+        {
+            get { return _uiOptions.Options.InternalProgram; }
+            set { _uiOptions.Options.InternalProgram = value; }
+        }
+
+        #endregion
+
+        #region Extra Paths
+
+        public string DefaultOutputPath
+        {
+            get { return _uiOptions.Options.DefaultOutputPath; }
+            set { _uiOptions.Options.DefaultOutputPath = value; }
+        }
+
+        #endregion
+
+        #region Dumping Speeds
+
+        public int PreferredDumpSpeedCD
+        {
+            get { return _uiOptions.Options.PreferredDumpSpeedCD; }
+            set { _uiOptions.Options.PreferredDumpSpeedCD = value; }
+        }
+
+        public int PreferredDumpSpeedDVD
+        {
+            get { return _uiOptions.Options.PreferredDumpSpeedDVD; }
+            set { _uiOptions.Options.PreferredDumpSpeedDVD = value; }
+        }
+
+        public int PreferredDumpSpeedBD
+        {
+            get { return _uiOptions.Options.PreferredDumpSpeedBD; }
+            set { _uiOptions.Options.PreferredDumpSpeedBD = value; }
+        }
+
+        #endregion
+
+        #region Extra Dumping Options
+
+        public bool QuietMode
+        {
+            get { return _uiOptions.Options.QuietMode; }
+            set { _uiOptions.Options.QuietMode = value; }
+        }
+
+        public bool ParanoidMode
+        {
+            get { return _uiOptions.Options.ParanoidMode; }
+            set { _uiOptions.Options.ParanoidMode = value; }
+        }
+
+        public bool ScanForProtection
+        {
+            get { return _uiOptions.Options.ScanForProtection; }
+            set { _uiOptions.Options.ScanForProtection = value; }
+        }
+
+        public string RereadAmountForC2
+        {
+            get { return Convert.ToString(_uiOptions.Options.RereadAmountForC2); }
+            set
+            {
+                if (Int32.TryParse(value, out int result))
+                    _uiOptions.Options.RereadAmountForC2 = result;
+            }
+        }
+
+        public bool AddPlaceholders
+        {
+            get { return _uiOptions.Options.AddPlaceholders; }
+            set { _uiOptions.Options.AddPlaceholders = value; }
+        }
+
+        public bool PromptForDiscInformation
+        {
+            get { return _uiOptions.Options.PromptForDiscInformation; }
+            set { _uiOptions.Options.PromptForDiscInformation = value; }
+        }
+
+        public bool IgnoreFixedDrives
+        {
+            get { return _uiOptions.Options.IgnoreFixedDrives; }
+            set { _uiOptions.Options.IgnoreFixedDrives = value; }
+        }
+
+        public bool ResetDriveAfterDump
+        {
+            get { return _uiOptions.Options.ResetDriveAfterDump; }
+            set { _uiOptions.Options.ResetDriveAfterDump = value; }
+        }
+
+        #endregion
+
+        #region Skip Options
+
+        public bool SkipMediaTypeDetection
+        {
+            get { return _uiOptions.Options.SkipMediaTypeDetection; }
+            set { _uiOptions.Options.SkipMediaTypeDetection = value; }
+        }
+
+        public bool SkipSystemDetection
+        {
+            get { return _uiOptions.Options.SkipSystemDetection; }
+            set { _uiOptions.Options.SkipSystemDetection = value; }
+        }
+
+        #endregion
+
+        #region Logging Options
+
+        public bool VerboseLogging
+        {
+            get { return _uiOptions.Options.VerboseLogging; }
+            set
+            {
+                _uiOptions.Options.VerboseLogging = value;
+                _uiOptions.Save(); // TODO: Why does this save here?
+            }
+        }
+
+        public bool OpenLogWindowAtStartup
+        {
+            get { return _uiOptions.Options.OpenLogWindowAtStartup; }
+            set
+            {
+                _uiOptions.Options.OpenLogWindowAtStartup = value;
+                _uiOptions.Save(); // TODO: Why does this save here?
+            }
+        }
+
+        #endregion
+
+        #region Redump Login Information
+
+        public string Username
+        {
+            get { return _uiOptions.Options.Username; }
+            set { _uiOptions.Options.Username = value; }
+        }
+
+        public string Password
+        {
+            get { return _uiOptions.Options.Password; }
+            set { _uiOptions.Options.Password = value; }
+        }
+
+        #endregion
+
+        public OptionsViewModel(UIOptions uiOptions)
+        {
+            this._uiOptions = uiOptions;
+        }
+    }
+
+    public class LoggerViewModel
+    {
+        private LogWindow _logWindow;
+
+        public void SetWindow(LogWindow logWindow) => _logWindow = logWindow;
+
+        public bool WindowVisible
+        {
+            get => _logWindow != null ? _logWindow.IsVisible : false;
+            set
+            {
+                if (_logWindow == null)
+                    _logWindow = new LogWindow();
+
+                if (value)
+                {
+                    _logWindow.AdjustPositionToMainWindow();
+                    _logWindow.Show();
+                }
+                else
+                    _logWindow.Hide();
+            }
+        }
+
+        public void VerboseLog(string text)
+        {
+            if (ViewModels.OptionsViewModel.VerboseLogging)
+                _logWindow.AppendToTextBox(text, Brushes.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.Avalonia/nuget.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 
+  To use the Avalonia CI feed to get unstable packages, move this file to the root of your solution.
+-->
+
+<configuration>
+  <packageSources>
+    <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
+  </packageSources>
+</configuration>

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,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <Prefer32Bit>true</Prefer32Bit>
+    <Title>DICUI Check</Title>
+    <AssemblyName>DICUI.Check</AssemblyName>
+    <Description>Validator for various dumping programs</Description>
+    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
+    <Copyright>Copyright (c)2019-2020</Copyright>
+    <RepositoryUrl>https://github.com/SabreTools/DICUI</RepositoryUrl>
+    <Version>1.18</Version>
+    <AssemblyVersion>1.18</AssemblyVersion>
+    <FileVersion>1.18</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
+  </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,266 @@
+using System;
+using System.IO;
+using BurnOutSharp;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Check
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Help options
+            if (args.Length == 0 || args[0] == "-h" || args[0] == "-?")
+            {
+                DisplayHelp();
+                return;
+            }
+
+            // List options
+            if (args[0] == "-lm" || args[0] == "--listmedia")
+            {
+                ListMediaTypes();
+                Console.ReadLine();
+                return;
+            }
+            else if (args[0] == "-lp" || args[0] == "--listprograms")
+            {
+                ListPrograms();
+                Console.ReadLine();
+                return;
+            }
+            else if (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.ToMediaType(args[0].Trim('"'));
+            if (mediaType == MediaType.NONE)
+            {
+                DisplayHelp($"{args[0]} is not a recognized media type");
+                return;
+            }
+
+            // Check the KnownSystem
+            var knownSystem = Converters.ToKnownSystem(args[1].Trim('"'));
+            if (knownSystem == KnownSystem.NONE)
+            {
+                DisplayHelp($"{args[1]} is not a recognized system");
+                return;
+            }
+
+            // Default values
+            string username = null, password = null;
+            string internalProgram = "DiscImageCreator";
+            string path = string.Empty;
+            bool scan = false;
+
+            // Loop through and process options
+            int startIndex = 2;
+            for (; startIndex < args.Length; startIndex++)
+            {
+                // Redump login
+                if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
+                {
+                    string[] credentials = args[startIndex].Split('=')[1].Split(';');
+                    username = credentials[0];
+                    password = credentials[1];
+                }
+                else if (args[startIndex] == "-c" || args[startIndex] == "--credentials")
+                {
+                    username = args[startIndex + 1];
+                    password = args[startIndex + 2];
+                    startIndex += 2;
+                }
+
+                // Use specific program
+                else if (args[startIndex].StartsWith("-u=") || args[startIndex].StartsWith("--use="))
+                {
+                    internalProgram = args[startIndex].Split('=')[1];
+                }
+                else if (args[startIndex] == "-u" || args[startIndex] == "--use")
+                {
+                    internalProgram = args[startIndex + 1];
+                    startIndex++;
+                }
+
+                // Use a device path for physical checks
+                else if (args[startIndex].StartsWith("-p=") || args[startIndex].StartsWith("--path="))
+                {
+                    path = args[startIndex].Split('=')[1];
+                }
+                else if (args[startIndex] == "-p" || args[startIndex] == "--path")
+                {
+                    path = args[startIndex + 1];
+                    startIndex++;
+                }
+
+                // Scan for protection (requires device path)
+                else if (args[startIndex].StartsWith("-s") || args[startIndex].StartsWith("--scan"))
+                {
+                    scan = true;
+                }
+
+                // Default, we fall out
+                else
+                {
+                    break;
+                }
+            }
+
+            // Make new Progress objects
+            var resultProgress = new Progress<Result>();
+            resultProgress.ProgressChanged += ProgressUpdated;
+            var protectionProgress = new Progress<FileProtection>();
+            protectionProgress.ProgressChanged += ProgressUpdated;
+
+            // If credentials are invalid, alert the user
+            if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
+            {
+                using (RedumpWebClient wc = new RedumpWebClient())
+                {
+                    if (wc.Login(username, password))
+                        Console.WriteLine("Redump username and password accepted!");
+                    else
+                        Console.WriteLine("Redump username and password denied!");
+                }
+            }
+
+            // Loop through all the rest of the args
+            for (int i = startIndex; i < args.Length; i++)
+            {
+                // Check for a file
+                if (!File.Exists(args[i].Trim('"')))
+                {
+                    DisplayHelp($"{args[i].Trim('"')} does not exist");
+                    return;
+                }
+
+                // Get the full file path
+                string filepath = Path.GetFullPath(args[i].Trim('"'));
+
+                // Now populate an environment
+                // TODO: Replace this with Dictionary constructor
+                var options = new Options
+                {
+                    InternalProgram = internalProgram,
+                    ScanForProtection = scan && !string.IsNullOrWhiteSpace(path),
+                    PromptForDiscInformation = false,
+
+                    Username = username,
+                    Password = password,
+                };
+
+                Drive drive = null;
+                if (!string.IsNullOrWhiteSpace(path))
+                    drive = new Drive(null, new DriveInfo(path));
+
+                var env = new DumpEnvironment(options, "", filepath, drive, knownSystem, mediaType, null);
+                env.FixOutputPaths();
+
+                // Finally, attempt to do the output dance
+                var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress).ConfigureAwait(false).GetAwaiter().GetResult();
+                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> [options] </path/to/output.bin> ...");
+            Console.WriteLine();
+            Console.WriteLine("Standalone Options:");
+            Console.WriteLine("-h, -?                  Show this help text");
+            Console.WriteLine("-lm, --listmedia        List supported media types");
+            Console.WriteLine("-ls, --listsystems      List supported system types");
+            Console.WriteLine("-lp, --listprograms     List supported dumping program outputs");
+            Console.WriteLine();
+            Console.WriteLine("Check Options:");
+            Console.WriteLine("-c, --credentials <user> <pw>  Redump username and password");
+            Console.WriteLine("-u, --use <program>            Dumping program output type");
+            Console.WriteLine("-p, --path <drivepath>         Physical drive path for additional checks");
+            Console.WriteLine("-s, --scan                     Enable copy protection scan (requires --path)");
+            Console.WriteLine();
+        }
+
+        /// <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 programs with their short usable names
+        /// </summary>
+        private static void ListPrograms()
+        {
+            Console.WriteLine("Supported Programs:");
+            foreach (var val in Enum.GetValues(typeof(InternalProgram)))
+            {
+                if (((InternalProgram)val) == InternalProgram.NONE)
+                    continue;
+
+                Console.WriteLine($"{((InternalProgram?)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);
+        }
+
+        /// <summary>
+        /// Simple process counter to write to console
+        /// </summary>
+        private static void ProgressUpdated(object sender, FileProtection value)
+        {
+            Console.WriteLine($"{value.Percentage * 100:N2}%: {value.Filename} - {value.Protection}");
+        }
+    }
+}

DICUI.Check/launchSettings.json

@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "DICUI.Check": {
+      "commandName": "Project"
+    }
+  }
+}

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,116 +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="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/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/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Forms")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[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")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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")]

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,107 +0,0 @@
-using System;
-using System.Windows.Media;
-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,530 +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.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.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            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.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";
-            this.MenuBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-                fileToolStripMenuItem, toolsToolStripMenuItem, helpToolStripMenuItem});
-            // 
-            // 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, 144F));
-            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(295, 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(415, 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(295, 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(411, 84);
-            this.OutputDirectoryBrowseButton.Name = "OutputDirectoryBrowseButton";
-            this.OutputDirectoryBrowseButton.Size = new System.Drawing.Size(139, 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(295, 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(411, 193);
-            this.EnableParametersCheckBox.Name = "EnableParametersCheckBox";
-            this.EnableParametersCheckBox.Size = new System.Drawing.Size(139, 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;
-            // 
-            // 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";
-            // 
-            // 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,723 +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();
-                MediaTypeComboBox.DataSource = _mediaTypes;
-
-                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 MediaType?
-            };
-
-            // 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/Aaru/Constants.cs

@@ -0,0 +1,475 @@
+namespace DICUI.Aaru
+{
+    /// <summary>
+    /// Top-level commands for Aaru
+    /// </summary>
+    public static class CommandStrings
+    {
+        // Database Family
+        public const string DatabasePrefixShort = "db";
+        public const string DatabasePrefixLong = "database";
+        public const string DatabaseStats = "stats";
+        public const string DatabaseUpdate = "update";
+
+        // Device Family
+        public const string DevicePrefixShort = "dev";
+        public const string DevicePrefixLong = "device";
+        public const string DeviceInfo = "info";
+        public const string DeviceList = "list";
+        public const string DeviceReport = "report";
+
+        // Filesystem Family
+        public const string FilesystemPrefixShort = "fi";
+        public const string FilesystemPrefixShortAlt = "fs";
+        public const string FilesystemPrefixLong = "filesystem";
+        public const string FilesystemExtract = "extract";
+        public const string FilesystemListShort = "ls";
+        public const string FilesystemListLong = "list";
+        public const string FilesystemOptions = "options";
+
+        // Image Family
+        public const string ImagePrefixShort = "i";
+        public const string ImagePrefixLong = "image";
+        public const string ImageAnalyze = "analyze";
+        public const string ImageChecksumShort = "chk";
+        public const string ImageChecksumLong = "checksum";
+        public const string ImageCompareShort = "cmp";
+        public const string ImageCompareLong = "compare";
+        public const string ImageConvert = "convert";
+        public const string ImageCreateSidecar = "create-sidecar";
+        public const string ImageDecode = "decode";
+        public const string ImageEntropy = "entropy";
+        public const string ImageInfo = "info";
+        public const string ImageOptions = "options";
+        public const string ImagePrint = "print";
+        public const string ImageVerify = "verify";
+
+        // Media Family
+        public const string MediaPrefixShort = "m";
+        public const string MediaPrefixLong = "media";
+        public const string MediaDump = "dump";
+        public const string MediaInfo = "info";
+        public const string MediaScan = "scan";
+
+        // Standalone Commands
+        public const string Configure = "configure";
+        public const string Formats = "formats";
+        public const string ListEncodings = "list-encodings";
+        public const string ListNamespaces = "list-namespaces";
+        public const string Remote = "remote";
+    }
+
+    /// <summary>
+    /// Supported encodings for Aaru
+    /// </summary>
+    /// TODO: Use to verify encoding settings
+    public static class EncodingStrings
+    {
+        public const string ArabicMac = "x-mac-arabic";
+        public const string AtariASCII = "atascii";
+        public const string CentralEuropeanMac = "x-mac-ce";
+        public const string CommodorePETSCII = "petscii";
+        public const string CroatianMac = "x-mac-croatian";
+        public const string CyrillicMac = "x-mac-cryillic";
+        public const string FarsiMac = "x-mac-farsi";
+        public const string GreekMac = "x-mac-greek";
+        public const string HebrewMac = "x-mac-hebrew";
+        public const string RomanianMac = "x-mac-romanian";
+        public const string SinclairZXSpectrum = "spectrum";
+        public const string SinclairZX80 = "zx80";
+        public const string SinclairZX81 = "zx81";
+        public const string TurkishMac = "x-mac-turkish";
+        public const string UkrainianMac = "x-mac-ukrainian";
+        public const string Unicode = "utf-16";
+        public const string UnicodeBigEndian = "utf-16BE";
+        public const string UnicodeUTF32BigEndian = "utf-32BE";
+        public const string UnicodeUTF32 = "utf-32";
+        public const string UnicodeUTF7 = "utf-7";
+        public const string UnicodeUTF8 = "utf-8";
+        public const string USASCII = "us-ascii";
+        public const string WesternEuropeanAppleII = "apple2";
+        public const string WesternEuropeanAppleIIc = "apple2c";
+        public const string WesternEuropeanAppleIIe = "apple2e";
+        public const string WesternEuropeanAppleIIgs = "apple2gs";
+        public const string WesternEuropeanAppleLisa = "lisa";
+        public const string WesternEuropeanAtariST = "atarist";
+        public const string WesternEuropeanGEM = "gem";
+        public const string WesternEuropeanGEOS = "geos";
+        public const string WesternEuropeanISO = "iso-8859-1";
+        public const string WesternEuropeanMac = "macintosh";
+        public const string WesternEuropeanRadix50 = "radix50";
+    }
+
+    /// <summary>
+    /// Dumping flags for Aaru
+    /// </summary>
+    public static class FlagStrings
+    {
+        // Boolean flags
+        public const string Adler32Short = "-a";
+        public const string Adler32Long = "--adler32";
+        public const string ClearLong = "--clear";
+        public const string ClearAllLong = "--clear-all";
+        public const string CRC16Long = "--crc16";
+        public const string CRC32Short = "-c";
+        public const string CRC32Long = "--crc32";
+        public const string CRC64Long = "--crc64";
+        public const string DebugShort = "-d";
+        public const string DebugLong = "--debug";
+        public const string DiskTagsShort = "-f";
+        public const string DiskTagsLong = "--disk-tags";
+        public const string DuplicatedSectorsShort = "-p";
+        public const string DuplicatedSectorsLong = "--duplicated-sectors";
+        public const string EjectLong = "--eject";
+        public const string ExtendedAttributesShort = "-x";
+        public const string ExtendedAttributesLong = "--xattrs";
+        public const string FilesystemsShort = "-f";
+        public const string FilesystemsLong = "--filesystems";
+        public const string FirstPregapLong = "--first-pregap";
+        public const string FixOffsetLong = "--fix-offset";
+        public const string FixSubchannelLong = "--fix-subchannel";
+        public const string FixSubchannelCrcLong = "--fix-subchannel-crc";
+        public const string FixSubchannelPositionLong = "--fix-subchannel-position";
+        public const string Fletcher16Long = "--fletcher16";
+        public const string Fletcher32Long = "--fletcher32";
+        public const string ForceShort = "-f";
+        public const string ForceLong = "--force";
+        public const string GenerateSubchannelsLong = "--generate-subchannels";
+        public const string HelpShort = "-h";
+        public const string HelpShortAlt = "-?";
+        public const string HelpLong = "--help";
+        public const string LongFormatShort = "-l";
+        public const string LongFormatLong = "--long-format";
+        public const string LongSectorsShort = "-r";
+        public const string LongSectorsLong = "--long-sectors";
+        public const string MD5Short = "-m";
+        public const string MD5Long = "--md5";
+        public const string MetadataLong = "--metadata";
+        public const string PartitionsShort = "-p";
+        public const string PartitionsLong = "--partitions";
+        public const string PersistentLong = "--persistent";
+        public const string PrivateLong = "--private";
+        public const string ResumeShort = "-r";
+        public const string ResumeLong = "--resume";
+        public const string RetrySubchannelLong = "--retry-subchannel";
+        public const string SectorTagsShort = "-p";
+        public const string SectorTagsLong = "--sector-tags";
+        public const string SeparatedTracksShort = "-t";
+        public const string SeparatedTracksLong = "--separated-tracks";
+        public const string SHA1Short = "-s";
+        public const string SHA1Long = "--sha1";
+        public const string SHA256Long = "--sha256";
+        public const string SHA384Long = "--sha384";
+        public const string SHA512Long = "--sha512";
+        public const string SkipCdiReadyHoleLong = "--skip-cdiready-hole";
+        public const string SpamSumShort = "-f";
+        public const string SpamSumLong = "--spamsum";
+        public const string StopOnErrorShort = "-s";
+        public const string StopOnErrorLong = "--stop-on-error";
+        public const string TapeShort = "-t";
+        public const string TapeLong = "--tape";
+        public const string TrimLong = "--trim";
+        public const string VerboseShort = "-v";
+        public const string VerboseLong = "--verbose";
+        public const string VerifyDiscShort = "-w";
+        public const string VerifyDiscLong = "--verify-disc";
+        public const string VerifySectorsShort = "-s";
+        public const string VerifySectorsLong = "--verify-sectors";
+        public const string VersionLong = "--version";
+        public const string WholeDiscShort = "-w";
+        public const string WholeDiscLong = "--whole-disc";
+
+        // Int8 flags
+        public const string SpeedLong = "--speed";
+
+        // Int16 flags
+        public const string RetryPassesShort = "-p";
+        public const string RetryPassesLong = "--retry-passes";
+        public const string WidthShort = "-w";
+        public const string WidthLong = "--width";
+
+        // Int32 flags
+        public const string BlockSizeShort = "-b";
+        public const string BlockSizeLong = "--block-size";
+        public const string CountShort = "-c";
+        public const string CountLong = "--count";
+        public const string MediaLastSequenceLong = "--media-lastsequence";
+        public const string MediaSequenceLong = "--media-sequence";
+        public const string SkipShort = "-k";
+        public const string SkipLong = "--skip";
+
+        // Int64 flags
+        public const string LengthShort = "-l"; // or "all"
+        public const string LengthLong = "--length"; // or "all"
+        public const string StartShort = "-s";
+        public const string StartLong = "--start";
+
+        // String flags
+        public const string CommentsLong = "--comments";
+        public const string CreatorLong = "--creator";
+        public const string DriveManufacturerLong = "--drive-manufacturer";
+        public const string DriveModelLong = "--drive-model";
+        public const string DriveRevisionLong = "--drive-revision";
+        public const string DriveSerialLong = "--drive-serial";
+        public const string EncodingShort = "-e";
+        public const string EncodingLong = "--encoding";
+        public const string FormatConvertShort = "-p";
+        public const string FormatConvertLong = "--format";
+        public const string FormatDumpShort = "-t";
+        public const string FormatDumpLong = "--format";
+        public const string ImgBurnLogShort = "-b";
+        public const string ImgBurnLogLong = "--ibg-log";
+        public const string MediaBarcodeLong = "--media-barcode";
+        public const string MediaManufacturerLong = "--media-manufacturer";
+        public const string MediaModelLong = "--media-model";
+        public const string MediaPartNumberLong = "--media-partnumber";
+        public const string MediaSerialLong = "--media-serial";
+        public const string MediaTitleLong = "--media-title";
+        public const string MHDDLogShort = "-m";
+        public const string MHDDLogLong = "--mhdd-log";
+        public const string NamespaceShort = "-n";
+        public const string NamespaceLong = "--namespace";
+        public const string OptionsShort = "-O";
+        public const string OptionsLong = "--options";
+        public const string OutputPrefixShort = "-w";
+        public const string OutputPrefixLong = "--output-prefix";
+        public const string ResumeFileShort = "-r";
+        public const string ResumeFileLong = "--resume-file";
+        public const string SubchannelLong = "--subchannel";
+        public const string XMLSidecarShort = "-x";
+        public const string XMLSidecarLong = "--cicm-xml";
+    }
+
+    /// <summary>
+    /// Supported formats for Aaru
+    /// </summary>
+    /// TODO: Use to verify format settings
+    public static class FormatStrings
+    {
+        // Supported filters
+        public const string AppleDouble = "AppleDouble";
+        public const string AppleSingle = "AppleSingle";
+        public const string BZip2 = "BZip2";
+        public const string GZip = "GZip";
+        public const string LZip = "LZip";
+        public const string MacBinary = "MacBinary";
+        public const string NoFilter = "No filter";
+        public const string PCExchange = "PCExchange";
+        public const string XZ = "XZ";
+
+        // Read-only media image formats
+        public const string AppleDiskArchivalRetrievalTool = "Apple Disk Archival/Retrieval Tool";
+        public const string AppleNewDiskImageFormat = "Apple New Disk Image Format";
+        public const string AppleNIB = "Apple NIB";
+        public const string BlindWrite4 = "BlindWrite 4";
+        public const string BlindWrite5 = "BlindWrite 5";
+        public const string CPCEMUDiskFileAndExtendedCPCDiskFile = "CPCEMU Disk-File and Extended CPC Disk-File";
+        public const string D2FDiskImage = "d2f disk image";
+        public const string D88DiskImage = "D88 Disk Image";
+        public const string DIMDiskImage = "DIM Disk Image";
+        public const string DiscFerret = "DiscFerret";
+        public const string DiscJuggler = "DiscJuggler";
+        public const string DreamcastGDIImage = "Dreamcast GDI image";
+        public const string DunfieldsIMD = "Dunfield's IMD";
+        public const string HDCopyDiskImage = "HD-Copy disk image";
+        public const string KryoFluxSTREAM = "KryoFlux STREAM";
+        public const string MAMECompressedHunksOfData = "MAME Compressed Hunks of Data";
+        public const string MicrosoftVHDX = "Microsoft VHDX";
+        public const string NeroBurningROMImage = "Nero Burning ROM image";
+        public const string PartCloneDiskImage = "PartClone disk image";
+        public const string PartimageDiskImage = "Partimage disk image";
+        public const string SpectrumFloppyDiskImage = "Spectrum Floppy Disk Image";
+        public const string SuperCardPro = "SuperCardPro";
+        public const string SydexCopyQM = "Sydex CopyQM";
+        public const string SydexTeleDisk = "Sydex TeleDisk";
+
+        // Read/write media image formats
+        public const string AaruFormat = "Aaru Format";
+        public const string ACTApricotDiskImage = "ACT Apricot Disk Image";
+        public const string Alcohol120MediaDescriptorStructure = "Alcohol 120% Media Descriptor Structure";
+        public const string Anex86DiskImage = "Anex86 Disk Image";
+        public const string Apple2InterleavedDiskImage = "Apple ][Interleaved Disk Image";
+        public const string Apple2IMG = "Apple 2IMG";
+        public const string AppleDiskCopy42 = "Apple DiskCopy 4.2";
+        public const string AppleUniversalDiskImageFormat = "Apple Universal Disk Image Format";
+        public const string BasicLisaUtility = "Basic Lisa Utility";
+        public const string CDRDAOTocfile = "CDRDAO tocfile";
+        public const string CDRWinCuesheet = "CDRWin cuesheet";
+        public const string CisCopyDiskImageDCFile = "CisCopy Disk Image(DC-File)";
+        public const string CloneCD = "CloneCD";
+        public const string CopyTape = "CopyTape";
+        public const string DigitalResearchDiskCopy = "Digital Research DiskCopy";
+        public const string IBMSaveDskF = "IBM SaveDskF";
+        public const string MAXIDiskImage = "MAXI Disk image";
+        public const string ParallelsDiskImage = "Parallels disk image";
+        public const string QEMUCopyOnWriteDiskImage = "QEMU Copy-On-Write disk image";
+        public const string QEMUCopyOnWriteDiskImageV2 = "QEMU Copy-On-Write disk image v2";
+        public const string QEMUEnhancedDiskImage = "QEMU Enhanced Disk image";
+        public const string RawDiskImage = "Raw Disk Image";
+        public const string RayAracheliansDiskIMage = "Ray Arachelian's Disk IMage";
+        public const string RSIDEHardDiskImage = "RS-IDE Hard Disk Image";
+        public const string T98HardDiskImage = "T98 Hard Disk Image";
+        public const string T98NextNHDr0DiskImage = "T98-Next NHD r0 Disk Image";
+        public const string Virtual98DiskImage = "Virtual98 Disk Image";
+        public const string VirtualBoxDiskImage = "VirtualBox Disk Image";
+        public const string VirtualPC = "VirtualPC";
+        public const string VMwareDiskImage = "VMware disk image";
+
+        // Supported filesystems for identification and information only
+        public const string AcornAdvancedDiscFilingSystem = "Acorn Advanced Disc Filing System";
+        public const string AlexanderOsipovDOSFileSystem = "Alexander Osipov DOS file system";
+        public const string AmigaDOSFilesystem = "Amiga DOS filesystem";
+        public const string AppleFileSystem = "Apple File System";
+        public const string AppleHFSPlusFilesystem = "Apple HFS+ filesystem";
+        public const string AppleHierarchicalFileSystem = "Apple Hierarchical File System";
+        public const string AppleProDOSFilesystem = "Apple ProDOS filesystem";
+        public const string AtheOSFilesystem = "AtheOS Filesystem";
+        public const string BeFilesystem = "Be Filesystem";
+        public const string BSDFastFileSystem = "BSD Fast File System(aka UNIX File System, UFS)";
+        public const string BTreeFileSystem = "B-tree file system";
+        public const string CommodoreFileSystem = "Commodore file system";
+        public const string CramFilesystem = "Cram filesystem";
+        public const string DumpEightPlugin = "dump(8) Plugin";
+        public const string ECMA67 = "ECMA-67";
+        public const string ExtentFileSystemPlugin = "Extent File System Plugin";
+        public const string F2FSPlugin = "F2FS Plugin";
+        public const string Files11OnDiskStructure = "Files-11 On-Disk Structure";
+        public const string FossilFilesystemPlugin = "Fossil Filesystem Plugin";
+        public const string HAMMERFilesystem = "HAMMER Filesystem";
+        public const string HighPerformanceOpticalFileSystem = "High Performance Optical File System";
+        public const string HPLogicalInterchangeFormatPlugin = "HP Logical Interchange Format Plugin";
+        public const string JFSPlugin = "JFS Plugin";
+        public const string LinuxExtendedFilesystem = "Linux extended Filesystem";
+        public const string LinuxExtendedFilesystem234 = "Linux extended Filesystem 2, 3 and 4";
+        public const string LocusFilesystemPlugin = "Locus Filesystem Plugin";
+        public const string MicroDOSFileSystem = "MicroDOS file system";
+        public const string MicrosoftExtendedFileAllocationTable = "Microsoft Extended File Allocation Table";
+        public const string MinixFilesystem = "Minix Filesystem";
+        public const string NewTechnologyFileSystem = "New Technology File System(NTFS)";
+        public const string NILFS2Plugin = "NILFS2 Plugin";
+        public const string NintendoOpticalFilesystems = "Nintendo optical filesystems";
+        public const string OS2HighPerformanceFileSystem = "OS/2 High Performance File System";
+        public const string OS9RandomBlockFilePlugin = "OS-9 Random Block File Plugin";
+        public const string PCEngineCDPlugin = "PC Engine CD Plugin";
+        public const string PCFXPlugin = "PC-FX Plugin";
+        public const string ProfessionalFileSystem = "Professional File System";
+        public const string QNX4Plugin = "QNX4 Plugin";
+        public const string QNX6Plugin = "QNX6 Plugin";
+        public const string ReiserFilesystemPlugin = "Reiser Filesystem Plugin";
+        public const string Reiser4FilesystemPlugin = "Reiser4 Filesystem Plugin";
+        public const string ResilientFileSystemPlugin = "Resilient File System plugin";
+        public const string RT11FileSystem = "RT-11 file system";
+        public const string SmartFileSystem = "SmartFileSystem";
+        public const string SolarOSFilesystem = "Solar_OS filesystem";
+        public const string SquashFilesystem = "Squash filesystem";
+        public const string UNICOSFilesystemPlugin = "UNICOS Filesystem Plugin";
+        public const string UniversalDiskFormat = "Universal Disk Format";
+        public const string UNIXBootFilesystem = "UNIX Boot filesystem";
+        public const string UNIXSystemVFilesystem = "UNIX System V filesystem";
+        public const string VeritasFilesystem = "Veritas filesystem";
+        public const string VMwareFilesystem = "VMware filesystem";
+        public const string XFSFilesystemPlugin = "XFS Filesystem Plugin";
+        public const string XiaFilesystem = "Xia filesystem";
+        public const string ZFSFilesystemPlugin = "ZFS Filesystem Plugin";
+
+        // Supported filesystems that can read their contents
+        public const string AppleDOSFileSystem = "Apple DOS File System";
+        public const string AppleLisaFileSystem = "Apple Lisa File System";
+        public const string AppleMacintoshFileSystem = "Apple Macintosh File System";
+        public const string CPMFileSystem = "CP/M File System";
+        public const string FATXFilesystemPlugin = "FATX Filesystem Plugin";
+        public const string ISO9660Filesystem = "ISO9660 Filesystem";
+        public const string MicrosoftFileAllocationTable = "Microsoft File Allocation Table";
+        public const string OperaFilesystemPlugin = "Opera Filesystem Plugin";
+        public const string UCSDPascalFilesystem = "U.C.S.D.Pascal filesystem";
+
+        // Supported partitioning schemes
+        public const string AcornFileCorePartitions = "Acorn FileCore partitions";
+        public const string ACTApricotPartitions = "ACT Apricot partitions";
+        public const string AmigaRigidDiskBlock = "Amiga Rigid Disk Block";
+        public const string ApplePartitionMap = "Apple Partition Map";
+        public const string AtariPartitions = "Atari partitions";
+        public const string BSDDisklabel = "BSD disklabel";
+        public const string DECDisklabel = "DEC disklabel";
+        public const string DragonFlyBSD64bitDisklabel = "DragonFly BSD 64-bit disklabel";
+        public const string GUIDPartitionTable = "GUID Partition Table";
+        public const string Human68kPartitions = "Human 68k partitions";
+        public const string MasterBootRecord = "Master Boot Record";
+        public const string NECPC9800PartitionTable = "NEC PC-9800 partition table";
+        public const string NeXTDisklabel = "NeXT Disklabel";
+        public const string Plan9PartitionTable = "Plan9 partition table";
+        public const string RioKarmaPartitioning = "Rio Karma partitioning";
+        public const string SGIDiskVolumeHeader = "SGI Disk Volume Header";
+        public const string SunDisklabel = "Sun Disklabel";
+        public const string UNIXHardwired = "UNIX hardwired";
+        public const string UNIXVTOC = "UNIX VTOC";
+        public const string XboxPartitioning = "Xbox partitioning";
+        public const string XENIX = "XENIX";
+    }
+
+    /// <summary>
+    /// Supported namespaces for Aaru
+    /// </summary>
+    /// TODO: Use to verify namespace settings
+    public static class NamespaceStrings
+    {
+        // Namespaces for Apple Lisa File System
+        public const string LisaOfficeSystem = "office";
+        public const string LisaPascalWorkshop = "workshop"; // Default
+
+        // Namespaces for ISO9660 Filesystem
+        public const string JolietVolumeDescriptor = "joliet"; // Default
+        public const string PrimaryVolumeDescriptor = "normal";
+        public const string PrimaryVolumeDescriptorwithEncoding = "romeo";
+        public const string RockRidge = "rrip";
+        public const string PrimaryVolumeDescriptorVersionSuffix = "vms";
+
+        // Namespaces for Microsoft File Allocation Table
+        public const string DOS83UpperCase = "dos";
+        public const string LFNWhenAvailableWithFallback = "ecs"; // Default
+        public const string LongFileNames = "lfn";
+        public const string WindowsNT83MixedCase = "nt";
+        public const string OS2Extended = "os2";
+    }
+
+    /// <summary>
+    /// Supported options for Aaru
+    /// </summary>
+    /// TODO: Use to verify option settings
+    public static class OptionStrings
+    {
+        // Aaru format
+        public const string AaruCompress = "compress"; // boolean, default true;
+        public const string AaruDeduplicate = "deduplicate"; // boolean, default true
+        public const string AaruDictionary = "dictionary"; // number, default 33554432
+        public const string AaruMaxDDTSize = "max_ddt_size"; // number, default 256
+        public const string AaruMD5 = "md5"; // boolean, default false
+        public const string AaruSectorsPerBlock = "sectors_per_block"; // number, default 4096 [power of 2]
+        public const string AaruSHA1 = "sha1"; // boolean, default false
+        public const string AaruSHA256 = "sha256"; // boolean, default false
+        public const string AaruSpamSum = "spamsum"; // boolean, default false
+
+        // ACT Apricot Disk Image
+        public const string ACTApricotDiskImageCompress = "compress"; // boolean, default false
+
+        // Apple DiskCopy 4.2
+        public const string AppleDiskCopyMacOSX = "macosx"; // boolean, default false
+
+        // CDRDAO tocfile
+        public const string CDRDAOTocfileSeparate = "separate"; // boolean, default false
+
+        // CDRWin cuesheet
+        public const string CDRWinCuesheetSeparate = "separate"; // boolean, default false
+
+        // ISO9660 Filesystem
+        public const string ISO9660FSUseEvd = "use_evd"; // boolean, default false
+        public const string ISO9660FSUsePathTable = "use_path_table"; // boolean, default false
+        public const string ISO9660FSUseTransTbl = "use_trans_tbl"; // boolean, default false
+
+        // VMware disk image
+        public const string VMwareDiskImageAdapterType = "adapter_type"; // string, default ide [ide, lsilogic, buslogic, legacyESX]
+        public const string VMwareDiskImageHWVersion = "hwversion"; // number, default 4
+        public const string VMwareDiskImageSparse = "sparse"; // boolean, default false
+        public const string VMwareDiskImageSplit = "split"; // boolean, default false
+    }
+}

DICUI.Library/Aaru/Converters.cs

@@ -0,0 +1,424 @@
+using DICUI.Data;
+
+namespace DICUI.Aaru
+{
+    public static class Converters
+    {
+        #region Cross-enumeration conversions
+
+        /// <summary>
+        /// Get the default extension for a given disc type
+        /// </summary>
+        /// <param name="type">MediaType value to check</param>
+        /// <returns>Valid extension (with leading '.'), null on error</returns>
+        public static string Extension(MediaType? type)
+        {
+            // Aaru has a single, unified output format by default
+            return ".aif";
+        }
+
+        #endregion
+
+        #region Convert to Long Name
+
+        /// <summary>
+        /// Get the string representation of the Command enum values
+        /// </summary>
+        /// <param name="command">Command value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Command command)
+        {
+            switch (command)
+            {
+                // Database Family
+                case Command.DatabaseStats:
+                    return $"{CommandStrings.DatabasePrefixLong} {CommandStrings.DatabaseStats}";
+                case Command.DatabaseUpdate:
+                    return $"{CommandStrings.DatabasePrefixLong} {CommandStrings.DatabaseUpdate}";
+
+                // Device Family
+                case Command.DeviceInfo:
+                    return $"{CommandStrings.DevicePrefixLong} {CommandStrings.DeviceInfo}";
+                case Command.DeviceList:
+                    return $"{CommandStrings.DevicePrefixLong} {CommandStrings.DeviceList}";
+                case Command.DeviceReport:
+                    return $"{CommandStrings.DevicePrefixLong} {CommandStrings.DeviceReport}";
+
+                // Filesystem Family
+                case Command.FilesystemExtract:
+                    return $"{CommandStrings.FilesystemPrefixLong} {CommandStrings.FilesystemExtract}";
+                case Command.FilesystemList:
+                    return $"{CommandStrings.FilesystemPrefixLong} {CommandStrings.FilesystemListLong}";
+                case Command.FilesystemOptions:
+                    return $"{CommandStrings.FilesystemPrefixLong} {CommandStrings.FilesystemOptions}";
+
+                // Image Family
+                case Command.ImageAnalyze:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageAnalyze}";
+                case Command.ImageChecksum:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageChecksumLong}";
+                case Command.ImageCompare:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageCompareLong}";
+                case Command.ImageConvert:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageConvert}";
+                case Command.ImageCreateSidecar:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageCreateSidecar}";
+                case Command.ImageDecode:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageDecode}";
+                case Command.ImageEntropy:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageEntropy}";
+                case Command.ImageInfo:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageInfo}";
+                case Command.ImageOptions:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageOptions}";
+                case Command.ImagePrint:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImagePrint}";
+                case Command.ImageVerify:
+                    return $"{CommandStrings.ImagePrefixLong} {CommandStrings.ImageVerify}";
+
+                // Media Family
+                case Command.MediaDump:
+                    return $"{CommandStrings.MediaPrefixLong} {CommandStrings.MediaDump}";
+                case Command.MediaInfo:
+                    return $"{CommandStrings.MediaPrefixLong} {CommandStrings.MediaInfo}";
+                case Command.MediaScan:
+                    return $"{CommandStrings.MediaPrefixLong} {CommandStrings.MediaScan}";
+
+                // Standalone Commands
+                case Command.Configure:
+                    return CommandStrings.Configure;
+                case Command.Formats:
+                    return CommandStrings.Formats;
+                case Command.ListEncodings:
+                    return CommandStrings.ListEncodings;
+                case Command.ListNamespaces:
+                    return CommandStrings.ListNamespaces;
+                case Command.Remote:
+                    return CommandStrings.Remote;
+
+                case Command.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        /// <summary>
+        /// Get the string representation of the Flag enum values
+        /// </summary>
+        /// <param name="command">Flag value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Flag flag)
+        {
+            switch (flag)
+            {
+                // Boolean flags
+                case Flag.Adler32:
+                    return FlagStrings.Adler32Long;
+                case Flag.Clear:
+                    return FlagStrings.ClearLong;
+                case Flag.ClearAll:
+                    return FlagStrings.ClearAllLong;
+                case Flag.CRC16:
+                    return FlagStrings.CRC16Long;
+                case Flag.CRC32:
+                    return FlagStrings.CRC32Long;
+                case Flag.CRC64:
+                    return FlagStrings.CRC64Long;
+                case Flag.Debug:
+                    return FlagStrings.DebugLong;
+                case Flag.DiskTags:
+                    return FlagStrings.DiskTagsLong;
+                case Flag.DuplicatedSectors:
+                    return FlagStrings.DuplicatedSectorsLong;
+                case Flag.Eject:
+                    return FlagStrings.EjectLong;
+                case Flag.ExtendedAttributes:
+                    return FlagStrings.ExtendedAttributesLong;
+                case Flag.Filesystems:
+                    return FlagStrings.FilesystemsLong;
+                case Flag.FirstPregap:
+                    return FlagStrings.FirstPregapLong;
+                case Flag.FixOffset:
+                    return FlagStrings.FixOffsetLong;
+                case Flag.FixSubchannel:
+                    return FlagStrings.FixSubchannelLong;
+                case Flag.FixSubchannelCrc:
+                    return FlagStrings.FixSubchannelCrcLong;
+                case Flag.FixSubchannelPosition:
+                    return FlagStrings.FixSubchannelPositionLong;
+                case Flag.Fletcher16:
+                    return FlagStrings.Fletcher16Long;
+                case Flag.Fletcher32:
+                    return FlagStrings.Fletcher32Long;
+                case Flag.Force:
+                    return FlagStrings.ForceLong;
+                case Flag.GenerateSubchannels:
+                    return FlagStrings.GenerateSubchannelsLong;
+                case Flag.Help:
+                    return FlagStrings.HelpLong;
+                case Flag.LongFormat:
+                    return FlagStrings.LongFormatLong;
+                case Flag.LongSectors:
+                    return FlagStrings.LongSectorsLong;
+                case Flag.MD5:
+                    return FlagStrings.MD5Long;
+                case Flag.Metadata:
+                    return FlagStrings.MetadataLong;
+                case Flag.Partitions:
+                    return FlagStrings.PartitionsLong;
+                case Flag.Persistent:
+                    return FlagStrings.PersistentLong;
+                case Flag.Private:
+                    return FlagStrings.PrivateLong;
+                case Flag.Resume:
+                    return FlagStrings.ResumeLong;
+                case Flag.RetrySubchannel:
+                    return FlagStrings.RetrySubchannelLong;
+                case Flag.SectorTags:
+                    return FlagStrings.SectorTagsLong;
+                case Flag.SeparatedTracks:
+                    return FlagStrings.SeparatedTracksLong;
+                case Flag.SHA1:
+                    return FlagStrings.SHA1Long;
+                case Flag.SHA256:
+                    return FlagStrings.SHA256Long;
+                case Flag.SHA384:
+                    return FlagStrings.SHA384Long;
+                case Flag.SHA512:
+                    return FlagStrings.SHA512Long;
+                case Flag.SkipCdiReadyHole:
+                    return FlagStrings.SkipCdiReadyHoleLong;
+                case Flag.SpamSum:
+                    return FlagStrings.SpamSumLong;
+                case Flag.StopOnError:
+                    return FlagStrings.StopOnErrorLong;
+                case Flag.Tape:
+                    return FlagStrings.TapeLong;
+                case Flag.Trim:
+                    return FlagStrings.TrimLong;
+                case Flag.Verbose:
+                    return FlagStrings.VerboseLong;
+                case Flag.VerifyDisc:
+                    return FlagStrings.VerifyDiscLong;
+                case Flag.VerifySectors:
+                    return FlagStrings.VerifySectorsLong;
+                case Flag.Version:
+                    return FlagStrings.VersionLong;
+                case Flag.WholeDisc:
+                    return FlagStrings.WholeDiscLong;
+
+                // Int8 flags
+                case Flag.Speed:
+                    return FlagStrings.SpeedLong;
+
+                // Int16 flags
+                case Flag.RetryPasses:
+                    return FlagStrings.RetryPassesLong;
+                case Flag.Width:
+                    return FlagStrings.WidthLong;
+
+                // Int32 flags
+                case Flag.BlockSize:
+                    return FlagStrings.BlockSizeLong;
+                case Flag.Count:
+                    return FlagStrings.CountLong;
+                case Flag.MediaLastSequence:
+                    return FlagStrings.MediaLastSequenceLong;
+                case Flag.MediaSequence:
+                    return FlagStrings.MediaSequenceLong;
+                case Flag.Skip:
+                    return FlagStrings.SkipLong;
+
+                // Int64 flags
+                case Flag.Length:
+                    return FlagStrings.LengthLong;
+                case Flag.Start:
+                    return FlagStrings.StartLong;
+
+                // String flags
+                case Flag.Comments:
+                    return FlagStrings.CommentsLong;
+                case Flag.Creator:
+                    return FlagStrings.CreatorLong;
+                case Flag.DriveManufacturer:
+                    return FlagStrings.DriveManufacturerLong;
+                case Flag.DriveModel:
+                    return FlagStrings.DriveModelLong;
+                case Flag.DriveRevision:
+                    return FlagStrings.DriveRevisionLong;
+                case Flag.DriveSerial:
+                    return FlagStrings.DriveSerialLong;
+                case Flag.Encoding:
+                    return FlagStrings.EncodingLong;
+                case Flag.FormatConvert:
+                    return FlagStrings.FormatConvertLong;
+                case Flag.FormatDump:
+                    return FlagStrings.FormatDumpLong;
+                case Flag.ImgBurnLog:
+                    return FlagStrings.ImgBurnLogLong;
+                case Flag.MediaBarcode:
+                    return FlagStrings.MediaBarcodeLong;
+                case Flag.MediaManufacturer:
+                    return FlagStrings.MediaManufacturerLong;
+                case Flag.MediaModel:
+                    return FlagStrings.MediaModelLong;
+                case Flag.MediaPartNumber:
+                    return FlagStrings.MediaPartNumberLong;
+                case Flag.MediaSerial:
+                    return FlagStrings.MediaSerialLong;
+                case Flag.MediaTitle:
+                    return FlagStrings.MediaTitleLong;
+                case Flag.MHDDLog:
+                    return FlagStrings.MHDDLogLong;
+                case Flag.Namespace:
+                    return FlagStrings.NamespaceLong;
+                case Flag.Options:
+                    return FlagStrings.OptionsLong;
+                case Flag.OutputPrefix:
+                    return FlagStrings.OutputPrefixLong;
+                case Flag.ResumeFile:
+                    return FlagStrings.ResumeFileLong;
+                case Flag.Subchannel:
+                    return FlagStrings.SubchannelLong;
+                case Flag.XMLSidecar:
+                    return FlagStrings.XMLSidecarLong;
+
+                case Flag.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        #endregion
+
+        #region Convert From String
+
+        /// <summary>
+        /// Get the Command enum value for a given string
+        /// </summary>
+        /// <param name="commandOne">First part of String value to convert</param>
+        /// <param name="commandTwo">Second part of String value to convert</param>
+        /// <param name="useSecond">Output bool if the second command was used</param>
+        /// <returns>Command represented by the string(s), if possible</returns>
+        public static Command StringToCommand(string commandOne, string commandTwo, out bool useSecond)
+        {
+            useSecond = false;
+            switch (commandOne)
+            {
+                // Database Family
+                case CommandStrings.DatabasePrefixShort:
+                case CommandStrings.DatabasePrefixLong:
+                    useSecond = true;
+                    switch (commandTwo)
+                    {
+                        case CommandStrings.DatabaseStats:
+                            return Command.DatabaseStats;
+                        case CommandStrings.DatabaseUpdate:
+                            return Command.DatabaseUpdate;
+                    }
+
+                    break;
+
+                // Device Family
+                case CommandStrings.DevicePrefixShort:
+                case CommandStrings.DevicePrefixLong:
+                    useSecond = true;
+                    switch (commandTwo)
+                    {
+                        case CommandStrings.DeviceInfo:
+                            return Command.DeviceInfo;
+                        case CommandStrings.DeviceList:
+                            return Command.DeviceList;
+                        case CommandStrings.DeviceReport:
+                            return Command.DeviceReport;
+                    }
+
+                    break;
+
+                // Filesystem Family
+                case CommandStrings.FilesystemPrefixShort:
+                case CommandStrings.FilesystemPrefixShortAlt:
+                case CommandStrings.FilesystemPrefixLong:
+                    useSecond = true;
+                    switch (commandTwo)
+                    {
+                        case CommandStrings.FilesystemExtract:
+                            return Command.FilesystemExtract;
+                        case CommandStrings.FilesystemListShort:
+                        case CommandStrings.FilesystemListLong:
+                            return Command.FilesystemList;
+                        case CommandStrings.DatabaseStats:
+                            return Command.FilesystemOptions;
+                    }
+
+                    break;
+
+                // Image Family
+                case CommandStrings.ImagePrefixShort:
+                case CommandStrings.ImagePrefixLong:
+                    useSecond = true;
+                    switch (commandTwo)
+                    {
+                        case CommandStrings.ImageAnalyze:
+                            return Command.ImageAnalyze;
+                        case CommandStrings.ImageChecksumShort:
+                        case CommandStrings.ImageChecksumLong:
+                            return Command.ImageChecksum;
+                        case CommandStrings.ImageCompareShort:
+                        case CommandStrings.ImageCompareLong:
+                            return Command.ImageCompare;
+                        case CommandStrings.ImageConvert:
+                            return Command.ImageConvert;
+                        case CommandStrings.ImageCreateSidecar:
+                            return Command.ImageCreateSidecar;
+                        case CommandStrings.ImageDecode:
+                            return Command.ImageDecode;
+                        case CommandStrings.ImageEntropy:
+                            return Command.ImageEntropy;
+                        case CommandStrings.ImageInfo:
+                            return Command.ImageInfo;
+                        case CommandStrings.ImageOptions:
+                            return Command.ImageOptions;
+                        case CommandStrings.ImagePrint:
+                            return Command.ImagePrint;
+                        case CommandStrings.ImageVerify:
+                            return Command.ImageVerify;
+                    }
+
+                    break;
+
+                // Media Family
+                case CommandStrings.MediaPrefixShort:
+                case CommandStrings.MediaPrefixLong:
+                    useSecond = true;
+                    switch (commandTwo)
+                    {
+                        case CommandStrings.MediaDump:
+                            return Command.MediaDump;
+                        case CommandStrings.MediaInfo:
+                            return Command.MediaInfo;
+                        case CommandStrings.MediaScan:
+                            return Command.MediaScan;
+                    }
+
+                    break;
+
+                // Standalone Commands
+                case CommandStrings.Configure:
+                    return Command.Configure;
+                case CommandStrings.Formats:
+                    return Command.Formats;
+                case CommandStrings.ListEncodings:
+                    return Command.ListEncodings;
+                case CommandStrings.ListNamespaces:
+                    return Command.ListNamespaces;
+                case CommandStrings.Remote:
+                    return Command.Remote;
+            }
+
+            return Command.NONE;
+        }
+
+        #endregion
+    }
+}

DICUI.Library/Aaru/Enumerations.cs

@@ -0,0 +1,149 @@
+namespace DICUI.Aaru
+{
+    /// <summary>
+    /// Supported Aaru commands
+    /// </summary>
+    public enum Command : int
+    {
+        NONE = 0,
+
+        // Database Family
+        DatabaseStats,
+        DatabaseUpdate,
+
+        // Device Family
+        DeviceInfo,
+        DeviceList,
+        DeviceReport,
+
+        // Filesystem Family
+        FilesystemExtract,
+        FilesystemList,
+        FilesystemOptions,
+
+        // Image Family
+        ImageAnalyze,
+        ImageChecksum,
+        ImageCompare,
+        ImageConvert,
+        ImageCreateSidecar,
+        ImageDecode,
+        ImageEntropy,
+        ImageInfo,
+        ImageOptions,
+        ImagePrint,
+        ImageVerify,
+
+        // Media Family
+        MediaDump,
+        MediaInfo,
+        MediaScan,
+
+        // Standalone Commands
+        Configure,
+        Formats,
+        ListEncodings,
+        ListNamespaces,
+        Remote,
+    }
+
+    /// <summary>
+    /// Supported Aaru flags
+    /// </summary>
+    public enum Flag : int
+    {
+        NONE = 0,
+
+        // Boolean flags
+        Adler32,
+        Clear,
+        ClearAll,
+        CRC16,
+        CRC32,
+        CRC64,
+        Debug,
+        DiskTags,
+        DuplicatedSectors,
+        Eject,
+        ExtendedAttributes,
+        Filesystems,
+        FirstPregap,
+        FixOffset,
+        FixSubchannel,
+        FixSubchannelCrc,
+        FixSubchannelPosition,
+        Fletcher16,
+        Fletcher32,
+        Force,
+        GenerateSubchannels,
+        Help,
+        LongFormat,
+        LongSectors,
+        MD5,
+        Metadata,
+        Partitions,
+        Persistent,
+        Private,
+        Resume,
+        RetrySubchannel,
+        SectorTags,
+        SeparatedTracks,
+        SHA1,
+        SHA256,
+        SHA384,
+        SHA512,
+        SkipCdiReadyHole,
+        SpamSum,
+        StopOnError,
+        Tape,
+        Trim,
+        Verbose,
+        VerifyDisc,
+        VerifySectors,
+        Version,
+        WholeDisc,
+
+        // Int8 flags
+        Speed,
+
+        // Int16 flags
+        RetryPasses,
+        Width,
+
+        // Int32 flags
+        BlockSize,
+        Count,
+        MediaLastSequence,
+        MediaSequence,
+        Skip,
+
+        // Int64 flags
+        Length,
+        Start,
+
+        // String flags
+        Comments,
+        Creator,
+        DriveManufacturer,
+        DriveModel,
+        DriveRevision,
+        DriveSerial,
+        Encoding,
+        FormatConvert,
+        FormatDump,
+        ImgBurnLog,
+        MediaBarcode,
+        MediaManufacturer,
+        MediaModel,
+        MediaPartNumber,
+        MediaSerial,
+        MediaTitle,
+        MHDDLog,
+        Namespace,
+        Options,
+        OutputPrefix,
+        ResumeFile,
+        Subchannel,
+        XMLSidecar,
+    }
+}

DICUI.Library/AssemblyInfo.cs

@@ -0,0 +1,4 @@
+using System.Runtime.CompilerServices;
+
+// Anything marked as internal can be used by the test methods
+[assembly: InternalsVisibleTo("DICUI.Test")]

DICUI.Library/CleanRIp/Parameters.cs

@@ -0,0 +1,353 @@
+using System;
+using System.IO;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.CleanRip
+{
+    /// <summary>
+    /// Represents a generic set of CleanRip parameters
+    /// </summary>
+    public class Parameters : BaseParameters
+    {
+        /// <summary>
+        /// Populate a Parameters object from a param string
+        /// </summary>
+        /// <param name="parameters">String possibly representing a set of parameters</param>
+        public Parameters(string parameters)
+            : base(parameters)
+        {
+            this.InternalProgram = InternalProgram.CleanRip;
+        }
+
+        /// <summary>
+        /// Generate parameters based on a set of known inputs
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="quietMode">Enable quiet mode (no beeps)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        public Parameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, bool quietMode, int retryCount)
+            : base(system, type, driveLetter, filename, driveSpeed, paranoid, quietMode, retryCount)
+        {
+        }
+
+        /// <summary>
+        /// Blindly generate a parameter string based on the inputs
+        /// </summary>
+        /// <returns>Correctly formatted parameter string, null on error</returns>
+        public override string GenerateParameters() => null;
+
+        /// <summary>
+        /// Get the input path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string InputPath() => null;
+
+        /// <summary>
+        /// Get the output path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string OutputPath() => null;
+
+        /// <summary>
+        /// Get the processing speed from the implementation
+        /// </summary>
+        /// <returns>int? representing the speed, null on error</returns>
+        public override int? GetSpeed() => null;
+
+        /// <summary>
+        /// Set the processing speed int the implementation
+        /// </summary>
+        /// <param name="speed">int? representing the speed</param>
+        public override void SetSpeed(int? speed) { }
+
+        /// <summary>
+        /// Get the MediaType from the current set of parameters
+        /// </summary>
+        /// <returns>MediaType value if successful, null on error</returns>
+        public override MediaType? GetMediaType() => null;
+
+        /// <summary>
+        /// Gets if the current command is considered a dumping command or not
+        /// </summary>
+        /// <returns>True if it's a dumping command, false otherwise</returns>
+        public override bool IsDumpingCommand() => true;
+
+        /// <summary>
+        /// Reset all special variables to have default values
+        /// </summary>
+        protected override void ResetValues() { }
+
+        /// <summary>
+        /// Set default parameters for a given system and media type
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        protected override void SetDefaultParameters(
+            KnownSystem? system,
+            MediaType? type,
+            char driveLetter,
+            string filename,
+            int? driveSpeed,
+            bool paranoid,
+            int retryCount)
+        {
+        }
+
+        /// <summary>
+        /// Scan a possible parameter string and populate whatever possible
+        /// </summary>
+        /// <param name="parameters">String possibly representing parameters</param>
+        /// <returns></returns>
+        protected override bool ValidateAndSetParameters(string parameters) => true;
+
+        /// <summary>
+        /// Validate if all required output files exist
+        /// </summary>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="progress">Optional result progress callback</param>
+        /// <returns></returns>
+        public override bool CheckAllOutputFilesExist(string basePath, KnownSystem? system, MediaType? type, IProgress<Result> progress = null)
+        {
+            string missingFiles = string.Empty;
+            switch (type)
+            {
+                case MediaType.DVD: // Only added here to help users; not strictly correct
+                case MediaType.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                    if (!File.Exists($"{basePath}-dumpinfo.txt"))
+                        missingFiles += $";{basePath}-dumpinfo.txt";
+                    if (!File.Exists($"{basePath}.bca"))
+                        missingFiles += $";{basePath}.bca";
+
+                    break;
+
+                default:
+                    return false;
+            }
+
+            // Use the missing files list as an indicator
+            if (string.IsNullOrEmpty(missingFiles))
+            {
+                return true;
+            }
+            else
+            {
+                progress?.Report(Result.Failure($"The following files were missing: {missingFiles.TrimStart(';')}"));
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Generate a SubmissionInfo for the output files
+        /// </summary>
+        /// <param name="info">Base submission info to fill in specifics for</param>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="drive">Drive representing the disc to get information from</param>
+        /// <returns></returns>
+        public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, KnownSystem? system, MediaType? type, Drive drive)
+        {
+            info.TracksAndWriteOffsets.ClrMameProData = GetCleanripDatfile(basePath + ".iso", basePath + "-dumpinfo.txt");
+            
+            // Get the individual hash data, as per internal
+            if (GetISOHashValues(info.TracksAndWriteOffsets.ClrMameProData, out long size, out string crc32, out string md5, out string sha1))
+            {
+                info.SizeAndChecksums.Size = size;
+                info.SizeAndChecksums.CRC32 = crc32;
+                info.SizeAndChecksums.MD5 = md5;
+                info.SizeAndChecksums.SHA1 = sha1;
+
+                // Dual-layer discs have the same size and layerbreak
+                if (size == 8511160320)
+                    info.SizeAndChecksums.Layerbreak = 2084960;
+            }            
+
+            // Extract info based generically on MediaType
+            switch (type)
+            {
+                case MediaType.DVD: // Only added here to help users; not strictly correct
+                case MediaType.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                    if (File.Exists(basePath + ".bca"))
+                        info.Extras.BCA = GetFullFile(basePath + ".bca", true);
+
+                    if (GetGameCubeWiiInformation(basePath + "-dumpinfo.txt", out Region? gcRegion, out string gcVersion))
+                    {
+                        info.CommonDiscInfo.Region = gcRegion ?? info.CommonDiscInfo.Region;
+                        info.VersionAndEditions.Version = gcVersion ?? info.VersionAndEditions.Version;
+                    }
+
+                    break;
+            }
+        }
+
+        #region Information Extraction Methods
+
+        /// <summary>
+        /// Get a formatted datfile from the cleanrip output, if possible
+        /// </summary>
+        /// <param name="iso">Path to ISO file</param>
+        /// <param name="dumpinfo">Path to discinfo file</param>
+        /// <returns></returns>
+        private static string GetCleanripDatfile(string iso, string dumpinfo)
+        {
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(dumpinfo))
+                return null;
+
+            using (StreamReader sr = File.OpenText(dumpinfo))
+            {
+                long size = new FileInfo(iso).Length;
+                string crc = string.Empty;
+                string md5 = string.Empty;
+                string sha1 = string.Empty;
+
+                try
+                {
+                    // Make sure this file is a dumpinfo
+                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                        return null;
+
+                    // Read all lines and gather dat information
+                    while (!sr.EndOfStream)
+                    {
+                        string line = sr.ReadLine().Trim();
+                        if (line.StartsWith("CRC32"))
+                            crc = line.Substring(7).ToLowerInvariant();
+                        else if (line.StartsWith("MD5"))
+                            md5 = line.Substring(5);
+                        else if (line.StartsWith("SHA-1"))
+                            sha1 = line.Substring(7);
+                    }
+
+                    return $"<rom name=\"{Path.GetFileName(iso)}\" size=\"{size}\" crc=\"{crc}\" md5=\"{md5}\" sha1=\"{sha1}\" />";
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the extracted GC and Wii version
+        /// </summary>
+        /// <param name="dumpinfo">Path to discinfo file</param>
+        /// <param name="region">Output region, if possible</param>
+        /// <param name="version">Output internal version of the game</param>
+        /// <returns></returns>
+        private static bool GetGameCubeWiiInformation(string dumpinfo, out Region? region, out string version)
+        {
+            region = null; version = null;
+
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(dumpinfo))
+                return false;
+
+            using (StreamReader sr = File.OpenText(dumpinfo))
+            {
+                try
+                {
+                    // Make sure this file is a dumpinfo
+                    if (!sr.ReadLine().Contains("--File Generated by CleanRip"))
+                        return false;
+
+                    // Read all lines and gather dat information
+                    while (!sr.EndOfStream)
+                    {
+                        string line = sr.ReadLine().Trim();
+                        if (line.StartsWith("Version"))
+                        {
+                            version = line.Substring(9);
+                        }
+                        else if (line.StartsWith("Filename"))
+                        {
+                            string serial = line.Substring(10);
+
+                            // char gameType = serial[0];
+                            // string gameid = serial[1] + serial[2];
+                            // string version = serial[4] + serial[5]
+
+                            switch (serial[3])
+                            {
+                                case 'A':
+                                    region = Region.World;
+                                    break;
+                                case 'D':
+                                    region = Region.Germany;
+                                    break;
+                                case 'E':
+                                    region = Region.USA;
+                                    break;
+                                case 'F':
+                                    region = Region.France;
+                                    break;
+                                case 'I':
+                                    region = Region.Italy;
+                                    break;
+                                case 'J':
+                                    region = Region.Japan;
+                                    break;
+                                case 'K':
+                                    region = Region.Korea;
+                                    break;
+                                case 'L':
+                                    region = Region.Europe; // Japanese import to Europe
+                                    break;
+                                case 'M':
+                                    region = Region.Europe; // American import to Europe
+                                    break;
+                                case 'N':
+                                    region = Region.USA; // Japanese import to USA
+                                    break;
+                                case 'P':
+                                    region = Region.Europe;
+                                    break;
+                                case 'R':
+                                    region = Region.Russia;
+                                    break;
+                                case 'S':
+                                    region = Region.Spain;
+                                    break;
+                                case 'Q':
+                                    region = Region.Korea; // Korea with Japanese language
+                                    break;
+                                case 'T':
+                                    region = Region.Korea; // Korea with English language
+                                    break;
+                                case 'X':
+                                    region = null; // Not a real region code
+                                    break;
+                            }
+                        }
+                    }
+
+                    return true;
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return false;
+                }
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/CueSheets/CueFile.cs

@@ -0,0 +1,201 @@
+using System.Collections.Generic;
+using System.IO;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// The audio or data file’s filetype
+    /// </summary>
+    public enum CueFileType
+    {
+        /// <summary>
+        /// Intel binary file (least significant byte first). Use for data files.
+        /// </summary>
+        BINARY,
+
+        /// <summary>
+        /// Motorola binary file (most significant byte first). Use for data files.
+        /// </summary>
+        MOTOROLA,
+
+        /// <summary>
+        /// Audio AIFF file (44.1KHz 16-bit stereo)
+        /// </summary>
+        AIFF,
+
+        /// <summary>
+        /// Audio WAVE file (44.1KHz 16-bit stereo)
+        /// </summary>
+        WAVE,
+
+        /// <summary>
+        /// Audio MP3 file (44.1KHz 16-bit stereo)
+        /// </summary>
+        MP3,
+    }
+
+    /// <summary>
+    /// Represents a single FILE in a cuesheet
+    /// </summary>
+    public class CueFile
+    {
+        /// <summary>
+        /// filename
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// filetype
+        /// </summary>
+        public CueFileType FileType { get; set; }
+
+        /// <summary>
+        /// List of TRACK in FILE
+        /// </summary>
+        public List<CueTrack> Tracks { get; set; }
+
+        /// <summary>
+        /// Create an empty FILE
+        /// </summary>
+        public CueFile()
+        {
+        }
+
+        /// <summary>
+        /// Fill a FILE from an array of lines
+        /// </summary>
+        /// <param name="fileName">File name to set</param>
+        /// <param name="fileType">File type to set</param>
+        /// <param name="cueLines">Lines array to pull from</param>
+        /// <param name="i">Reference to index in array</param>
+        public CueFile(string fileName, string fileType, string[] cueLines, ref int i)
+        {
+            if (cueLines == null || i < 0 || i > cueLines.Length)
+                return; // TODO: Make this throw an exception
+
+            // Set the current fields
+            this.FileName = fileName.Trim('"');
+            this.FileType = GetFileType(fileType);
+
+            // Increment to start
+            i++;
+
+            for (; i < cueLines.Length; i++)
+            {
+                string line = cueLines[i].Trim();
+                string[] splitLine = line.Split(' ');
+
+                // If we have an empty line, we skip
+                if (string.IsNullOrWhiteSpace(line))
+                    continue;
+
+                switch (splitLine[0])
+                {
+                    // Read comments
+                    case "REM":
+                        // We ignore all comments for now
+                        break;
+
+                    // Read track information
+                    case "TRACK":
+                        if (splitLine.Length < 3)
+                            continue; // TODO: Make this throw an exception
+
+                        if (this.Tracks == null)
+                            this.Tracks = new List<CueTrack>();
+
+                        var track = new CueTrack(splitLine[1], splitLine[2], cueLines, ref i);
+                        if (track == default)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Tracks.Add(track);
+                        break;
+
+                    // Default means return
+                    default:
+                        i--;
+                        return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Write the FILE out to a stream
+        /// </summary>
+        /// <param name="sw">StreamWriter to write to</param>
+        public void Write(StreamWriter sw)
+        {
+            // If we don't have any tracks, it's invalid
+            if (this.Tracks == null || this.Tracks.Count == 0)
+                return; // TODO: Make this throw an exception
+
+            sw.WriteLine($"FILE \"{this.FileName}\" {FromFileType(this.FileType)}");
+
+            foreach (var track in Tracks)
+            {
+                track.Write(sw);
+            }
+        }
+
+        /// <summary>
+        /// Get the file type from a given string
+        /// </summary>
+        /// <param name="fileType">String to get value from</param>
+        /// <returns>CueFileType, if possible</returns>
+        private CueFileType GetFileType(string fileType)
+        {
+            switch (fileType.ToLowerInvariant())
+            {
+                case "binary":
+                    return CueFileType.BINARY;
+
+                case "motorola":
+                    return CueFileType.MOTOROLA;
+
+                case "aiff":
+                    return CueFileType.AIFF;
+
+                case "wave":
+                    return CueFileType.WAVE;
+
+                case "mp3":
+                    return CueFileType.MP3;
+
+                default:
+                    return CueFileType.BINARY;
+            }
+        }
+
+        /// <summary>
+        /// Get the string from a given file type
+        /// </summary>
+        /// <param name="fileType">CueFileType to get value from</param>
+        /// <returns>String, if possible (default BINARY)</returns>
+        private string FromFileType(CueFileType fileType)
+        {
+            switch (fileType)
+            {
+                case CueFileType.BINARY:
+                    return "BINARY";
+
+                case CueFileType.MOTOROLA:
+                    return "MOTOROLA";
+
+                case CueFileType.AIFF:
+                    return "AIFF";
+
+                case CueFileType.WAVE:
+                    return "WAVE";
+
+                case CueFileType.MP3:
+                    return "MP3";
+
+                default:
+                    return string.Empty;
+            }
+        }
+    }
+}

DICUI.Library/CueSheets/CueIndex.cs

@@ -0,0 +1,106 @@
+using System.IO;
+using System.Linq;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// Represents a single INDEX in a TRACK
+    /// </summary>
+    public class CueIndex
+    {
+        /// <summary>
+        /// INDEX number, between 0 and 99
+        /// </summary>
+        public int Index { get; set; }
+
+        /// <summary>
+        /// Starting time of INDEX in minutes
+        /// </summary>
+        public int Minutes { get; set; }
+
+        /// <summary>
+        /// Starting time of INDEX in seconds
+        /// </summary>
+        /// <remarks>There are 60 seconds in a minute</remarks>
+        public int Seconds { get; set; }
+
+        /// <summary>
+        /// Starting time of INDEX in frames.
+        /// </summary>
+        /// <remarks>There are 75 frames per second</remarks>
+        public int Frames { get; set; }
+
+        /// <summary>
+        /// Create an empty INDEX
+        /// </summary>
+        public CueIndex()
+        {
+        }
+
+        /// <summary>
+        /// Fill a INDEX from an array of lines
+        /// </summary>
+        /// <param name="index">Index to set</param>
+        /// <param name="startTime">Start time to set</param>
+        public CueIndex(string index, string startTime)
+        {
+            // Set the current fields
+            if (!int.TryParse(index, out int parsedIndex))
+                return; // TODO: Make this throw an exception
+            else if (parsedIndex < 0 || parsedIndex > 99)
+                return; // TODO: Make this throw an exception
+
+            // Ignore empty lines
+            if (string.IsNullOrWhiteSpace(startTime))
+                return; // TODO: Make this throw an exception
+
+            // Ignore lines that don't contain the correct information
+            if (startTime.Length != 8 || startTime.Count(c => c == ':') != 2)
+                return; // TODO: Make this throw an exception
+
+            // Split the line
+            string[] splitTime = startTime.Split(':');
+            if (splitTime.Length != 3)
+                return; // TODO: Make this throw an exception
+
+            // Parse the lengths
+            int[] lengthSegments = new int[3];
+
+            // Minutes
+            if (!int.TryParse(splitTime[0], out lengthSegments[0]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[0] < 0)
+                return; // TODO: Make this throw an exception
+
+            // Seconds
+            if (!int.TryParse(splitTime[1], out lengthSegments[1]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[1] < 0 || lengthSegments[1] > 60)
+                return; // TODO: Make this throw an exception
+
+            // Frames
+            if (!int.TryParse(splitTime[2], out lengthSegments[2]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[2] < 0 || lengthSegments[2] > 75)
+                return; // TODO: Make this throw an exception
+
+            // Set the values
+            this.Index = parsedIndex;
+            this.Minutes = lengthSegments[0];
+            this.Seconds = lengthSegments[1];
+            this.Frames = lengthSegments[2];
+        }
+
+        /// <summary>
+        /// Write the INDEX out to a stream
+        /// </summary>
+        /// <param name="sw">StreamWriter to write to</param>
+        public void Write(StreamWriter sw)
+        {
+            sw.WriteLine($"    INDEX {this.Index:D2} {this.Minutes:D2}:{this.Seconds:D2}:{this.Frames:D2}");
+        }
+    }
+}

DICUI.Library/CueSheets/CueSheet.cs

@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// Represents a single cuesheet
+    /// </summary>
+    public class CueSheet
+    {
+        /// <summary>
+        /// CATALOG
+        /// </summary>
+        public string Catalog { get; set; }
+
+        /// <summary>
+        /// CDTEXTFILE
+        /// </summary>
+        public string CdTextFile { get; set; }
+
+        /// <summary>
+        /// PERFORMER
+        /// </summary>
+        public string Performer { get; set; }
+
+        /// <summary>
+        /// SONGWRITER
+        /// </summary>
+        public string Songwriter { get; set; }
+
+        /// <summary>
+        /// TITLE
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// List of FILE in cuesheet
+        /// </summary>
+        public List<CueFile> Files { get; set; }
+
+        /// <summary>
+        /// Create an empty cuesheet
+        /// </summary>
+        public CueSheet()
+        {
+        }
+
+        /// <summary>
+        /// Create a cuesheet from a file, if possible
+        /// </summary>
+        /// <param name="filename"></param>
+        public CueSheet(string filename)
+        {
+            // Check that the file exists
+            if (!File.Exists(filename))
+                return;
+
+            // Check the extension
+            string ext = Path.GetExtension(filename).TrimStart('.');
+            if (!string.Equals(ext, "cue", StringComparison.OrdinalIgnoreCase)
+                && !string.Equals(ext, "txt", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            // Open the file and begin reading
+            string[] cueLines = File.ReadAllLines(filename);
+            for (int i = 0; i < cueLines.Length; i++)
+            {
+                string line = cueLines[i].Trim();
+
+                // http://stackoverflow.com/questions/554013/regular-expression-to-split-on-spaces-unless-in-quotes
+                string[] splitLine = Regex
+                    .Matches(line, @"[^\s""]+|""[^""]*""")
+                    .Cast<Match>()
+                    .Select(m => m.Groups[0].Value)
+                    .ToArray();
+
+                // If we have an empty line, we skip
+                if (string.IsNullOrWhiteSpace(line))
+                    continue;
+
+                switch (splitLine[0])
+                {
+                    // Read comments
+                    case "REM":
+                        // We ignore all comments for now
+                        break;
+
+                    // Read MCN
+                    case "CATALOG":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Catalog = splitLine[1];
+                        break;
+
+                    // Read external CD-Text file path
+                    case "CDTEXTFILE":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.CdTextFile = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced performer
+                    case "PERFORMER":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Performer = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced songwriter
+                    case "SONGWRITER":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Songwriter = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced title
+                    case "TITLE":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Title = splitLine[1];
+                        break;
+
+                    // Read file information
+                    case "FILE":
+                        if (splitLine.Length < 3)
+                            continue; // TODO: Make this throw an exception
+
+                        if (this.Files == null)
+                            this.Files = new List<CueFile>();
+
+                        var file = new CueFile(splitLine[1], splitLine[2], cueLines, ref i);
+                        if (file == default)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Files.Add(file);
+                        break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Write the cuesheet out to a file
+        /// </summary>
+        /// <param name="filename">File path to write to</param>
+        public void Write(string filename)
+        {
+            using (var fs = File.Open(filename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))
+            {
+                Write(fs);
+            }
+        }
+
+        /// <summary>
+        /// Write the cuesheet out to a stream
+        /// </summary>
+        /// <param name="stream">Stream to write to</param>
+        public void Write(Stream stream)
+        {
+            // If we don't have any files, it's invalid
+            if (this.Files == null || this.Files.Count == 0)
+                return; // TODO: Make this throw an exception
+
+            using (var sw = new StreamWriter(stream, Encoding.ASCII, 1024, true))
+            {
+                if (!string.IsNullOrEmpty(this.Catalog))
+                    sw.WriteLine($"CATALOG {this.Catalog}");
+
+                if (!string.IsNullOrEmpty(this.CdTextFile))
+                    sw.WriteLine($"CDTEXTFILE {this.CdTextFile}");
+
+                if (!string.IsNullOrEmpty(this.Performer))
+                    sw.WriteLine($"PERFORMER {this.Performer}");
+
+                if (!string.IsNullOrEmpty(this.Songwriter))
+                    sw.WriteLine($"SONGWRITER {this.Songwriter}");
+
+                if (!string.IsNullOrEmpty(this.Title))
+                    sw.WriteLine($"TITLE {this.Title}");
+
+                foreach (var file in Files)
+                {
+                    file.Write(sw);
+                }
+            }
+        }
+    }
+}

DICUI.Library/CueSheets/CueTrack.cs

@@ -0,0 +1,464 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// Track datatype
+    /// </summary>
+    public enum CueTrackDataType
+    {
+        /// <summary>
+        /// AUDIO, Audio/Music (2352)
+        /// </summary>
+        AUDIO,
+
+        /// <summary>
+        /// CDG, Karaoke CD+G (2448)
+        /// </summary>
+        CDG,
+
+        /// <summary>
+        /// MODE1/2048, CD-ROM Mode1 Data (cooked)
+        /// </summary>
+        MODE1_2048,
+
+        /// <summary>
+        /// MODE1/2352 CD-ROM Mode1 Data (raw)
+        /// </summary>
+        MODE1_2352,
+
+        /// <summary>
+        /// MODE2/2336, CD-ROM XA Mode2 Data
+        /// </summary>
+        MODE2_2336,
+
+        /// <summary>
+        /// MODE2/2352, CD-ROM XA Mode2 Data
+        /// </summary>
+        MODE2_2352,
+
+        /// <summary>
+        /// CDI/2336, CD-I Mode2 Data
+        /// </summary>
+        CDI_2336,
+
+        /// <summary>
+        /// CDI/2352, CD-I Mode2 Data
+        /// </summary>
+        CDI_2352,
+    }
+
+    /// <summary>
+    /// Special subcode flags within a track
+    /// </summary>
+    [Flags]
+    public enum CueTrackFlag
+    {
+        /// <summary>
+        /// DCP, Digital copy permitted
+        /// </summary>
+        DCP = 1 << 0,
+
+        /// <summary>
+        /// 4CH, Four channel audio
+        /// </summary>
+        FourCH = 1 << 1,
+
+        /// <summary>
+        /// PRE, Pre-emphasis enabled (audio tracks only)
+        /// </summary>
+        PRE = 1 << 2,
+
+        /// <summary>
+        /// SCMS, Serial Copy Management System (not supported by all recorders)
+        /// </summary>
+        SCMS = 1 << 3,
+
+        /// <summary>
+        /// DATA, set for data files. This flag is set automatically based on the track’s filetype
+        /// </summary>
+        DATA = 1 << 4,
+    }
+
+    /// <summary>
+    /// Represents a single TRACK in a FILE
+    /// </summary>
+    public class CueTrack
+    {
+        /// <summary>
+        /// Track number. The range is 1 to 99.
+        /// </summary>
+        public int Number { get; set; }
+
+        /// <summary>
+        /// Track datatype
+        /// </summary>
+        public CueTrackDataType DataType { get; set; }
+
+        /// <summary>
+        /// FLAGS
+        /// </summary>
+        public CueTrackFlag Flags { get; set; }
+
+        /// <summary>
+        /// ISRC
+        /// </summary>
+        /// <remarks>12 characters in length</remarks>
+        public string ISRC { get; set; }
+
+        /// <summary>
+        /// PERFORMER
+        /// </summary>
+        public string Performer { get; set; }
+
+        /// <summary>
+        /// SONGWRITER
+        /// </summary>
+        public string Songwriter { get; set; }
+
+        /// <summary>
+        /// TITLE
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// PREGAP
+        /// </summary>
+        public PreGap PreGap { get; set; }
+
+        /// <summary>
+        /// List of INDEX in TRACK
+        /// </summary>
+        /// <remarks>Must start with 0 or 1 and then sequential</remarks>
+        public List<CueIndex> Indices { get; set; }
+
+        /// <summary>
+        /// POSTGAP
+        /// </summary>
+        public PostGap PostGap { get; set; }
+
+        /// <summary>
+        /// Create an empty TRACK
+        /// </summary>
+        public CueTrack()
+        {
+        }
+
+        /// <summary>
+        /// Fill a TRACK from an array of lines
+        /// </summary>
+        /// <param name="number">Number to set</param>
+        /// <param name="dataType">Data type to set</param>
+        /// <param name="cueLines">Lines array to pull from</param>
+        /// <param name="i">Reference to index in array</param>
+        public CueTrack(string number, string dataType, string[] cueLines, ref int i)
+        {
+            if (cueLines == null || i < 0 || i > cueLines.Length)
+                return; // TODO: Make this throw an exception
+
+            // Set the current fields
+            if (!int.TryParse(number, out int parsedNumber))
+                return; // TODO: Make this throw an exception
+            else if (parsedNumber < 1 || parsedNumber > 99)
+                return; // TODO: Make this throw an exception
+
+            this.Number = parsedNumber;
+            this.DataType = GetDataType(dataType);
+
+            // Increment to start
+            i++;
+
+            for (; i < cueLines.Length; i++)
+            {
+                string line = cueLines[i].Trim();
+                string[] splitLine = line.Split(' ');
+
+                // If we have an empty line, we skip
+                if (string.IsNullOrWhiteSpace(line))
+                    continue;
+
+                switch (splitLine[0])
+                {
+                    // Read comments
+                    case "REM":
+                        // We ignore all comments for now
+                        break;
+
+                    // Read flag information
+                    case "FLAGS":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Flags = GetFlags(splitLine);
+                        break;
+
+                    // Read International Standard Recording Code
+                    case "ISRC":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.ISRC = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced performer
+                    case "PERFORMER":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Performer = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced songwriter
+                    case "SONGWRITER":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Songwriter = splitLine[1];
+                        break;
+
+                    // Read CD-Text enhanced title
+                    case "TITLE":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Title = splitLine[1];
+                        break;
+
+                    // Read pregap information
+                    case "PREGAP":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        var pregap = new PreGap(splitLine[1]);
+                        if (pregap == default)
+                            continue; // TODO: Make this throw an exception
+
+                        this.PreGap = pregap;
+                        break;
+
+                    // Read index information
+                    case "INDEX":
+                        if (splitLine.Length < 3)
+                            continue; // TODO: Make this throw an exception
+
+                        if (this.Indices == null)
+                            this.Indices = new List<CueIndex>();
+
+                        var index = new CueIndex(splitLine[1], splitLine[2]);
+                        if (index == default)
+                            continue; // TODO: Make this throw an exception
+
+                        this.Indices.Add(index);
+                        break;
+
+                    // Read postgap information
+                    case "POSTGAP":
+                        if (splitLine.Length < 2)
+                            continue; // TODO: Make this throw an exception
+
+                        var postgap = new PostGap(splitLine[1]);
+                        if (postgap == default)
+                            continue; // TODO: Make this throw an exception
+
+                        this.PostGap = postgap;
+                        break;
+
+                    // Default means return
+                    default:
+                        i--;
+                        return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Write the TRACK out to a stream
+        /// </summary>
+        /// <param name="sw">StreamWriter to write to</param>
+        public void Write(StreamWriter sw)
+        {
+            // If we don't have any indices, it's invalid
+            if (this.Indices == null || this.Indices.Count == 0)
+                return; // TODO: Make this throw an exception
+
+            sw.WriteLine($"  TRACK {this.Number:D2} {FromDataType(this.DataType)}");
+
+            if (this.Flags != 0)
+                sw.WriteLine($"    FLAGS {FromFlags(this.Flags)}");
+
+            if (!string.IsNullOrEmpty(this.ISRC))
+                sw.WriteLine($"ISRC {this.ISRC}");
+
+            if (!string.IsNullOrEmpty(this.Performer))
+                sw.WriteLine($"PERFORMER {this.Performer}");
+
+            if (!string.IsNullOrEmpty(this.Songwriter))
+                sw.WriteLine($"SONGWRITER {this.Songwriter}");
+
+            if (!string.IsNullOrEmpty(this.Title))
+                sw.WriteLine($"TITLE {this.Title}");
+
+            if (this.PreGap != null)
+                this.PreGap.Write(sw);
+
+            foreach (var index in Indices)
+            {
+                index.Write(sw);
+            }
+
+            if (this.PostGap != null)
+                this.PostGap.Write(sw);
+        }
+
+        /// <summary>
+        /// Get the data type from a given string
+        /// </summary>
+        /// <param name="dataType">String to get value from</param>
+        /// <returns>CueTrackDataType, if possible (default AUDIO)</returns>
+        private CueTrackDataType GetDataType(string dataType)
+        {
+            switch (dataType.ToLowerInvariant())
+            {
+                case "audio":
+                    return CueTrackDataType.AUDIO;
+
+                case "cdg":
+                    return CueTrackDataType.CDG;
+
+                case "mode1/2048":
+                    return CueTrackDataType.MODE1_2048;
+
+                case "mode1/2352":
+                    return CueTrackDataType.MODE1_2352;
+
+                case "mode2/2336":
+                    return CueTrackDataType.MODE2_2336;
+
+                case "mode2/2352":
+                    return CueTrackDataType.MODE2_2352;
+
+                case "cdi/2336":
+                    return CueTrackDataType.CDI_2336;
+
+                case "cdi/2352":
+                    return CueTrackDataType.CDI_2352;
+
+                default:
+                    return CueTrackDataType.AUDIO;
+            }
+        }
+
+        /// <summary>
+        /// Get the string from a given data type
+        /// </summary>
+        /// <param name="dataType">CueTrackDataType to get value from</param>
+        /// <returns>string, if possible</returns>
+        private string FromDataType(CueTrackDataType dataType)
+        {
+            switch (dataType)
+            {
+                case CueTrackDataType.AUDIO:
+                    return "AUDIO";
+
+                case CueTrackDataType.CDG:
+                    return "CDG";
+
+                case CueTrackDataType.MODE1_2048:
+                    return "MODE1/2048";
+
+                case CueTrackDataType.MODE1_2352:
+                    return "MODE1/2352";
+
+                case CueTrackDataType.MODE2_2336:
+                    return "MODE2/2336";
+
+                case CueTrackDataType.MODE2_2352:
+                    return "MODE2/2352";
+
+                case CueTrackDataType.CDI_2336:
+                    return "CDI/2336";
+
+                case CueTrackDataType.CDI_2352:
+                    return "CDI/2352";
+
+                default:
+                    return string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Get the flag value for an array of strings
+        /// </summary>
+        /// <param name="flagStrings">Possible flags as strings</param>
+        /// <returns>CueTrackFlag value representing the strings, if possible</returns>
+        private CueTrackFlag GetFlags(string[] flagStrings)
+        {
+            CueTrackFlag flag = 0;
+
+            foreach (string flagString in flagStrings)
+            {
+                // TODO: Make default throw an exception
+                switch (flagString.ToLowerInvariant())
+                {
+                    case "flags":
+                        // No-op since this is the start of the line
+                        break;
+
+                    case "dcp":
+                        flag |= CueTrackFlag.DCP;
+                        break;
+
+                    case "4ch":
+                        flag |= CueTrackFlag.FourCH;
+                        break;
+
+                    case "pre":
+                        flag |= CueTrackFlag.PRE;
+                        break;
+
+                    case "scms":
+                        flag |= CueTrackFlag.SCMS;
+                        break;
+
+                    case "data":
+                        flag |= CueTrackFlag.DATA;
+                        break;
+                }
+            }
+
+            return flag;
+        }
+
+        /// <summary>
+        /// Get the string value for a set of track flags
+        /// </summary>
+        /// <param name="flags">CueTrackFlag to get value from</param>
+        /// <returns>String value representing the CueTrackFlag, if possible</returns>
+        private string FromFlags(CueTrackFlag flags)
+        {
+            string outputFlagString = string.Empty;
+
+            if (flags.HasFlag(CueTrackFlag.DCP))
+                outputFlagString += "DCP ";
+
+            if (flags.HasFlag(CueTrackFlag.FourCH))
+                outputFlagString += "4CH ";
+
+            if (flags.HasFlag(CueTrackFlag.PRE))
+                outputFlagString += "PRE ";
+
+            if (flags.HasFlag(CueTrackFlag.SCMS))
+                outputFlagString += "SCMS ";
+
+            if (flags.HasFlag(CueTrackFlag.DATA))
+                outputFlagString += "DATA ";
+
+            return outputFlagString.Trim();
+        }
+    }
+}

DICUI.Library/CueSheets/PostGap.cs

@@ -0,0 +1,92 @@
+using System.IO;
+using System.Linq;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// Represents POSTGAP information of a track
+    /// </summary>
+    public class PostGap
+    {
+        /// <summary>
+        /// Length of POSTGAP in minutes
+        /// </summary>
+        public int Minutes { get; set; }
+
+        /// <summary>
+        /// Length of POSTGAP in seconds
+        /// </summary>
+        /// <remarks>There are 60 seconds in a minute</remarks>
+        public int Seconds { get; set; }
+
+        /// <summary>
+        /// Length of POSTGAP in frames.
+        /// </summary>
+        /// <remarks>There are 75 frames per second</remarks>
+        public int Frames { get; set; }
+
+        /// Create an empty POSTGAP
+        /// </summary>
+        public PostGap()
+        {
+        }
+
+        /// <summary>
+        /// Create a POSTGAP from a mm:ss:ff length
+        /// </summary>
+        /// <param name="length">String to get length information from</param>
+        public PostGap(string length)
+        {
+            // Ignore empty lines
+            if (string.IsNullOrWhiteSpace(length))
+                return; // TODO: Make this throw an exception
+
+            // Ignore lines that don't contain the correct information
+            if (length.Length != 8 || length.Count(c => c == ':') != 2)
+                return; // TODO: Make this throw an exception
+
+            // Split the line
+            string[] splitLength = length.Split(':');
+            if (splitLength.Length != 3)
+                return; // TODO: Make this throw an exception
+
+            // Parse the lengths
+            int[] lengthSegments = new int[3];
+
+            // Minutes
+            if (!int.TryParse(splitLength[0], out lengthSegments[0]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[0] < 0)
+                return; // TODO: Make this throw an exception
+
+            // Seconds
+            if (!int.TryParse(splitLength[1], out lengthSegments[1]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[1] < 0 || lengthSegments[1] > 60)
+                return; // TODO: Make this throw an exception
+
+            // Frames
+            if (!int.TryParse(splitLength[2], out lengthSegments[2]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[2] < 0 || lengthSegments[2] > 75)
+                return; // TODO: Make this throw an exception
+
+            // Set the values
+            this.Minutes = lengthSegments[0];
+            this.Seconds = lengthSegments[1];
+            this.Frames = lengthSegments[2];
+        }
+
+        /// <summary>
+        /// Write the POSTGAP out to a stream
+        /// </summary>
+        /// <param name="sw">StreamWriter to write to</param>
+        public void Write(StreamWriter sw)
+        {
+            sw.WriteLine($"    POSTGAP {this.Minutes:D2}:{this.Seconds:D2}:{this.Frames:D2}");
+        }
+    }
+}

DICUI.Library/CueSheets/PreGap.cs

@@ -0,0 +1,93 @@
+using System.IO;
+using System.Linq;
+
+/// <remarks>
+/// Information sourced from http://web.archive.org/web/20070221154246/http://www.goldenhawk.com/download/cdrwin.pdf
+/// </remarks>
+namespace DICUI.CueSheets
+{
+    /// <summary>
+    /// Represents PREGAP information of a track
+    /// </summary>
+    public class PreGap
+    {
+        /// <summary>
+        /// Length of PREGAP in minutes
+        /// </summary>
+        public int Minutes { get; set; }
+
+        /// <summary>
+        /// Length of PREGAP in seconds
+        /// </summary>
+        /// <remarks>There are 60 seconds in a minute</remarks>
+        public int Seconds { get; set; }
+
+        /// <summary>
+        /// Length of PREGAP in frames.
+        /// </summary>
+        /// <remarks>There are 75 frames per second</remarks>
+        public int Frames { get; set; }
+
+        /// <summary>
+        /// Create an empty PREGAP
+        /// </summary>
+        public PreGap()
+        {
+        }
+
+        /// <summary>
+        /// Create a PREGAP from a mm:ss:ff length
+        /// </summary>
+        /// <param name="length">String to get length information from</param>
+        public PreGap(string length)
+        {
+            // Ignore empty lines
+            if (string.IsNullOrWhiteSpace(length))
+                return; // TODO: Make this throw an exception
+
+            // Ignore lines that don't contain the correct information
+            if (length.Length != 8 || length.Count(c => c == ':') != 2)
+                return; // TODO: Make this throw an exception
+
+            // Split the line
+            string[] splitLength = length.Split(':');
+            if (splitLength.Length != 3)
+                return; // TODO: Make this throw an exception
+
+            // Parse the lengths
+            int[] lengthSegments = new int[3];
+
+            // Minutes
+            if (!int.TryParse(splitLength[0], out lengthSegments[0]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[0] < 0)
+                return; // TODO: Make this throw an exception
+
+            // Seconds
+            if (!int.TryParse(splitLength[1], out lengthSegments[1]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[1] < 0 || lengthSegments[1] > 60)
+                return; // TODO: Make this throw an exception
+
+            // Frames
+            if (!int.TryParse(splitLength[2], out lengthSegments[2]))
+                return; // TODO: Make this throw an exception
+            else if (lengthSegments[2] < 0 || lengthSegments[2] > 75)
+                return; // TODO: Make this throw an exception
+
+            // Set the values
+            this.Minutes = lengthSegments[0];
+            this.Seconds = lengthSegments[1];
+            this.Frames = lengthSegments[2];
+        }
+
+        /// <summary>
+        /// Write the PREGAP out to a stream
+        /// </summary>
+        /// <param name="sw">StreamWriter to write to</param>
+        public void Write(StreamWriter sw)
+        {
+            sw.WriteLine($"    PREGAP {this.Minutes:D2}:{this.Seconds:D2}:{this.Frames:D2}");
+        }
+    }
+}

DICUI.Library/DD/Constants.cs

@@ -0,0 +1,31 @@
+namespace DICUI.DD
+{
+    /// <summary>
+    /// Top-level commands for DD
+    /// </summary>
+    public static class CommandStrings
+    {
+        public const string List = "--list";
+    }
+
+    /// <summary>
+    /// Dumping flags for DD
+    /// </summary>
+    public static class FlagStrings
+    {
+        // Boolean flags
+        public const string Progress = "--progress";
+        public const string Size = "--size";
+
+        // Int64 flags
+        public const string BlockSize = "bs";
+        public const string Count = "count";
+        public const string Seek = "seek";
+        public const string Skip = "skip";
+
+        // String flags
+        public const string Filter = "--filter";
+        public const string InputFile = "if";
+        public const string OutputFile = "of";
+    }
+}

DICUI.Library/DD/Converters.cs

@@ -0,0 +1,104 @@
+using DICUI.Data;
+
+namespace DICUI.DD
+{
+    public static class Converters
+    {
+        #region Cross-enumeration conversions
+
+        /// <summary>
+        /// Get the default extension for a given disc type
+        /// </summary>
+        /// <param name="type">MediaType value to check</param>
+        /// <returns>Valid extension (with leading '.'), null on error</returns>
+        public static string Extension(MediaType? type)
+        {
+            // DD has a single, unified output format by default
+            return ".bin";
+        }
+
+        #endregion
+
+        #region Convert to Long Name
+
+        /// <summary>
+        /// Get the string representation of the Command enum values
+        /// </summary>
+        /// <param name="command">Command value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Command command)
+        {
+            switch (command)
+            {
+                case Command.List:
+                    return CommandStrings.List;
+
+                case Command.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        /// <summary>
+        /// Get the string representation of the Flag enum values
+        /// </summary>
+        /// <param name="command">Flag value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Flag flag)
+        {
+            switch (flag)
+            {
+                // Boolean flags
+                case Flag.Progress:
+                    return FlagStrings.Progress;
+                case Flag.Size:
+                    return FlagStrings.Size;
+
+                // Int64 flags
+                case Flag.BlockSize:
+                    return FlagStrings.BlockSize;
+                case Flag.Count:
+                    return FlagStrings.Count;
+                case Flag.Seek:
+                    return FlagStrings.Seek;
+                case Flag.Skip:
+                    return FlagStrings.Skip;
+
+                // String flags
+                case Flag.Filter:
+                    return FlagStrings.Filter;
+                case Flag.InputFile:
+                    return FlagStrings.InputFile;
+                case Flag.OutputFile:
+                    return FlagStrings.OutputFile;
+
+                case Flag.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        #endregion
+
+        #region Convert From String
+
+        /// <summary>
+        /// Get the Command enum value for a given string
+        /// </summary>
+        /// <param name="command">String value to convert</param>
+        /// <returns>Command represented by the string(s), if possible</returns>
+        public static Command StringToCommand(string command)
+        {
+            switch (command)
+            {
+                case CommandStrings.List:
+                    return Command.List;
+
+                default:
+                    return Command.NONE;
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/DD/Enumerations.cs

@@ -0,0 +1,34 @@
+namespace DICUI.DD
+{
+    /// <summary>
+    /// Supported DD commands
+    /// </summary>
+    public enum Command: int
+    {
+        NONE = 0, // For DD, this represents a normal dump
+        List,
+    }
+
+    /// <summary>
+    /// Supported DD flags
+    /// </summary>
+    public enum Flag : int
+    {
+        NONE = 0,
+
+        // Boolean flags
+        Progress,
+        Size,
+
+        // Int64 flags
+        BlockSize,
+        Count,
+        Seek,
+        Skip,
+
+        // String flags
+        Filter,
+        InputFile,
+        OutputFile,
+    }
+}

DICUI.Library/DD/Parameters.cs

@@ -0,0 +1,668 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.DD
+{
+    /// <summary>
+    /// Represents a generic set of DD parameters
+    /// </summary>
+    public class Parameters : BaseParameters
+    {
+        /// <summary>
+        /// Base command to run
+        /// </summary>
+        public Command BaseCommand { get; set; }
+
+        /// <summary>
+        /// Set of flags to pass to the executable
+        /// </summary>
+        protected Dictionary<Flag, bool?> _flags = new Dictionary<Flag, bool?>();
+        public bool? this[Flag key]
+        {
+            get
+            {
+                if (_flags.ContainsKey(key))
+                    return _flags[key];
+
+                return null;
+            }
+            set
+            {
+                _flags[key] = value;
+            }
+        }
+        protected internal IEnumerable<Flag> Keys => _flags.Keys;
+
+        #region Flag Values
+
+        public long? BlockSizeValue { get; set; }
+
+        public long? CountValue { get; set; }
+
+        // fixed, removable, disk, partition
+        public string FilterValue { get; set; }
+
+        public string InputFileValue { get; set; }
+
+        public string OutputFileValue { get; set; }
+
+        public long? SeekValue { get; set; }
+
+        public long? SkipValue { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Populate a Parameters object from a param string
+        /// </summary>
+        /// <param name="parameters">String possibly representing a set of parameters</param>
+        public Parameters(string parameters)
+            : base(parameters)
+        {
+            this.InternalProgram = InternalProgram.DD;
+        }
+
+        /// <summary>
+        /// Generate parameters based on a set of known inputs
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="quietMode">Enable quiet mode (no beeps)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        public Parameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, bool quietMode, int retryCount)
+            : base(system, type, driveLetter, filename, driveSpeed, paranoid, quietMode, retryCount)
+        {
+        }
+
+        /// <summary>
+        /// Blindly generate a parameter string based on the inputs
+        /// </summary>
+        /// <returns>Correctly formatted parameter string, null on error</returns>
+        public override string GenerateParameters()
+        {
+            List<string> parameters = new List<string>();
+
+            if (BaseCommand != Command.NONE)
+                parameters.Add(Converters.LongName(BaseCommand));
+
+            #region Boolean flags
+
+            // Progress
+            if (GetSupportedCommands(Flag.Progress).Contains(BaseCommand))
+            {
+                if (this[Flag.Progress] == true)
+                    parameters.Add($"{this[Flag.Progress]}");
+            }
+
+            // Size
+            if (GetSupportedCommands(Flag.Size).Contains(BaseCommand))
+            {
+                if (this[Flag.Size] == true)
+                    parameters.Add($"{this[Flag.Size]}");
+            }
+
+            #endregion
+
+            #region Int64 flags
+
+            // Block Size
+            if (GetSupportedCommands(Flag.BlockSize).Contains(BaseCommand))
+            {
+                if (this[Flag.BlockSize] == true && BlockSizeValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.BlockSize)}={BlockSizeValue}");
+            }
+
+            // Count
+            if (GetSupportedCommands(Flag.Count).Contains(BaseCommand))
+            {
+                if (this[Flag.Count] == true && CountValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.Count)}={CountValue}");
+            }
+
+            // Seek
+            if (GetSupportedCommands(Flag.Seek).Contains(BaseCommand))
+            {
+                if (this[Flag.Seek] == true && SeekValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.Seek)}={SeekValue}");
+            }
+
+            // Skip
+            if (GetSupportedCommands(Flag.Skip).Contains(BaseCommand))
+            {
+                if (this[Flag.Skip] == true && SkipValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.Skip)}={SkipValue}");
+            }
+
+            #endregion
+
+            #region String flags
+
+            // Filter
+            if (GetSupportedCommands(Flag.Filter).Contains(BaseCommand))
+            {
+                if (this[Flag.Filter] == true && FilterValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.Filter)}={FilterValue}");
+            }
+
+            // Input File
+            if (GetSupportedCommands(Flag.InputFile).Contains(BaseCommand))
+            {
+                if (this[Flag.InputFile] == true && InputFileValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.InputFile)}={InputFileValue}");
+                else
+                    return null;
+            }
+
+            // Output File
+            if (GetSupportedCommands(Flag.OutputFile).Contains(BaseCommand))
+            {
+                if (this[Flag.OutputFile] == true && OutputFileValue != null)
+                    parameters.Add($"{Converters.LongName(Flag.OutputFile)}={OutputFileValue}");
+                else
+                    return null;
+            }
+
+            #endregion
+
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Get the input path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string InputPath() => InputFileValue;
+
+        /// <summary>
+        /// Get the output path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string OutputPath() => OutputFileValue;
+
+        /// <summary>
+        /// Get the processing speed from the implementation
+        /// </summary>
+        /// <returns>int? representing the speed, null on error</returns>
+        /// <remarks>DD does not support drive speeds</remarks>
+        public override int? GetSpeed() => 1;
+
+        /// <summary>
+        /// Set the processing speed int the implementation
+        /// </summary>
+        /// <param name="speed">int? representing the speed</param>
+        /// <remarks>DD does not support drive speeds</remarks>
+        public override void SetSpeed(int? speed)
+        {
+        }
+
+        /// <summary>
+        /// Get the MediaType from the current set of parameters
+        /// </summary>
+        /// <returns>MediaType value if successful, null on error</returns>
+        /// <remarks>DD does not know the difference between media types</remarks>
+        public override MediaType? GetMediaType() => null;
+
+        /// <summary>
+        /// Gets if the current command is considered a dumping command or not
+        /// </summary>
+        /// <returns>True if it's a dumping command, false otherwise</returns>
+        public override bool IsDumpingCommand()
+        {
+            switch (this.BaseCommand)
+            {
+                case Command.List:
+                    return false;
+                default:
+                    return true;
+            }
+        }
+
+        /// <summary>
+        /// Reset all special variables to have default values
+        /// </summary>
+        protected override void ResetValues()
+        {
+            BaseCommand = Command.NONE;
+
+            _flags = new Dictionary<Flag, bool?>();
+
+            BlockSizeValue = null;
+            CountValue = null;
+            InputFileValue = null;
+            OutputFileValue = null;
+            SeekValue = null;
+            SkipValue = null;
+        }
+
+        /// <summary>
+        /// Set default parameters for a given system and media type
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        protected override void SetDefaultParameters(
+            KnownSystem? system,
+            MediaType? type,
+            char driveLetter,
+            string filename,
+            int? driveSpeed,
+            bool paranoid,
+            int retryCount)
+        {
+            BaseCommand = Command.NONE;
+
+            this[Flag.InputFile] = true;
+            InputFileValue = $"\\\\?\\{driveLetter}:";
+
+            this[Flag.OutputFile] = true;
+            OutputFileValue = filename;
+
+            // TODO: Add more common block sizes
+            this[Flag.BlockSize] = true;
+            switch (type)
+            {
+                case MediaType.FloppyDisk:
+                    BlockSizeValue = 1440 * 1024;
+                    break;
+
+                default:
+                    BlockSizeValue = 1024 * 1024 * 1024;
+                    break;
+            }
+
+            this[Flag.Progress] = true;
+            this[Flag.Size] = true;
+        }
+
+        /// <summary>
+        /// Scan a possible parameter string and populate whatever possible
+        /// </summary>
+        /// <param name="parameters">String possibly representing parameters</param>
+        /// <returns></returns>
+        protected override bool ValidateAndSetParameters(string parameters)
+        {
+            // The string has to be valid by itself first
+            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
+            parameters = parameters.Trim();
+            List<string> parts = Regex.Matches(parameters, @"[\""].+?[\""]|[^ ]+")
+                .Cast<Match>()
+                .Select(m => m.Value)
+                .ToList();
+
+            // Determine what the commandline should look like given the first item
+            int start = 0;
+            BaseCommand = Converters.StringToCommand(parts[0]);
+            if (BaseCommand != Command.NONE)
+                start = 1;
+
+            // Loop through all auxilary flags, if necessary
+            int i = 0;
+            for (i = start; i < parts.Count; i++)
+            {
+                // Flag read-out values
+                long? longValue = null;
+                string stringValue = null;
+
+                // Keep a count of keys to determine if we should break out to filename handling or not
+                int keyCount = Keys.Count();
+
+                #region Boolean flags
+
+                // Progress
+                ProcessBooleanParameter(parts, FlagStrings.Progress, Flag.Progress, ref i);
+
+                // Size
+                ProcessBooleanParameter(parts, FlagStrings.Size, Flag.Size, ref i);
+
+                #endregion
+
+                #region Int64 flags
+
+                // Block Size
+                longValue = ProcessInt64Parameter(parts, FlagStrings.BlockSize, Flag.BlockSize, ref i);
+                if (longValue == Int64.MinValue)
+                    return false;
+                else if (longValue != null)
+                    BlockSizeValue = longValue;
+
+                // Count
+                longValue = ProcessInt64Parameter(parts, FlagStrings.Count, Flag.Count, ref i);
+                if (longValue == Int64.MinValue)
+                    return false;
+                else if (longValue != null)
+                    CountValue = longValue;
+
+                // Seek
+                longValue = ProcessInt64Parameter(parts, FlagStrings.Seek, Flag.Seek, ref i);
+                if (longValue == Int64.MinValue)
+                    return false;
+                else if (longValue != null)
+                    SeekValue = longValue;
+
+                // Skip
+                longValue = ProcessInt64Parameter(parts, FlagStrings.Skip, Flag.Skip, ref i);
+                if (longValue == Int64.MinValue)
+                    return false;
+                else if (longValue != null)
+                    SkipValue = longValue;
+
+                #endregion
+
+                #region String flags
+
+                // Filter (fixed, removable, disk, partition)
+                stringValue = ProcessStringParameter(parts, FlagStrings.Filter, Flag.Filter, ref i);
+                if (!string.IsNullOrEmpty(stringValue))
+                    FilterValue = stringValue;
+
+                // Input File
+                stringValue = ProcessStringParameter(parts, FlagStrings.InputFile, Flag.InputFile, ref i);
+                if (string.Equals(stringValue, string.Empty))
+                    return false;
+                else if (stringValue != null)
+                    InputFileValue = stringValue;
+
+                // Output File
+                stringValue = ProcessStringParameter(parts, FlagStrings.OutputFile, Flag.OutputFile, ref i);
+                if (string.Equals(stringValue, string.Empty))
+                    return false;
+                else if (stringValue != null)
+                    OutputFileValue = stringValue;
+
+                #endregion
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Validate if all required output files exist
+        /// </summary>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <returns></returns>
+        public override bool CheckAllOutputFilesExist(string basePath, KnownSystem? system, MediaType? type, IProgress<Result> progress = null)
+        {
+            // TODO: Figure out what sort of output files are expected... just `.bin`?
+            return true;
+        }
+
+        /// <summary>
+        /// Generate a SubmissionInfo for the output files
+        /// </summary>
+        /// <param name="info">Base submission info to fill in specifics for</param>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="drive">Drive representing the disc to get information from</param>
+        /// <returns></returns>
+        public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, KnownSystem? system, MediaType? type, Drive drive)
+        {
+            // TODO: Fill in submission info specifics for DD
+            string outputDirectory = Path.GetDirectoryName(basePath);
+
+            switch (type)
+            {
+                // Determine type-specific differences
+            }
+
+            switch (system)
+            {
+                case KnownSystem.KonamiPython2:
+                    if (GetPlayStationExecutableInfo(drive?.Letter, out string pythonTwoSerial, out Region? pythonTwoRegion, out string pythonTwoDate))
+                    {
+                        info.CommonDiscInfo.Comments += $"Internal Disc Serial: {pythonTwoSerial}\n";
+                        info.CommonDiscInfo.Region = info.CommonDiscInfo.Region ?? pythonTwoRegion;
+                        info.CommonDiscInfo.EXEDateBuildDate = pythonTwoDate;
+                    }
+
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    break;
+
+                case KnownSystem.SonyPlayStation:
+                    if (GetPlayStationExecutableInfo(drive?.Letter, out string playstationSerial, out Region? playstationRegion, out string playstationDate))
+                    {
+                        info.CommonDiscInfo.Comments += $"Internal Disc Serial: {playstationSerial}\n";
+                        info.CommonDiscInfo.Region = info.CommonDiscInfo.Region ?? playstationRegion;
+                        info.CommonDiscInfo.EXEDateBuildDate = playstationDate;
+                    }
+
+                    info.CopyProtection.AntiModchip = GetPlayStationAntiModchipDetected(drive?.Letter) ? YesNo.Yes : YesNo.No;
+                    break;
+
+                case KnownSystem.SonyPlayStation2:
+                    if (GetPlayStationExecutableInfo(drive?.Letter, out string playstationTwoSerial, out Region? playstationTwoRegion, out string playstationTwoDate))
+                    {
+                        info.CommonDiscInfo.Comments += $"Internal Disc Serial: {playstationTwoSerial}\n";
+                        info.CommonDiscInfo.Region = info.CommonDiscInfo.Region ?? playstationTwoRegion;
+                        info.CommonDiscInfo.EXEDateBuildDate = playstationTwoDate;
+                    }
+
+                    info.VersionAndEditions.Version = GetPlayStation2Version(drive?.Letter) ?? "";
+                    break;
+
+                case KnownSystem.SonyPlayStation4:
+                    info.VersionAndEditions.Version = GetPlayStation4Version(drive?.Letter) ?? "";
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Get the list of commands that use a given flag
+        /// </summary>
+        /// <param name="flag">Flag value to get commands for</param>
+        /// <returns>List of Commands, if possible</returns>
+        private static List<Command> GetSupportedCommands(Flag flag)
+        {
+            var commands = new List<Command>();
+            switch (flag)
+            {
+                #region Boolean flags
+
+                case Flag.Progress:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.Size:
+                    commands.Add(Command.NONE);
+                    break;
+
+                #endregion
+
+                #region Int64 flags
+
+                case Flag.BlockSize:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.Count:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.Seek:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.Skip:
+                    commands.Add(Command.NONE);
+                    break;
+
+                #endregion
+
+                #region String flags
+
+                case Flag.Filter:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.InputFile:
+                    commands.Add(Command.NONE);
+                    break;
+                case Flag.OutputFile:
+                    commands.Add(Command.NONE);
+                    break;
+
+                #endregion
+
+                case Flag.NONE:
+                default:
+                    return commands;
+            }
+
+            return commands;
+        }
+
+        /// <summary>
+        /// Process a boolean parameter
+        /// </summary>
+        /// <param name="parts">List of parts to be referenced</param>
+        /// <param name="flagString">Flag string to check</param>
+        /// <param name="flag">Flag value corresponding to the flag</param>
+        /// <param name="i">Reference to the position in the parts</param>
+        /// <returns>True if the parameter was processed successfully or skipped, false otherwise</returns>
+        private bool ProcessBooleanParameter(List<string> parts, string flagString, Flag flag, ref int i)
+        {
+            if (parts == null)
+                return false;
+
+            if (parts[i] == flagString)
+            {
+                if (!GetSupportedCommands(flag).Contains(BaseCommand))
+                    return false;
+
+                this[flag] = true;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Process an Int64 parameter
+        /// </summary>
+        /// <param name="parts">List of parts to be referenced</param>
+        /// <param name="flagString">Flag string to check</param>
+        /// <param name="flag">Flag value corresponding to the flag</param>
+        /// <param name="i">Reference to the position in the parts</param>
+        /// <returns>Int64 value if success, Int64.MinValue if skipped, null on error/returns>
+        private long? ProcessInt64Parameter(List<string> parts, string flagString, Flag flag, ref int i)
+        {
+            if (parts == null)
+                return null;
+
+            if (parts[i].StartsWith(flagString))
+            {
+                if (!GetSupportedCommands(flag).Contains(BaseCommand))
+                    return null;
+
+                string[] commandParts = parts[i].Split('=');
+                if (commandParts.Length != 2)
+                    return null;
+
+                string valuePart = commandParts[1];
+                long factor = 1;
+
+                // Characters
+                if (valuePart.EndsWith("c", StringComparison.Ordinal))
+                {
+                    factor = 1;
+                    valuePart.TrimEnd('c');
+                }
+
+                // Words
+                else if (valuePart.EndsWith("w", StringComparison.Ordinal))
+                {
+                    factor = 2;
+                    valuePart.TrimEnd('w');
+                }
+
+                // Double Words
+                else if (valuePart.EndsWith("d", StringComparison.Ordinal))
+                {
+                    factor = 4;
+                    valuePart.TrimEnd('d');
+                }
+
+                // Quad Words
+                else if (valuePart.EndsWith("q", StringComparison.Ordinal))
+                {
+                    factor = 8;
+                    valuePart.TrimEnd('q');
+                }
+
+                // Kilobytes
+                else if (valuePart.EndsWith("k", StringComparison.Ordinal))
+                {
+                    factor = 1024;
+                    valuePart.TrimEnd('k');
+                }
+
+                // Megabytes
+                else if (valuePart.EndsWith("M", StringComparison.Ordinal))
+                {
+                    factor = 1024 * 1024;
+                    valuePart.TrimEnd('M');
+                }
+
+                // Gigabytes
+                else if (valuePart.EndsWith("G", StringComparison.Ordinal))
+                {
+                    factor = 1024 * 1024 * 1024;
+                    valuePart.TrimEnd('G');
+                }
+
+                if (!IsValidInt64(valuePart))
+                    return null;
+
+                this[flag] = true;
+                return long.Parse(valuePart) * factor;
+            }
+
+            return Int64.MinValue;
+        }
+
+        /// <summary>
+        /// Process a string parameter
+        /// </summary>
+        /// <param name="parts">List of parts to be referenced</param>
+        /// <param name="flagString">Flag string to check</param>
+        /// <param name="flag">Flag value corresponding to the flag</param>
+        /// <param name="i">Reference to the position in the parts</param>
+        /// <returns>String value if possible, string.Empty on missing, null on error</returns>
+        private string ProcessStringParameter(List<string> parts, string flagString, Flag flag, ref int i)
+        {
+            if (parts == null)
+                return null;
+
+            if (parts[i] == flagString)
+            {
+                if (!GetSupportedCommands(flag).Contains(BaseCommand))
+                    return null;
+
+                string[] commandParts = parts[i].Split('=');
+                if (commandParts.Length != 2)
+                    return null;
+
+                string valuePart = commandParts[1];
+
+                this[flag] = true;
+                return valuePart.Trim('"');
+            }
+
+            return string.Empty;
+        }
+    }
+}

DICUI.Library/DICUI.Library.csproj

@@ -1,80 +1,26 @@
-<?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>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
+    <Title>DICUI Library</Title>
     <AssemblyName>DICUI.Library</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <Description>Library code for DICUI and DICUI.Check</Description>
+    <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
+    <Copyright>Copyright (c)2019-2020</Copyright>
+    <RepositoryUrl>https://github.com/SabreTools/DICUI</RepositoryUrl>
+    <Version>1.18</Version>
+    <AssemblyVersion>1.18</AssemblyVersion>
+    <FileVersion>1.18</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+    <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 Condition="'$(TargetFramework)'!='netcoreapp3.1'">
+    <DefineConstants>NET_FRAMEWORK</DefineConstants>
   </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>
+
+  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
     <COMReference Include="IMAPI2">
       <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>
       <VersionMajor>1</VersionMajor>
@@ -94,8 +40,46 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <Compile Remove="Aaru\CICMMetadata\CICMMetadataEditor\**" />
+    <Compile Remove="Aaru\CICMMetadata\java\**" />
+    <Compile Remove="Aaru\CICMMetadata\samples\**" />
+    <EmbeddedResource Remove="Aaru\CICMMetadata\CICMMetadataEditor\**" />
+    <EmbeddedResource Remove="Aaru\CICMMetadata\java\**" />
+    <EmbeddedResource Remove="Aaru\CICMMetadata\samples\**" />
+    <None Remove="Aaru\CICMMetadata\CICMMetadataEditor\**" />
+    <None Remove="Aaru\CICMMetadata\java\**" />
+    <None Remove="Aaru\CICMMetadata\samples\**" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+
+  <ItemGroup>
+    <None Remove="Aaru\CICMMetadata\.editorconfig" />
+    <None Remove="Aaru\CICMMetadata\.git" />
+    <None Remove="Aaru\CICMMetadata\.gitignore" />
+    <None Remove="Aaru\CICMMetadata\.project" />
+    <None Remove="Aaru\CICMMetadata\build.sh" />
+    <None Remove="Aaru\CICMMetadata\cicm.xml" />
+    <None Remove="Aaru\CICMMetadata\cicm.xsd" />
+    <None Remove="Aaru\CICMMetadata\CICMMetadata.iml" />
+    <None Remove="Aaru\CICMMetadata\dotnet\cicm.vb" />
+    <None Remove="Aaru\CICMMetadata\README.md" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Management" />
+  </ItemGroup>
+
+</Project>

DICUI.Library/Data/BaseParameters.cs

@@ -0,0 +1,710 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.Data
+{
+    public abstract class BaseParameters
+    {
+        /// <summary>
+        /// Path to the executable
+        /// </summary>
+        public string ExecutablePath { get; set; }
+
+        /// <summary>
+        /// Program that this set of parameters represents
+        /// </summary>
+        public InternalProgram InternalProgram { get; set; }
+
+        /// <summary>
+        /// Process to track external program
+        /// </summary>
+        private Process process;
+
+        /// <summary>
+        /// Populate a Parameters object from a param string
+        /// </summary>
+        /// <param name="parameters">String possibly representing a set of parameters</param>
+        public BaseParameters(string parameters)
+        {
+            // If any parameters are not valid, wipe out everything
+            if (!ValidateAndSetParameters(parameters))
+            {
+                ResetValues();
+            }
+        }
+
+        /// <summary>
+        /// Generate parameters based on a set of known inputs
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="quietMode">Enable quiet mode (no beeps)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        public BaseParameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, bool quietMode, int retryCount)
+        {
+            SetDefaultParameters(system, type, driveLetter, filename, driveSpeed, paranoid, retryCount);
+        }
+
+        /// <summary>
+        /// Blindly generate a parameter string based on the inputs
+        /// </summary>
+        /// <returns>Correctly formatted parameter string, null on error</returns>
+        public abstract string GenerateParameters();
+
+        /// <summary>
+        /// Get the input path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public abstract string InputPath();
+
+        /// <summary>
+        /// Get the output path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public abstract string OutputPath();
+
+        /// <summary>
+        /// Get the processing speed from the implementation
+        /// </summary>
+        /// <returns>int? representing the speed, null on error</returns>
+        public abstract int? GetSpeed();
+
+        /// <summary>
+        /// Set the processing speed int the implementation
+        /// </summary>
+        /// <param name="speed">int? representing the speed</param>
+        public abstract void SetSpeed(int? speed);
+
+        /// <summary>
+        /// Get the MediaType from the current set of parameters
+        /// </summary>
+        /// <returns>MediaType value if successful, null on error</returns>
+        public abstract MediaType? GetMediaType();
+
+        /// <summary>
+        /// Gets if the current command is considered a dumping command or not
+        /// </summary>
+        /// <returns>True if it's a dumping command, false otherwise</returns>
+        public abstract bool IsDumpingCommand();
+
+        /// <summary>
+        /// Returns if the current Parameter object is valid
+        /// </summary>
+        /// <returns></returns>
+        public bool IsValid()
+        {
+            return GenerateParameters() != null;
+        }
+
+        /// <summary>
+        /// Reset all special variables to have default values
+        /// </summary>
+        protected abstract void ResetValues();
+
+        /// <summary>
+        /// Set default parameters for a given system and media type
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        protected abstract void SetDefaultParameters(
+            KnownSystem? system,
+            MediaType? type,
+            char driveLetter,
+            string filename,
+            int? driveSpeed,
+            bool paranoid,
+            int retryCount);
+
+        /// <summary>
+        /// Scan a possible parameter string and populate whatever possible
+        /// </summary>
+        /// <param name="parameters">String possibly representing parameters</param>
+        /// <returns></returns>
+        protected abstract bool ValidateAndSetParameters(string parameters);
+
+        /// <summary>
+        /// Validate if all required output files exist
+        /// </summary>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="progress">Optional result progress callback</param>
+        /// <returns></returns>
+        public abstract bool CheckAllOutputFilesExist(string basePath, KnownSystem? system, MediaType? type, IProgress<Result> progress = null);
+
+        /// <summary>
+        /// Generate a SubmissionInfo for the output files
+        /// </summary>
+        /// <param name="submissionInfo">Base submission info to fill in specifics for</param>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="drive">Drive representing the disc to get information from</param>
+        public abstract void GenerateSubmissionInfo(SubmissionInfo submissionInfo, string basePath, KnownSystem? system, MediaType? type, Drive drive);
+
+        /// <summary>
+        /// Run internal program
+        /// </summary>
+        public void ExecuteInternalProgram()
+        {
+            process = new Process()
+            {
+                StartInfo = new ProcessStartInfo()
+                {
+                    FileName = ExecutablePath,
+                    Arguments = GenerateParameters() ?? "",
+                },
+            };
+
+            process.Start();
+            process.WaitForExit();
+        }
+
+        /// <summary>
+        /// Run internal program async with an input set of parameters
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <returns>Standard output from commandline window</returns>
+        public async Task<string> ExecuteInternalProgram(BaseParameters parameters)
+        {
+            Process childProcess;
+            string output = await Task.Run(() =>
+            {
+                childProcess = new Process()
+                {
+                    StartInfo = new ProcessStartInfo()
+                    {
+                        FileName = parameters.ExecutablePath,
+                        Arguments = parameters.GenerateParameters(),
+                        CreateNoWindow = true,
+                        UseShellExecute = false,
+                        RedirectStandardInput = true,
+                        RedirectStandardOutput = true,
+                    },
+                };
+                childProcess.Start();
+                childProcess.WaitForExit(1000);
+
+                // Just in case, we want to push a button 5 times to clear any errors
+                for (int i = 0; i < 5; i++)
+                    childProcess.StandardInput.WriteLine("Y");
+
+                string stdout = childProcess.StandardOutput.ReadToEnd();
+                childProcess.Dispose();
+                return stdout;
+            });
+
+            return output;
+        }
+
+        /// <summary>
+        /// Cancel an in-progress dumping process
+        /// </summary>
+        public void KillInternalProgram()
+        {
+            try
+            {
+                if (process != null && !process.HasExited)
+                    process.Kill();
+            }
+            catch
+            { }
+        }
+
+        #region Parameter Parsing
+
+        /// <summary>
+        /// Returns whether or not the selected item exists
+        /// </summary>
+        /// <param name="parameters">List of parameters to check against</param>
+        /// <param name="index">Current index</param>
+        /// <returns>True if the next item exists, false otherwise</returns>
+        protected static bool DoesExist(List<string> parameters, int index)
+        {
+            if (index >= parameters.Count)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Get the full lines from the input file, if possible
+        /// </summary>
+        /// <param name="filename">file location</param>
+        /// <param name="binary">True if should read as binary, false otherwise (default)</param>
+        /// <returns>Full text of the file, null on error</returns>
+        protected static string GetFullFile(string filename, bool binary = false)
+        {
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(filename))
+                return null;
+
+            // If we're reading as binary
+            if (binary)
+            {
+                string hex = string.Empty;
+                using (BinaryReader br = new BinaryReader(File.OpenRead(filename)))
+                {
+                    while (br.BaseStream.Position < br.BaseStream.Length)
+                    {
+                        hex += Convert.ToString(br.ReadByte(), 16);
+                    }
+                }
+                return hex;
+            }
+
+            return string.Join("\n", File.ReadAllLines(filename));
+        }
+
+        /// <summary>
+        /// Returns whether a string is a flag (starts with '/')
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <returns>True if it's a flag, false otherwise</returns>
+        protected static bool IsFlag(string parameter)
+        {
+            if (parameter.Trim('\"').StartsWith("/"))
+                return true;
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid drive letter
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <returns>True if it's a valid drive letter, false otherwise</returns>
+        protected static bool IsValidDriveLetter(string parameter)
+        {
+            if (!Regex.IsMatch(parameter, @"^[A-Z]:?\\?$"))
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid bool
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <returns>True if it's a valid bool, false otherwise</returns>
+        protected static bool IsValidBool(string parameter)
+        {
+            return bool.TryParse(parameter, out bool _);
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid byte
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <param name="lowerBound">Lower bound (>=)</param>
+        /// <param name="upperBound">Upper bound (<=)</param>
+        /// <returns>True if it's a valid byte, false otherwise</returns>
+        protected static bool IsValidInt8(string parameter, sbyte lowerBound = -1, sbyte upperBound = -1)
+        {
+            if (!sbyte.TryParse(parameter, out sbyte temp))
+                return false;
+            else if (lowerBound != -1 && temp < lowerBound)
+                return false;
+            else if (upperBound != -1 && temp > upperBound)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid Int16
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <param name="lowerBound">Lower bound (>=)</param>
+        /// <param name="upperBound">Upper bound (<=)</param>
+        /// <returns>True if it's a valid Int16, false otherwise</returns>
+        protected static bool IsValidInt16(string parameter, short lowerBound = -1, short upperBound = -1)
+        {
+            if (!short.TryParse(parameter, out short temp))
+                return false;
+            else if (lowerBound != -1 && temp < lowerBound)
+                return false;
+            else if (upperBound != -1 && temp > upperBound)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid Int32
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <param name="lowerBound">Lower bound (>=)</param>
+        /// <param name="upperBound">Upper bound (<=)</param>
+        /// <returns>True if it's a valid Int32, false otherwise</returns>
+        protected static bool IsValidInt32(string parameter, int lowerBound = -1, int upperBound = -1)
+        {
+            if (!int.TryParse(parameter, out int temp))
+                return false;
+            else if (lowerBound != -1 && temp < lowerBound)
+                return false;
+            else if (upperBound != -1 && temp > upperBound)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns whether a string is a valid Int64
+        /// </summary>
+        /// <param name="parameter">String value to check</param>
+        /// <param name="lowerBound">Lower bound (>=)</param>
+        /// <param name="upperBound">Upper bound (<=)</param>
+        /// <returns>True if it's a valid Int64, false otherwise</returns>
+        protected static bool IsValidInt64(string parameter, long lowerBound = -1, long upperBound = -1)
+        {
+            if (!long.TryParse(parameter, out long temp))
+                return false;
+            else if (lowerBound != -1 && temp < lowerBound)
+                return false;
+            else if (upperBound != -1 && temp > upperBound)
+                return false;
+
+            return true;
+        }
+
+        #endregion
+
+        #region Common Information Extraction
+
+        /// <summary>
+        /// Get the split values for ISO-based media
+        /// </summary>
+        /// <param name="hashData">String representing the combined hash data</param>
+        /// <returns>True if extraction was successful, false otherwise</returns>
+        protected static bool GetISOHashValues(string hashData, out long size, out string crc32, out string md5, out string sha1)
+        {
+            size = -1; crc32 = null; md5 = null; sha1 = null;
+
+            if (string.IsNullOrWhiteSpace(hashData))
+                return false;
+
+            Regex hashreg = new Regex(@"<rom name="".*?"" size=""(.*?)"" crc=""(.*?)"" md5=""(.*?)"" sha1=""(.*?)""");
+            Match m = hashreg.Match(hashData);
+            if (m.Success)
+            {
+                Int64.TryParse(m.Groups[1].Value, out size);
+                crc32 = m.Groups[2].Value;
+                md5 = m.Groups[3].Value;
+                sha1 = m.Groups[4].Value;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get the existance of an anti-modchip string from a PlayStation disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <returns>Anti-modchip existance if possible, false on error</returns>
+        protected static bool GetPlayStationAntiModchipDetected(char? driveLetter)
+        {
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return false;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return false;
+
+            string enAntiModString = "     SOFTWARE TERMINATED\nCONSOLE MAY HAVE BEEN MODIFIED\n     CALL 1-888-780-7690";
+            string jpAntiModString = "強制終了しました。\n本体が改造されている\nおそれがあります。";
+
+            // Scan through each file to check for the anti-modchip strings
+            foreach (string path in Directory.EnumerateFiles(drivePath, "*", SearchOption.AllDirectories))
+            {
+                try
+                {
+                    // TODO: This is a memory hog
+                    string fileContents = File.ReadAllText(path);
+                    if (fileContents.Contains(enAntiModString) || fileContents.Contains(jpAntiModString))
+                        return true;
+                }
+                catch
+                {
+                    // No-op, we don't care what the error was
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Get the EXE date from a PlayStation disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <param name="serial">Internal disc serial, if possible</param>
+        /// <param name="region">Output region, if possible</param>
+        /// <param name="date">Output EXE date in "yyyy-mm-dd" format if possible, null on error</param>
+        /// <returns></returns>
+        protected static bool GetPlayStationExecutableInfo(char? driveLetter, out string serial, out Region? region, out string date)
+        {
+            serial = null; region = null; date = null;
+
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return false;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return false;
+
+            // Get the two paths that we will need to check
+            string psxExePath = Path.Combine(drivePath, "PSX.EXE");
+            string systemCnfPath = Path.Combine(drivePath, "SYSTEM.CNF");
+
+            // Try both of the common paths that contain information
+            string exeName = null;
+
+            // Read the CNF file as an INI file
+            var systemCnf = new IniFile(systemCnfPath);
+            string bootValue = string.Empty;
+
+            // PlayStation uses "BOOT" as the key
+            if (systemCnf.ContainsKey("BOOT"))
+                bootValue = systemCnf["BOOT"];
+
+            // PlayStation 2 uses "BOOT2" as the key
+            if (systemCnf.ContainsKey("BOOT2"))
+                bootValue = systemCnf["BOOT2"];
+
+            // If we had any boot value, parse it and get the executable name
+            if (!string.IsNullOrEmpty(bootValue))
+            {
+                var match = Regex.Match(bootValue, @"cdrom.?:\\?(.*)");
+                if (match != null && match.Groups.Count > 1)
+                {
+                    exeName = match.Groups[1].Value;
+                    exeName = exeName.Split(';')[0];
+                    serial = exeName.Replace('_', '-').Replace(".", string.Empty);
+                }
+            }
+
+            // If the SYSTEM.CNF value can't be found, try PSX.EXE
+            if (string.IsNullOrWhiteSpace(exeName) && File.Exists(psxExePath))
+                exeName = "PSX.EXE";
+
+            // If neither can be found, we return false
+            if (string.IsNullOrWhiteSpace(exeName))
+                return false;
+
+            // Get the region, if possible
+            region = GetPlayStationRegion(exeName);
+
+            // Now that we have the EXE name, try to get the fileinfo for it
+            string exePath = Path.Combine(drivePath, exeName);
+            if (!File.Exists(exePath))
+                return false;
+
+            // Fix the Y2K timestamp issue
+            FileInfo fi = new FileInfo(exePath);
+            DateTime dt = new DateTime(fi.LastWriteTimeUtc.Year >= 1900 && fi.LastWriteTimeUtc.Year < 1920 ? 2000 + fi.LastWriteTimeUtc.Year % 100 : fi.LastWriteTimeUtc.Year,
+                fi.LastWriteTimeUtc.Month, fi.LastWriteTimeUtc.Day);
+            date = dt.ToString("yyyy-MM-dd");
+
+            return true;
+        }
+
+        /// <summary>
+        /// Get the version from a PlayStation 2 disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <returns>Game version if possible, null on error</returns>
+        protected static string GetPlayStation2Version(char? driveLetter)
+        {
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return null;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return null;
+
+            // Get the SYSTEM.CNF path to check
+            string systemCnfPath = Path.Combine(drivePath, "SYSTEM.CNF");
+
+            // Try to parse the SYSTEM.CNF file
+            var systemCnf = new IniFile(systemCnfPath);
+            if (systemCnf.ContainsKey("VER"))
+                return systemCnf["VER"];
+            
+            // If "VER" can't be found, we can't do much
+            return null;
+        }
+
+        /// <summary>
+        /// Get the version from a PlayStation 4 disc, if possible
+        /// </summary>
+        /// <param name="driveLetter">Drive letter to use to check</param>
+        /// <returns>Game version if possible, null on error</returns>
+        protected static string GetPlayStation4Version(char? driveLetter)
+        {
+            // If there's no drive letter, we can't do this part
+            if (driveLetter == null)
+                return null;
+
+            // If the folder no longer exists, we can't do this part
+            string drivePath = driveLetter + ":\\";
+            if (!Directory.Exists(drivePath))
+                return null;
+
+            // If we can't find param.sfo, we don't have a PlayStation 4 disc
+            string paramSfoPath = Path.Combine(drivePath, "bd", "param.sfo");
+            if (!File.Exists(paramSfoPath))
+                return null;
+
+            // Let's try reading param.sfo to find the version at the end of the file
+            try
+            {
+                using (BinaryReader br = new BinaryReader(File.OpenRead(paramSfoPath)))
+                {
+                    br.BaseStream.Seek(-0x08, SeekOrigin.End);
+                    return new string(br.ReadChars(5));
+                }
+            }
+            catch
+            {
+                // We don't care what the error was
+                return null;
+            }
+        }
+
+        #endregion
+
+        #region Category Extraction
+
+        /// <summary>
+        /// Determine the category based on the UMDImageCreator string
+        /// </summary>
+        /// <param name="region">String representing the category</param>
+        /// <returns>Category, if possible</returns>
+        protected static DiscCategory? GetUMDCategory(string category)
+        {
+            switch (category)
+            {
+                case "GAME":
+                    return DiscCategory.Games;
+                case "VIDEO":
+                    return DiscCategory.Video;
+                case "AUDIO":
+                    return DiscCategory.Audio;
+                default:
+                    return null;
+            }
+        }
+
+        #endregion
+
+        #region Region Extraction
+
+        /// <summary>
+        /// Determine the region based on the PlayStation serial code
+        /// </summary>
+        /// <param name="serial">PlayStation serial code</param>
+        /// <returns>Region mapped from name, if possible</returns>
+        protected static Region? GetPlayStationRegion(string serial)
+        {
+            // Standardized "S" serials
+            if (serial.StartsWith("S"))
+            {
+                // string publisher = serial[0] + serial[1];
+                // char secondRegion = serial[3];
+                switch (serial[2])
+                {
+                    case 'A':
+                        return Region.Asia;
+                    case 'C':
+                        return Region.China;
+                    case 'E':
+                        return Region.Europe;
+                    case 'J':
+                        return Region.JapanKorea;
+                    case 'K':
+                        return Region.Korea;
+                    case 'P':
+                        return Region.Japan;
+                    case 'U':
+                        return Region.USA;
+                }
+            }
+
+            // Japan-only special serial
+            else if (serial.StartsWith("PAPX"))
+                return Region.Japan;
+
+            // Region appears entirely random
+            else if (serial.StartsWith("PABX"))
+                return null;
+
+            // Japan-only special serial
+            else if (serial.StartsWith("PCBX"))
+                return Region.Japan;
+
+            // Single disc known, Japan
+            else if (serial.StartsWith("PDBX"))
+                return Region.Japan;
+
+            // Single disc known, Europe
+            else if (serial.StartsWith("PEBX"))
+                return Region.Europe;
+
+            return null;
+        }
+
+        /// <summary>
+        /// Determine the region based on the XGD serial character
+        /// </summary>
+        /// <param name="region">Character denoting the region</param>
+        /// <returns>Region, if possible</returns>
+        protected static Region? GetXgdRegion(char region)
+        {
+            switch (region)
+            {
+                case 'W':
+                    return Region.World;
+                case 'A':
+                    return Region.USA;
+                case 'J':
+                    return Region.JapanAsia;
+                case 'E':
+                    return Region.Europe;
+                case 'K':
+                    return Region.USAJapan;
+                case 'L':
+                    return Region.USAEurope;
+                case 'H':
+                    return Region.JapanEurope;
+                default:
+                    return null;
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/Data/Constants.cs

@@ -1,59 +1,49 @@
-namespace DICUI.Data
+using System.Collections.Generic;
+using System.Linq;
+
+namespace DICUI.Data
 {
     /// <summary>
-    /// Top-level commands for DiscImageCreator
+    /// Constant values for UI
     /// </summary>
-    public static class DICCommandStrings
+    public static class Interface
     {
-        public const string Audio = "audio";
-        public const string BluRay = "bd";
-        public const string Close = "close";
-        public const string CompactDisc = "cd";
-        public const string Data = "data";
-        public const string DigitalVideoDisc = "dvd";
-        public const string DriveSpeed = "ls";
-        public const string Eject = "eject";
-        public const string Floppy = "fd";
-        public const string GDROM = "gd";
-        public const string MDS = "mds";
-        public const string Reset = "reset";
-        public const string Start = "start";
-        public const string Stop = "stop";
-        public const string Sub = "sub";
-        public const string Swap = "swap";
-        public const string XBOX = "xbox";
-        public const string XBOXSwap = "xboxswap";
-        public const string XGD2Swap = "xgd2swap";
-        public const string XGD3Swap = "xgd3swap";
-    }
+        // Button values
+        public const string StartDumping = "Start Dumping";
+        public const string StopDumping = "Stop Dumping";
 
-    /// <summary>
-    /// Dumping flags for DiscImageCreator
-    /// </summary>
-    public static class DICFlagStrings
-    {
-        public const string AddOffset = "/a";
-        public const string AMSF = "/p";
-        public const string BEOpcode = "/be";
-        public const string C2Opcode = "/c2";
-        public const string CopyrightManagementInformation = "/c";
-        public const string D8Opcode = "/d8";
-        public const string DisableBeep = "/q";
-        public const string ForceUnitAccess = "/f";
-        public const string MCN = "/m";
-        public const string MultiSession = "/ms";
-        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 Raw = "/raw";
-        public const string Reverse = "/r";
-        public const string ScanAntiMod = "/am";
-        public const string ScanFileProtect = "/sf";
-        public const string ScanSectorProtect = "/ss";
-        public const string SeventyFour = "/74";
-        public const string SubchannelReadLevel = "/s";
+        // Byte arrays for signatures
+        public static readonly byte[] SaturnSectorZeroStart = new byte[] { 0x53, 0x45, 0x47, 0x41, 0x20, 0x53, 0x45, 0x47, 0x41, 0x53, 0x41, 0x54, 0x55, 0x52, 0x4E, 0x20 };
+
+        // 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; } = new List<int> { 1 };
+
+        /// <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.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                    return dvd;
+                case MediaType.BluRay:
+                    return bd;
+                default:
+                    return unknown;
+            }
+        }
     }
 
     /// <summary>
@@ -64,6 +54,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";
@@ -71,36 +62,43 @@
         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 Ring";
+        public const string MasteringRingField = "Mastering Code (laser branded/etched)";
         public const string MasteringSIDField = "Mastering SID Code";
         public const string MouldSIDField = "Mould SID Code";
         public const string AdditionalMouldField = "Additional Mould";
-        public const string ToolstampField = "Toolstamp or Mastering Code";
+        public const string ToolstampField = "Toolstamp or Mastering Code (engraved/stamped)";
 
         // Automatic Information
 
         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 SaturnHeaderField = "Header";
-        public const string SaturnBuildDateField = "Build Date";
         public const string XBOXDMIHash = "DMI.bin Hashes";
         public const string XBOXPFIHash = "PFI.bin Hashes";
         public const string XBOXSSHash = "SS.bin Hashes";
@@ -112,7 +110,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,61 +1,34 @@
-namespace DICUI.Data
+using System;
+
+namespace DICUI.Data
 {
     /// <summary>
-    /// Supported DIC commands
+    /// Drive type for dumping
     /// </summary>
-    public enum DICCommand
+    public enum InternalDriveType
     {
-        NONE = 0,
-        Audio,
-        BluRay,
-        Close,
-        CompactDisc,
-        Data,
-        DigitalVideoDisc,
-        DriveSpeed,
-        Eject,
+        Optical,
         Floppy,
-        GDROM,
-        MDS,
-        Reset,
-        Start,
-        Stop,
-        Sub,
-        Swap,
-        XBOX,
-        XBOXSwap,
-        XGD2Swap,
-        XGD3Swap,
+        HardDisk,
+        Removable,
     }
 
     /// <summary>
-    /// Supported DIC flags
+    /// Program that is being used to dump media
     /// </summary>
-    public enum DICFlag
+    public enum InternalProgram
     {
         NONE = 0,
-        AddOffset,
-        AMSF,
-        BEOpcode,
-        C2Opcode,
-        CopyrightManagementInformation,
-        D8Opcode,
-        DisableBeep,
-        ForceUnitAccess,
-        MCN,
-        MultiSession,
-        NoFixSubP,
-        NoFixSubQ,
-        NoFixSubQLibCrypt,
-        NoFixSubQSecuROM,
-        NoFixSubRtoW,
-        Raw,
-        Reverse,
-        ScanAntiMod,
-        ScanFileProtect,
-        ScanSectorProtect,
-        SeventyFour,
-        SubchannelReadLevel,
+
+        // Dumping support
+        Aaru,
+        DD,
+        DiscImageCreator,
+
+        // Verification support only
+        CleanRip,
+        DCDumper,
+        UmdImageCreator,
     }
 
     /// <summary>
@@ -65,12 +38,20 @@
     {
         NONE = 0,
 
-        #region Consoles
+        #region Disc-Based Consoles
 
+        AtariJaguarCD,
         BandaiPlaydiaQuickInteractiveSystem,
         BandaiApplePippin,
         CommodoreAmigaCD32,
         CommodoreAmigaCDTV,
+        EnvizionsEVOSmartConsole,
+        FujitsuFMTownsMarty,
+        HasbroVideoNow,
+        HasbroVideoNowColor,
+        HasbroVideoNowJr,
+        HasbroVideoNowXP,
+        MattelFisherPriceiXL,
         MattelHyperscan,
         MicrosoftXBOX,
         MicrosoftXBOX360,
@@ -78,10 +59,12 @@
         NECPCEngineTurboGrafxCD,
         NECPCFX,
         NintendoGameCube,
+        NintendoSonySuperNESCDROMSystem,
         NintendoWii,
         NintendoWiiU,
-        Panasonic3DOInteractiveMultiplayer,
+        Panasonic3DOInteractiveMultiplayer, // The 3DO Company 3DO Interactive Multiplayer
         PhilipsCDi,
+        PioneerLaserActive,
         SegaCDMegaCD,
         SegaDreamcast,
         SegaSaturn,
@@ -91,11 +74,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
 
@@ -103,7 +144,7 @@
 
         AcornArchimedes,
         AppleMacintosh,
-        CommodoreAmigaCD,
+        CommodoreAmiga,
         FujitsuFMTowns,
         IBMPCCompatible,
         NECPC88,
@@ -123,6 +164,7 @@
         AUSCOMSystem1,
         BallyGameMagic,
         CapcomCPSystemIII,
+        funworldPhotoPlay,
         GlobalVRVarious,
         GlobalVRVortek,
         GlobalVRVortekV3,
@@ -139,7 +181,6 @@
         KonamiTwinkle,
         KonamiVarious,
         MeritIndustriesBoardwalk,
-        MeritIndustriesMegaTouchAurora,
         MeritIndustriesMegaTouchForce,
         MeritIndustriesMegaTouchION,
         MeritIndustriesMegaTouchMaxx,
@@ -153,6 +194,7 @@
         NichibutsuHighRateSystem,
         NichibutsuSuperCD,
         NichibutsuXRateSystem,
+        PanasonicM2,
         PhotoPlayVarious,
         RawThrillsVarious,
         SegaChihiro,
@@ -168,7 +210,6 @@
         SegaSystem32,
         SeibuCATSSystem,
         TABAustriaQuizard,
-        TandyMemorexVisualInformationSystem,
         TsunamiTsuMoMultiGameMotionSystem,
 
         MarkerArcadeEnd,
@@ -179,16 +220,18 @@
 
         AudioCD,
         BDVideo,
+        DVDAudio,
         DVDVideo,
         EnhancedCD,
-        EnhancedDVD,
-        EnhancedBD,
         HDDVDVideo,
+        NavisoftNaviken21,
         PalmOS,
         PhilipsCDiDigitalVideo,
         PhotoCD,
         PlayStationGameSharkUpdates,
         RainbowDisc,
+        SegaPrologue21,
+        SuperAudioCD,
         TaoiKTV,
         TomyKissSite,
         VideoCD,
@@ -203,7 +246,8 @@
     /// </summary>
     public enum KnownSystemCategory
     {
-        Console = 0,
+        DiscBasedConsole = 0,
+        OtherConsole,
         Computer,
         Arcade,
         Other,
@@ -252,7 +296,7 @@
         LaserDisc, // LD-ROM and LV-ROM variants
         Nintendo64DD,
         NintendoFamicomDiskSystem,
-        NintendoGameCube,
+        NintendoGameCubeGameDisc,
         NintendoWiiOpticalDisc,
         NintendoWiiUOpticalDisc,
         UMD,
@@ -262,5 +306,187 @@
         // Unsorted Formats
         Cartridge,
         CED,
+        CompactFlash,
+        MMC,
+        SDCard,
+        FlashDrive,
     }
+
+    /// <summary>
+    /// Physical media types
+    /// </summary>
+    /// <see cref="https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cimwin32a/win32-physicalmedia"/>
+    public enum PhysicalMediaType : ushort
+    {
+        Unknown = 0,
+        Other = 1,
+        TapeCartridge = 2,
+        QICCartridge = 3,
+        AITCartridge = 4,
+        DTFCartridge = 5,
+        DATCartridge = 6,
+        EightMillimeterTapeCartridge = 7,
+        NineteenMillimeterTapeCartridge = 8,
+        DLTCartridge = 9,
+        HalfInchMagneticTapeCartridge = 10,
+        CartridgeDisk = 11,
+        JAZDisk = 12,
+        ZIPDisk = 13,
+        SyQuestDisk = 14,
+        WinchesterRemovableDisk = 15,
+        CDROM = 16,
+        CDROMXA = 17,
+        CDI = 18,
+        CDRecordable = 19,
+        WORM = 20,
+        MagnetoOptical = 21,
+        DVD = 22,
+        DVDPlusRW = 23,
+        DVDRAM = 24,
+        DVDROM = 25,
+        DVDVideo = 26,
+        Divx = 27,
+        FloppyDiskette = 28,
+        HardDisk = 29,
+        MemoryCard = 30,
+        HardCopy = 31,
+        ClikDisk = 32,
+        CDRW = 33,
+        CDDA = 34,
+        CDPlus = 35,
+        DVDRecordable = 36,
+        DVDMinusRW = 37,
+        DVDAudio = 38,
+        DVD5 = 39,
+        DVD9 = 40,
+        DVD10 = 41,
+        DVD18 = 42,
+        MagnetoOpticalRewriteable = 43,
+        MagnetoOpticalWriteOnce = 44,
+        MagnetoOpticalRewriteableLIMDOW = 45,
+        PhaseChangeWriteOnce = 46,
+        PhaseChangeRewriteable = 47,
+        PhaseChangeDualRewriteable = 48,
+        AblativeWriteOnce = 49,
+        NearFieldRecording = 50,
+        MiniQic = 51,
+        Travan = 52,
+        EightMillimeterMetalParticle = 53,
+        EightMillimeterAdvancedMetalEvaporate = 54,
+        NCTP = 55,
+        LTOUltrium = 56,
+        LTOAccelis = 57,
+        NineTrackTape = 58,
+        EighteenTrackTape = 59,
+        ThirtySixTrackTape = 60,
+        Magstar3590 = 61,
+        MagstarMP = 62,
+        D2Tape = 63,
+        TapeDSTSmall = 64,
+        TapeDSTMedium = 65,
+        TapeDSTLarge = 66,
+    }
+
+    /// <summary>
+    /// Generic yes/no values for Redump
+    /// </summary>
+    public enum YesNo
+    {
+        NULL = 0,
+        No = 1,
+        Yes = 2,
+    }
+
+    #region Win32_CDROMDrive
+
+    // https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-cdromdrive
+
+    /// <summary>
+    /// Availability and status of the device
+    /// </summary>
+    public enum Availability : ushort
+    {
+        Other = 1,
+        Unknown = 2,
+        RunningFullPower = 3,
+        Warning = 4,
+        InTest = 5,
+        NotApplicable = 6,
+        PowerOff = 7,
+        OffLine = 8,
+        OffDuty = 9,
+        Degraded = 10,
+        NotInstalled = 11,
+        InstallError = 12,
+        PowerSaveUnknown = 13,
+        PowerSaveLowPowerMode = 14,
+        PowerSaveStandby = 15,
+        PowerCycle = 16,
+        PowerSaveWarning = 17,
+        Paused = 18,
+        NotReady = 19,
+        NotConfigured = 20,
+        Quiesced = 21,
+    }
+
+    /// <summary>
+    /// Optical drive capabilities
+    /// </summary>
+    public enum Capabilities : ushort
+    {
+        Unknown = 0,
+        Other = 1,
+        SequentialAccess = 2,
+        RandomAccess = 3,
+        SupportsWriting = 4,
+        Encryption = 5,
+        Compression = 6,
+        SupportsRemoveableMedia = 7,
+        ManualCleaning = 8,
+        AutomaticCleaning = 9,
+        SMARTNotification = 10,
+        SupportsDualSidedMedia = 11,
+        PredismountEjectNotRequired = 12,
+    }
+
+    /// <summary>
+    /// File system flags
+    /// </summary>
+    [Flags]
+    public enum FileSystemFlags : uint
+    {
+        None = 0,
+        CaseSensitiveSearch = 1,
+        CasePreservedNames = 2,
+        UnicodeOnDisk = 4,
+        PersistentACLs = 8,
+        FileCompression = 16,
+        VolumeQuotas = 32,
+        SupportsSparseFiles = 64,
+        SupportsReparsePoints = 128,
+        SupportsRemoteStorage = 256,
+        SupportsLongNames = 16384,
+        VolumeIsCompressed = 32768,
+        ReadOnlyVolume = 524289, // TODO: Invesitgate, as this value seems wrong
+        SupportsObjectIDS = 65536,
+        SupportsEncryption = 131072,
+        SupportsNamedStreams = 262144,
+    }
+
+    /// <summary>
+    /// Specific power-related capabilities of a logical device
+    /// </summary>
+    public enum PowerManagementCapabilities : ushort
+    {
+        Unknown = 0,
+        NotSupported = 1,
+        Disabled = 2,
+        Enabled = 3,
+        PowerSavingModesEnteredAutomatically = 4,
+        PowerStateSettable = 5,
+        PowerCyclingSupported = 6,
+        TimedPowerOnSupported = 7,
+    }
+
+    #endregion
 }

DICUI.Library/Data/Options.cs

@@ -0,0 +1,284 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace DICUI.Data
+{
+    public class Options : IDictionary<string, string>
+    {
+        private Dictionary<string, string> _settings;
+
+        #region Internal Program
+
+        public string AaruPath
+        {
+            get { return GetStringSetting(_settings, "AaruPath", "Programs\\Aaru\\Aaru.exe"); }
+            set { _settings["AaruPath"] = value; }
+        }
+
+        public string CreatorPath
+        {
+            get { return GetStringSetting(_settings, "CreatorPath", "Programs\\Creator\\DiscImageCreator.exe"); }
+            set { _settings["CreatorPath"] = value; }
+        }
+
+        public string DDPath
+        {
+            get { return GetStringSetting(_settings, "DDPath", "Programs\\DD\\dd.exe"); }
+            set { _settings["DDPath"] = value; }
+        }
+
+        public string InternalProgram
+        {
+            get { return GetStringSetting(_settings, "InternalProgram", Data.InternalProgram.DiscImageCreator.ToString()); }
+            set { _settings["InternalProgram"] = value; }
+        }
+
+        #endregion
+
+        #region Extra Paths
+
+        public string DefaultOutputPath
+        {
+            get { return GetStringSetting(_settings, "DefaultOutputPath", "ISO"); }
+            set { _settings["DefaultOutputPath"] = value; }
+        }
+
+        #endregion
+
+        #region Dumping Speeds
+
+        public int PreferredDumpSpeedCD
+        {
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedCD", 72); }
+            set { _settings["PreferredDumpSpeedCD"] = value.ToString(); }
+        }
+
+        public int PreferredDumpSpeedDVD
+        {
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedDVD", 24); }
+            set { _settings["PreferredDumpSpeedDVD"] = value.ToString(); }
+        }
+
+        public int PreferredDumpSpeedBD
+        {
+            get { return GetInt32Setting(_settings, "PreferredDumpSpeedBD", 16); }
+            set { _settings["PreferredDumpSpeedBD"] = value.ToString(); }
+        }
+
+        #endregion
+
+        #region Extra Dumping Options
+
+        public bool QuietMode
+        {
+            get { return GetBooleanSetting(_settings, "QuietMode", false); }
+            set { _settings["QuietMode"] = value.ToString(); }
+        }
+
+        public bool ParanoidMode
+        {
+            get { return GetBooleanSetting(_settings, "ParanoidMode", false); }
+            set { _settings["ParanoidMode"] = value.ToString(); }
+        }
+
+        public bool ScanForProtection
+        {
+            get { return GetBooleanSetting(_settings, "ScanForProtection", true); }
+            set { _settings["ScanForProtection"] = value.ToString(); }
+        }
+
+        public int RereadAmountForC2
+        {
+            get { return GetInt32Setting(_settings, "RereadAmountForC2", 20); }
+            set { _settings["RereadAmountForC2"] = value.ToString(); }
+        }
+
+        public bool AddPlaceholders
+        {
+            get { return GetBooleanSetting(_settings, "AddPlaceholders", true); }
+            set { _settings["AddPlaceholders"] = value.ToString(); }
+        }
+
+        public bool PromptForDiscInformation
+        {
+            get { return GetBooleanSetting(_settings, "PromptForDiscInformation", true); }
+            set { _settings["PromptForDiscInformation"] = value.ToString(); }
+        }
+
+        public bool IgnoreFixedDrives
+        {
+            get { return GetBooleanSetting(_settings, "IgnoreFixedDrives", true); }
+            set { _settings["IgnoreFixedDrives"] = value.ToString(); }
+        }
+
+        public bool ResetDriveAfterDump
+        {
+            get { return GetBooleanSetting(_settings, "ResetDriveAfterDump", false); }
+            set { _settings["ResetDriveAfterDump"] = value.ToString(); }
+        }
+
+        #endregion
+
+        #region Skip Options
+
+        public bool SkipMediaTypeDetection
+        {
+            get { return GetBooleanSetting(_settings, "SkipMediaTypeDetection", false); }
+            set { _settings["SkipMediaTypeDetection"] = value.ToString(); }
+        }
+
+        public bool SkipSystemDetection
+        {
+            get { return GetBooleanSetting(_settings, "SkipSystemDetection", false); }
+            set { _settings["SkipSystemDetection"] = value.ToString(); }
+        }
+
+        #endregion
+
+        #region Logging Options
+
+        public bool VerboseLogging
+        {
+            get { return GetBooleanSetting(_settings, "VerboseLogging", true); }
+            set { _settings["VerboseLogging"] = value.ToString(); }
+        }
+
+        public bool OpenLogWindowAtStartup
+        {
+            get { return GetBooleanSetting(_settings, "OpenLogWindowAtStartup", true); }
+            set { _settings["OpenLogWindowAtStartup"] = value.ToString(); }
+        }
+
+        #endregion
+
+        #region Redump Login Information
+
+        public string Username
+        {
+            get { return GetStringSetting(_settings, "Username", ""); }
+            set { _settings["Username"] = value; }
+        }
+
+        // TODO: Figure out a way to keep this encrypted in some way, BASE64 to start?
+        public string Password
+        {
+            get { return GetStringSetting(_settings, "Password", ""); }
+            set { _settings["Password"] = value; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Constructor taking a dictionary for settings
+        /// </summary>
+        /// <param name="settings"></param>
+        public Options(Dictionary<string, string> settings = null)
+        {
+            this._settings = settings ?? new Dictionary<string, string>();
+        }
+
+        #region Helpers
+
+        /// <summary>
+        /// Get a Boolean setting from a settings, dictionary
+        /// </summary>
+        /// <param name="settings">Dictionary representing the settings</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>
+        private bool GetBooleanSetting(Dictionary<string, string> settings, string key, bool defaultValue)
+        {
+            if (settings.ContainsKey(key))
+            {
+                if (Boolean.TryParse(settings[key], out bool value))
+                    return value;
+                else
+                    return defaultValue;
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Get an Int32 setting from a settings, dictionary
+        /// </summary>
+        /// <param name="settings">Dictionary representing the settings</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>
+        private int GetInt32Setting(Dictionary<string, string> settings, string key, int defaultValue)
+        {
+            if (settings.ContainsKey(key))
+            {
+                if (Int32.TryParse(settings[key], out int value))
+                    return value;
+                else
+                    return defaultValue;
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        /// <summary>
+        /// Get a String setting from a settings, dictionary
+        /// </summary>
+        /// <param name="settings">Dictionary representing the settings</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>
+        private string GetStringSetting(Dictionary<string, string> settings, string key, string defaultValue)
+        {
+            if (settings.ContainsKey(key))
+                return settings[key];
+            else
+                return defaultValue;
+        }
+
+        #endregion
+
+        #region IDictionary implementations
+
+        public ICollection<string> Keys => _settings.Keys;
+
+        public ICollection<string> Values => _settings.Values;
+
+        public int Count => _settings.Count;
+
+        public bool IsReadOnly => ((IDictionary<string, string>)_settings).IsReadOnly;
+
+        public string this[string key]
+        {
+            get { return (_settings.ContainsKey(key) ? _settings[key] : null); }
+            set { _settings[key] = value; }
+        }
+
+        public bool ContainsKey(string key) => _settings.ContainsKey(key);
+
+        public void Add(string key, string value) => _settings.Add(key, value);
+
+        public bool Remove(string key) => _settings.Remove(key);
+
+        public bool TryGetValue(string key, out string value) => _settings.TryGetValue(key, out value);
+
+        public void Add(KeyValuePair<string, string> item) => _settings.Add(item.Key, item.Value);
+
+        public void Clear() => _settings.Clear();
+
+        public bool Contains(KeyValuePair<string, string> item) => ((IDictionary<string, string>)_settings).Contains(item);
+
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) => ((IDictionary<string, string>)_settings).CopyTo(array, arrayIndex);
+
+        public bool Remove(KeyValuePair<string, string> item) => ((IDictionary<string, string>)_settings).Remove(item);
+
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => _settings.GetEnumerator();
+
+        IEnumerator IEnumerable.GetEnumerator() => _settings.GetEnumerator();
+
+        #endregion
+    }
+}

DICUI.Library/DiscImageCreator/Constants.cs

@@ -0,0 +1,72 @@
+namespace DICUI.DiscImageCreator
+{
+    /// <summary>
+    /// Top-level commands for DiscImageCreator
+    /// </summary>
+    public static class CommandStrings
+    {
+        public const string Audio = "audio";
+        public const string BluRay = "bd";
+        public const string Close = "close";
+        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";
+        public const string GDROM = "gd";
+        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";
+        public const string Swap = "swap";
+        public const string Tape = "tape";
+        public const string XBOX = "xbox";
+        public const string XBOXSwap = "xboxswap";
+        public const string XGD2Swap = "xgd2swap";
+        public const string XGD3Swap = "xgd3swap";
+    }
+
+    /// <summary>
+    /// Dumping flags for DiscImageCreator
+    /// </summary>
+    public static class FlagStrings
+    {
+        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";
+        public const string D8Opcode = "/d8";
+        public const string DisableBeep = "/q";
+        public const string ExtractMicroSoftCabFile = "/mscf";
+        public const string Fix = "/fix";
+        public const string ForceUnitAccess = "/f";
+        public const string MultiSession = "/ms";
+        public const string NoFixSubP = "/np";
+        public const string NoFixSubQ = "/nq";
+        public const string NoFixSubQLibCrypt = "/nl";
+        public const string NoFixSubRtoW = "/nr";
+        public const string NoFixSubQSecuROM = "/ns";
+        public const string NoSkipSS = "/nss";
+        public const string PadSector = "/ps";
+        public const string Raw = "/raw";
+        public const string Resume = "/re";
+        public const string Reverse = "/r";
+        public const string ScanAntiMod = "/am";
+        public const string ScanFileProtect = "/sf";
+        public const string ScanSectorProtect = "/ss";
+        public const string SeventyFour = "/74";
+        public const string SkipSector = "/sk";
+        public const string SubchannelReadLevel = "/s";
+        public const string UseAnchorVolumeDescriptorPointer = "/avdp";
+        public const string VideoNow = "/vn";
+        public const string VideoNowColor = "/vnc";
+        public const string VideoNowXP = "/vnx";
+    }
+}

DICUI.Library/DiscImageCreator/Converters.cs

@@ -0,0 +1,339 @@
+using DICUI.Data;
+
+namespace DICUI.DiscImageCreator
+{
+    public static class Converters
+    {
+        #region Cross-enumeration conversions
+
+        /// <summary>
+        /// Get the most common known system for a given MediaType
+        /// </summary>
+        /// <param name="baseCommand">Command value to check</param>
+        /// <returns>KnownSystem if possible, null on error</returns>
+        public static KnownSystem? ToKnownSystem(Command baseCommand)
+        {
+            switch (baseCommand)
+            {
+                case Command.Audio:
+                    return KnownSystem.AudioCD;
+                case Command.CompactDisc:
+                case Command.Data:
+                case Command.DigitalVideoDisc:
+                case Command.Disk:
+                case Command.Floppy:
+                case Command.Tape:
+                    return KnownSystem.IBMPCCompatible;
+                case Command.GDROM:
+                case Command.Swap:
+                    return KnownSystem.SegaDreamcast;
+                case Command.BluRay:
+                    return KnownSystem.SonyPlayStation3;
+                case Command.SACD:
+                    return KnownSystem.SuperAudioCD;
+                case Command.XBOX:
+                case Command.XBOXSwap:
+                    return KnownSystem.MicrosoftXBOX;
+                case Command.XGD2Swap:
+                case Command.XGD3Swap:
+                    return KnownSystem.MicrosoftXBOX360;
+                default:
+                    return null;
+            }
+        }
+
+        /// <summary>
+        /// Get the MediaType associated with a given base command
+        /// </summary>
+        /// <param name="baseCommand">Command value to check</param>
+        /// <returns>MediaType if possible, null on error</returns>
+        /// <remarks>This takes the "safe" route by assuming the larger of any given format</remarks>
+        public static MediaType? ToMediaType(Command baseCommand)
+        {
+            switch (baseCommand)
+            {
+                case Command.Audio:
+                case Command.CompactDisc:
+                case Command.Data:
+                case Command.SACD:
+                    return MediaType.CDROM;
+                case Command.GDROM:
+                case Command.Swap:
+                    return MediaType.GDROM;
+                case Command.DigitalVideoDisc:
+                case Command.XBOX:
+                case Command.XBOXSwap:
+                case Command.XGD2Swap:
+                case Command.XGD3Swap:
+                    return MediaType.DVD;
+                case Command.BluRay:
+                    return MediaType.BluRay;
+
+                // Non-optical
+                case Command.Floppy:
+                    return MediaType.FloppyDisk;
+                case Command.Disk:
+                    return MediaType.HardDisk;
+                case Command.Tape:
+                    return MediaType.DataCartridge;
+                default:
+                    return null;
+            }
+        }
+
+        /// <summary>
+        /// Get the default extension for a given disc type
+        /// </summary>
+        /// <param name="type">MediaType value to check</param>
+        /// <returns>Valid extension (with leading '.'), null on error</returns>
+        public static string Extension(MediaType? type)
+        {
+            switch (type)
+            {
+                case MediaType.CDROM:
+                case MediaType.GDROM:
+                case MediaType.Cartridge:
+                case MediaType.HardDisk:
+                case MediaType.CompactFlash:
+                case MediaType.MMC:
+                case MediaType.SDCard:
+                case MediaType.FlashDrive:
+                    return ".bin";
+                case MediaType.DVD:
+                case MediaType.HDDVD:
+                case MediaType.BluRay:
+                case MediaType.NintendoWiiOpticalDisc:
+                    return ".iso";
+                case MediaType.LaserDisc:
+                case MediaType.NintendoGameCubeGameDisc:
+                    return ".raw";
+                case MediaType.NintendoWiiUOpticalDisc:
+                    return ".wud";
+                case MediaType.FloppyDisk:
+                    return ".img";
+                case MediaType.Cassette:
+                    return ".wav";
+                case MediaType.NONE:
+                default:
+                    return null;
+            }
+        }
+
+        #endregion
+
+        #region Convert to Long Name
+
+        /// <summary>
+        /// Get the string representation of the Command enum values
+        /// </summary>
+        /// <param name="command">Command value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Command command)
+        {
+            switch (command)
+            {
+                case Command.Audio:
+                    return CommandStrings.Audio;
+                case Command.BluRay:
+                    return CommandStrings.BluRay;
+                case Command.Close:
+                    return CommandStrings.Close;
+                case Command.CompactDisc:
+                    return CommandStrings.CompactDisc;
+                case Command.Data:
+                    return CommandStrings.Data;
+                case Command.DigitalVideoDisc:
+                    return CommandStrings.DigitalVideoDisc;
+                case Command.Disk:
+                    return CommandStrings.Disk;
+                case Command.DriveSpeed:
+                    return CommandStrings.DriveSpeed;
+                case Command.Eject:
+                    return CommandStrings.Eject;
+                case Command.Floppy:
+                    return CommandStrings.Floppy;
+                case Command.GDROM:
+                    return CommandStrings.GDROM;
+                case Command.MDS:
+                    return CommandStrings.MDS;
+                case Command.Merge:
+                    return CommandStrings.Merge;
+                case Command.Reset:
+                    return CommandStrings.Reset;
+                case Command.SACD:
+                    return CommandStrings.SACD;
+                case Command.Start:
+                    return CommandStrings.Start;
+                case Command.Stop:
+                    return CommandStrings.Stop;
+                case Command.Sub:
+                    return CommandStrings.Sub;
+                case Command.Swap:
+                    return CommandStrings.Swap;
+                case Command.Tape:
+                    return CommandStrings.Tape;
+                case Command.XBOX:
+                    return CommandStrings.XBOX;
+                case Command.XBOXSwap:
+                    return CommandStrings.XBOXSwap;
+                case Command.XGD2Swap:
+                    return CommandStrings.XGD2Swap;
+                case Command.XGD3Swap:
+                    return CommandStrings.XGD3Swap;
+
+                case Command.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        /// <summary>
+        /// Get the string representation of the Flag enum values
+        /// </summary>
+        /// <param name="command">Flag value to convert</param>
+        /// <returns>String representing the value, if possible</returns>
+        public static string LongName(Flag flag)
+        {
+            switch (flag)
+            {
+                case Flag.AddOffset:
+                    return FlagStrings.AddOffset;
+                case Flag.AMSF:
+                    return FlagStrings.AMSF;
+                case Flag.AtariJaguar:
+                    return FlagStrings.AtariJaguar;
+                case Flag.BEOpcode:
+                    return FlagStrings.BEOpcode;
+                case Flag.C2Opcode:
+                    return FlagStrings.C2Opcode;
+                case Flag.CopyrightManagementInformation:
+                    return FlagStrings.CopyrightManagementInformation;
+                case Flag.D8Opcode:
+                    return FlagStrings.D8Opcode;
+                case Flag.DisableBeep:
+                    return FlagStrings.DisableBeep;
+                case Flag.ExtractMicroSoftCabFile:
+                    return FlagStrings.ExtractMicroSoftCabFile;
+                case Flag.Fix:
+                    return FlagStrings.Fix;
+                case Flag.ForceUnitAccess:
+                    return FlagStrings.ForceUnitAccess;
+                case Flag.MultiSession:
+                    return FlagStrings.MultiSession;
+                case Flag.NoFixSubP:
+                    return FlagStrings.NoFixSubP;
+                case Flag.NoFixSubQ:
+                    return FlagStrings.NoFixSubQ;
+                case Flag.NoFixSubQLibCrypt:
+                    return FlagStrings.NoFixSubQLibCrypt;
+                case Flag.NoFixSubRtoW:
+                    return FlagStrings.NoFixSubRtoW;
+                case Flag.NoFixSubQSecuROM:
+                    return FlagStrings.NoFixSubQSecuROM;
+                case Flag.NoSkipSS:
+                    return FlagStrings.NoSkipSS;
+                case Flag.PadSector:
+                    return FlagStrings.PadSector;
+                case Flag.Raw:
+                    return FlagStrings.Raw;
+                case Flag.Resume:
+                    return FlagStrings.Resume;
+                case Flag.Reverse:
+                    return FlagStrings.Reverse;
+                case Flag.ScanAntiMod:
+                    return FlagStrings.ScanAntiMod;
+                case Flag.ScanFileProtect:
+                    return FlagStrings.ScanFileProtect;
+                case Flag.ScanSectorProtect:
+                    return FlagStrings.ScanSectorProtect;
+                case Flag.SeventyFour:
+                    return FlagStrings.SeventyFour;
+                case Flag.SkipSector:
+                    return FlagStrings.SkipSector;
+                case Flag.SubchannelReadLevel:
+                    return FlagStrings.SubchannelReadLevel;
+                case Flag.UseAnchorVolumeDescriptorPointer:
+                    return FlagStrings.UseAnchorVolumeDescriptorPointer;
+                case Flag.VideoNow:
+                    return FlagStrings.VideoNow;
+                case Flag.VideoNowColor:
+                    return FlagStrings.VideoNowColor;
+                case Flag.VideoNowXP:
+                    return FlagStrings.VideoNowXP;
+
+                case Flag.NONE:
+                default:
+                    return "";
+            }
+        }
+
+        #endregion
+
+        #region Convert From String
+
+        /// <summary>
+        /// Get the Command enum value for a given string
+        /// </summary>
+        /// <param name="command">String value to convert</param>
+        /// <returns>Command represented by the string(s), if possible</returns>
+        public static Command StringToCommand(string command)
+        {
+            switch (command)
+            {
+                case CommandStrings.Audio:
+                    return Command.Audio;
+                case CommandStrings.BluRay:
+                    return Command.BluRay;
+                case CommandStrings.Close:
+                    return Command.Close;
+                case CommandStrings.CompactDisc:
+                    return Command.CompactDisc;
+                case CommandStrings.Data:
+                    return Command.Data;
+                case CommandStrings.DigitalVideoDisc:
+                    return Command.DigitalVideoDisc;
+                case CommandStrings.Disk:
+                    return Command.Disk;
+                case CommandStrings.DriveSpeed:
+                    return Command.DriveSpeed;
+                case CommandStrings.Eject:
+                    return Command.Eject;
+                case CommandStrings.Floppy:
+                    return Command.Floppy;
+                case CommandStrings.GDROM:
+                    return Command.GDROM;
+                case CommandStrings.MDS:
+                    return Command.MDS;
+                case CommandStrings.Merge:
+                    return Command.Merge;
+                case CommandStrings.Reset:
+                    return Command.Reset;
+                case CommandStrings.SACD:
+                    return Command.SACD;
+                case CommandStrings.Start:
+                    return Command.Start;
+                case CommandStrings.Stop:
+                    return Command.Stop;
+                case CommandStrings.Sub:
+                    return Command.Sub;
+                case CommandStrings.Swap:
+                    return Command.Swap;
+                case CommandStrings.Tape:
+                    return Command.Tape;
+                case CommandStrings.XBOX:
+                    return Command.XBOX;
+                case CommandStrings.XBOXSwap:
+                    return Command.XBOXSwap;
+                case CommandStrings.XGD2Swap:
+                    return Command.XGD2Swap;
+                case CommandStrings.XGD3Swap:
+                    return Command.XGD3Swap;
+
+                default:
+                    return Command.NONE;
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/DiscImageCreator/Enumerations.cs

@@ -0,0 +1,74 @@
+namespace DICUI.DiscImageCreator
+{
+    /// <summary>
+    /// Supported DiscImageCreator commands
+    /// </summary>
+    public enum Command : int
+    {
+        NONE = 0,
+        Audio,
+        BluRay,
+        Close,
+        CompactDisc,
+        Data,
+        DigitalVideoDisc,
+        Disk,
+        DriveSpeed,
+        Eject,
+        Floppy,
+        GDROM,
+        MDS,
+        Merge,
+        Reset,
+        SACD,
+        Start,
+        Stop,
+        Sub,
+        Swap,
+        Tape,
+        XBOX,
+        XBOXSwap,
+        XGD2Swap,
+        XGD3Swap,
+    }
+
+    /// <summary>
+    /// Supported DiscImageCreator flags
+    /// </summary>
+    public enum Flag : int
+    {
+        NONE = 0,
+        AddOffset,
+        AMSF,
+        AtariJaguar,
+        BEOpcode,
+        C2Opcode,
+        CopyrightManagementInformation,
+        D8Opcode,
+        DisableBeep,
+        ExtractMicroSoftCabFile,
+        Fix,
+        ForceUnitAccess,
+        MultiSession,
+        NoFixSubP,
+        NoFixSubQ,
+        NoFixSubQLibCrypt,
+        NoFixSubRtoW,
+        NoFixSubQSecuROM,
+        NoSkipSS,
+        PadSector,
+        Raw,
+        Resume,
+        Reverse,
+        ScanAntiMod,
+        ScanFileProtect,
+        ScanSectorProtect,
+        SeventyFour,
+        SkipSector,
+        SubchannelReadLevel,
+        UseAnchorVolumeDescriptorPointer,
+        VideoNow,
+        VideoNowColor,
+        VideoNowXP,
+    }
+}

DICUI.Library/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-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.Library")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Library")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("51ab0928-13f9-44bf-a407-b6957a43a056")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// 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")]

DICUI.Library/UmdImageCreator/Parameters.cs

@@ -0,0 +1,325 @@
+using System;
+using System.IO;
+using DICUI.Data;
+using DICUI.Utilities;
+using DICUI.Web;
+
+namespace DICUI.UmdImageCreator
+{
+    /// <summary>
+    /// Represents a generic set of UmdImageCreator parameters
+    /// </summary>
+    public class Parameters : BaseParameters
+    {
+        /// <summary>
+        /// Populate a Parameters object from a param string
+        /// </summary>
+        /// <param name="parameters">String possibly representing a set of parameters</param>
+        public Parameters(string parameters)
+            : base(parameters)
+        {
+            this.InternalProgram = InternalProgram.UmdImageCreator;
+        }
+
+        /// <summary>
+        /// Generate parameters based on a set of known inputs
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="quietMode">Enable quiet mode (no beeps)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        public Parameters(KnownSystem? system, MediaType? type, char driveLetter, string filename, int? driveSpeed, bool paranoid, bool quietMode, int retryCount)
+            : base(system, type, driveLetter, filename, driveSpeed, paranoid, quietMode, retryCount)
+        {
+        }
+
+        /// <summary>
+        /// Blindly generate a parameter string based on the inputs
+        /// </summary>
+        /// <returns>Correctly formatted parameter string, null on error</returns>
+        public override string GenerateParameters() => null;
+
+        /// <summary>
+        /// Get the input path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string InputPath() => null;
+
+        /// <summary>
+        /// Get the output path from the implementation
+        /// </summary>
+        /// <returns>String representing the path, null on error</returns>
+        public override string OutputPath() => null;
+
+        /// <summary>
+        /// Get the processing speed from the implementation
+        /// </summary>
+        /// <returns>int? representing the speed, null on error</returns>
+        public override int? GetSpeed() => null;
+
+        /// <summary>
+        /// Set the processing speed int the implementation
+        /// </summary>
+        /// <param name="speed">int? representing the speed</param>
+        public override void SetSpeed(int? speed) { }
+
+        /// <summary>
+        /// Get the MediaType from the current set of parameters
+        /// </summary>
+        /// <returns>MediaType value if successful, null on error</returns>
+        public override MediaType? GetMediaType() => null;
+
+        /// <summary>
+        /// Gets if the current command is considered a dumping command or not
+        /// </summary>
+        /// <returns>True if it's a dumping command, false otherwise</returns>
+        public override bool IsDumpingCommand() => true;
+
+        /// <summary>
+        /// Reset all special variables to have default values
+        /// </summary>
+        protected override void ResetValues() { }
+
+        /// <summary>
+        /// Set default parameters for a given system and media type
+        /// </summary>
+        /// <param name="system">KnownSystem value to use</param>
+        /// <param name="type">MediaType value to use</param>
+        /// <param name="driveLetter">Drive letter to use</param>
+        /// <param name="filename">Filename to use</param>
+        /// <param name="driveSpeed">Drive speed to use</param>
+        /// <param name="paranoid">Enable paranoid mode (safer dumping)</param>
+        /// <param name="retryCount">User-defined reread count</param>
+        protected override void SetDefaultParameters(
+            KnownSystem? system,
+            MediaType? type,
+            char driveLetter,
+            string filename,
+            int? driveSpeed,
+            bool paranoid,
+            int retryCount)
+        {
+        }
+
+        /// <summary>
+        /// Scan a possible parameter string and populate whatever possible
+        /// </summary>
+        /// <param name="parameters">String possibly representing parameters</param>
+        /// <returns></returns>
+        protected override bool ValidateAndSetParameters(string parameters) => true;
+
+        /// <summary>
+        /// Validate if all required output files exist
+        /// </summary>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="progress">Optional result progress callback</param>
+        /// <returns></returns>
+        public override bool CheckAllOutputFilesExist(string basePath, KnownSystem? system, MediaType? type, IProgress<Result> progress = null)
+        {
+            string missingFiles = string.Empty;
+            switch (type)
+            {
+                case MediaType.UMD:
+                    if (!File.Exists($"{basePath}_disc.txt"))
+                        missingFiles += $";{basePath}_disc.txt";
+                    if (!File.Exists($"{basePath}_mainError.txt"))
+                        missingFiles += $";{basePath}_mainError.txt";
+                    if (!File.Exists($"{basePath}_mainInfo.txt"))
+                        missingFiles += $";{basePath}_mainInfo.txt";
+                    if (!File.Exists($"{basePath}_volDesc.txt"))
+                        missingFiles += $";{basePath}_volDesc.txt";
+
+                    break;
+
+                default:
+                    // Non-dumping commands will usually produce no output, so this is irrelevant
+                    return true;
+            }
+
+            // Use the missing files list as an indicator
+            if (string.IsNullOrEmpty(missingFiles))
+            {
+                return true;
+            }
+            else
+            {
+                progress?.Report(Result.Failure($"The following files were missing: {missingFiles.TrimStart(';')}"));
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Generate a SubmissionInfo for the output files
+        /// </summary>
+        /// <param name="info">Base submission info to fill in specifics for</param>
+        /// <param name="basePath">Base filename and path to use for checking</param>
+        /// <param name="system">KnownSystem type representing the media</param>
+        /// <param name="type">MediaType type representing the media</param>
+        /// <param name="drive">Drive representing the disc to get information from</param>
+        /// <returns></returns>
+        public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, KnownSystem? system, MediaType? type, Drive drive)
+        {
+            // Fill in the hash data
+            info.TracksAndWriteOffsets.ClrMameProData = GetDatfile(basePath + ".dat");
+
+            // Extract info based generically on MediaType
+            switch (type)
+            {
+                case MediaType.UMD:
+                    info.Extras.PVD = GetPVD(basePath + "_mainInfo.txt") ?? "";
+
+                    if (GetUMDAuxInfo(basePath + "_disc.txt", out string title, out DiscCategory? umdcat, out string umdversion, out string umdlayer, out long umdsize))
+                    {
+                        info.CommonDiscInfo.Title = title ?? "";
+                        info.CommonDiscInfo.Category = umdcat ?? DiscCategory.Games;
+                        info.VersionAndEditions.Version = umdversion ?? "";
+                        info.SizeAndChecksums.Size = umdsize;
+
+                        if (!string.IsNullOrWhiteSpace(umdlayer))
+                            info.SizeAndChecksums.Layerbreak = Int64.Parse(umdlayer ?? "-1");
+                    }
+
+                    break;
+            }
+        }
+
+        #region Information Extraction Methods
+
+        /// <summary>
+        /// Get the proper datfile from the input file, if possible
+        /// </summary>
+        /// <param name="dat">.dat file location</param>
+        /// <returns>Relevant pieces of the datfile, null on error</returns>
+        private static string GetDatfile(string dat)
+        {
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(dat))
+                return null;
+
+            using (StreamReader sr = File.OpenText(dat))
+            {
+                try
+                {
+                    // Make sure this file is a .dat
+                    if (sr.ReadLine() != "<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
+                        return null;
+                    if (sr.ReadLine() != "<!DOCTYPE datafile PUBLIC \"-//Logiqx//DTD ROM Management Datafile//EN\" \"http://www.logiqx.com/Dats/datafile.dtd\">")
+                        return null;
+
+                    // Fast forward to the rom lines
+                    while (!sr.ReadLine().TrimStart().StartsWith("<game")) ;
+                    sr.ReadLine(); // <category>Games</category>
+                    sr.ReadLine(); // <description>Plextor</description>
+
+                    // Now that we're at the relevant entries, read each line in and concatenate
+                    string pvd = "", line = sr.ReadLine().Trim();
+                    while (line.StartsWith("<rom"))
+                    {
+                        pvd += line + "\n";
+                        line = sr.ReadLine().Trim();
+                    }
+
+                    return pvd.TrimEnd('\n');
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the PVD from the input file, if possible
+        /// </summary>
+        /// <param name="mainInfo">_mainInfo.txt file location</param>
+        /// <returns>Newline-deliminated PVD if possible, null on error</returns>
+        private static string GetPVD(string mainInfo)
+        {
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(mainInfo))
+                return null;
+
+            using (StreamReader sr = File.OpenText(mainInfo))
+            {
+                try
+                {
+                    // Make sure we're in the right sector
+                    while (!sr.ReadLine().StartsWith("========== LBA[000016, 0x00010]: Main Channel ==========")) ;
+
+                    // Fast forward to the PVD
+                    while (!sr.ReadLine().StartsWith("0310")) ;
+
+                    // Now that we're at the PVD, read each line in and concatenate
+                    string pvd = "";
+                    for (int i = 0; i < 6; i++)
+                        pvd += sr.ReadLine() + "\n"; // 320-370
+
+                    return pvd;
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the UMD auxiliary info from the outputted files, if possible
+        /// </summary>
+        /// <param name="disc">_disc.txt file location</param>
+        /// <returns>True on successful extraction of info, false otherwise</returns>
+        private static bool GetUMDAuxInfo(string disc, out string title, out DiscCategory? umdcat, out string umdversion, out string umdlayer, out long umdsize)
+        {
+            title = null; umdcat = null; umdversion = null; umdlayer = null; umdsize = -1;
+
+            // If the file doesn't exist, we can't get info from it
+            if (!File.Exists(disc))
+                return false;
+
+            using (StreamReader sr = File.OpenText(disc))
+            {
+                try
+                {
+                    // Loop through everything to get the first instance of each required field
+                    string line = string.Empty;
+                    while (!sr.EndOfStream)
+                    {
+                        line = sr.ReadLine().Trim();
+
+                        if (line.StartsWith("TITLE") && title == null)
+                            title = line.Substring("TITLE: ".Length);
+                        else if (line.StartsWith("DISC_VERSION") && umdversion == null)
+                            umdversion = line.Split(' ')[1];
+                        else if (line.StartsWith("pspUmdTypes"))
+                            umdcat = GetUMDCategory(line.Split(' ')[1]);
+                        else if (line.StartsWith("L0 length"))
+                            umdlayer = line.Split(' ')[2];
+                        else if (line.StartsWith("FileSize:"))
+                            umdsize = Int64.Parse(line.Split(' ')[1]);
+                    }
+
+                    // If the L0 length is the size of the full disc, there's no layerbreak
+                    if (Int64.Parse(umdlayer) * 2048 == umdsize)
+                        umdlayer = null;
+
+                    return true;
+                }
+                catch
+                {
+                    // We don't care what the exception is right now
+                    return false;
+                }
+            }
+        }
+
+        #endregion
+    }
+}

DICUI.Library/Utilities/Drive.cs

@@ -0,0 +1,102 @@
+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
+            {
+                string volumeLabel = Template.DiscNotDetected;
+                if (DriveInfo.IsReady)
+                {
+                    if (string.IsNullOrWhiteSpace(DriveInfo.VolumeLabel))
+                        volumeLabel = "track";
+                    else
+                        volumeLabel = DriveInfo.VolumeLabel;
+                }
+
+                foreach (char c in Path.GetInvalidFileNameChars())
+                    volumeLabel = volumeLabel.Replace(c, '_');
+
+                return volumeLabel;
+            }
+        }
+
+        /// <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;
+        }
+
+        /// <summary>
+        /// Read a sector with a specified size from the drive
+        /// </summary>
+        /// <param name="num">Sector number, non-negative</param>
+        /// <param name="size">Size of a sector in bytes</param>
+        /// <returns>Byte array representing the sector, null on error</returns>
+        public byte[] ReadSector(long num, int size = 2048)
+        {
+            // Missing drive leter is not supported
+            if (string.IsNullOrEmpty(this.DriveInfo?.Name))
+                return null;
+
+            // We don't support negative sectors
+            if (num < 0)
+                return null;
+
+            // Wrap the following in case of device access errors
+            try
+            {
+                // Open the drive as a device
+                var fs = File.OpenRead($"\\\\?\\{this.Letter}:");
+
+                // Seek to the start of the sector, if possible
+                long start = num * size;
+                fs.Seek(start, SeekOrigin.Begin);
+
+                // Read and return the sector
+                byte[] buffer = new byte[size];
+                fs.Read(buffer, 0, size);
+                return buffer;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}

DICUI.Library/Utilities/Extensions.cs

@@ -2,43 +2,8 @@
 
 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);
-        }
-    }
-
-    /// <summary>
-    /// Extensions for DICFlag for easier calling
-    /// </summary>
-    public static class DICFlagExtensions
-    {
-        public static string Name(this DICFlag command)
-        {
-            return Converters.DICFlagToString(command);
-        }
-    }
-
-    /// <summary>
-    /// Extensions for MediaType? for easier calling
-    /// </summary>
-    public static class MediaTypeExtensions
-    {
-        public static string Name(this MediaType? type)
-        {
-            return Converters.MediaTypeToString(type);
-        }
-
-        public static string Extension(this MediaType? type)
-        {
-            return Converters.MediaTypeToExtension(type);
-        }
-
         public static bool DoesSupportDriveSpeed(this MediaType? type)
         {
             switch (type)
@@ -48,29 +13,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 +45,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 +54,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/IniFile.cs

@@ -0,0 +1,296 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace DICUI.Utilities
+{
+    public class IniFile : IDictionary<string, string>
+    {
+        private Dictionary<string, string> _keyValuePairs = new Dictionary<string, string>();
+
+        public string this[string key]
+        {
+            get
+            {
+                if (_keyValuePairs == null)
+                    _keyValuePairs = new Dictionary<string, string>();
+
+                key = key.ToLowerInvariant();
+                if (_keyValuePairs.ContainsKey(key))
+                    return _keyValuePairs[key];
+
+                return null;
+            }
+            set
+            {
+                if (_keyValuePairs == null)
+                    _keyValuePairs = new Dictionary<string, string>();
+
+                key = key.ToLowerInvariant();
+                _keyValuePairs[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Create an empty INI file
+        /// </summary>
+        public IniFile()
+        {
+        }
+
+        /// <summary>
+        /// Populate an INI file from path
+        /// </summary>
+        public IniFile(string path)
+        {
+            this.Parse(path);
+        }
+
+        /// <summary>
+        /// Populate an INI file from stream
+        /// </summary>
+        public IniFile(Stream stream)
+        {
+            this.Parse(stream);
+        }
+
+        /// <summary>
+        /// Add or update a key and value to the INI file
+        /// </summary>
+        public void AddOrUpdate(string key, string value)
+        {
+            _keyValuePairs[key.ToLowerInvariant()] = value;
+        }
+
+        /// <summary>
+        /// Remove a key from the INI file
+        /// </summary>
+        public void Remove(string key)
+        {
+            _keyValuePairs.Remove(key.ToLowerInvariant());
+        }
+
+        /// <summary>
+        /// Read an INI file based on the path
+        /// </summary>
+        public bool Parse(string path)
+        {
+            // If we don't have a file, we can't read it
+            if (!File.Exists(path))
+                return false;
+
+            using (var fileStream = File.OpenRead(path))
+            {
+                return Parse(fileStream);
+            }
+        }
+
+        /// <summary>
+        /// Read an INI file from a stream
+        /// </summary>
+        public bool Parse(Stream stream)
+        {
+            // If the stream is invalid or unreadable, we can't process it
+            if (stream == null || !stream.CanRead || stream.Position >= stream.Length - 1)
+                return false;
+
+            // Keys are case-insensitive by default
+            try
+            {
+                using (StreamReader sr = new StreamReader(stream))
+                {
+                    string section = string.Empty;
+                    while (!sr.EndOfStream)
+                    {
+                        string line = sr.ReadLine().Trim();
+
+                        // Comments start with ';'
+                        if (line.StartsWith(";"))
+                        {
+                            // No-op, we don't process comments
+                        }
+
+                        // Section titles are surrounded by square brackets
+                        else if (line.StartsWith("["))
+                        {
+                            section = line.TrimStart('[').TrimEnd(']');
+                        }
+
+                        // Valid INI lines are in the format key=value
+                        else if (line.Contains("="))
+                        {
+                            // Split the line by '=' for key-value pairs
+                            string[] data = line.Split('=');
+
+                            // If the value field contains an '=', we need to put them back in
+                            string key = data[0].Trim();
+                            string value = string.Join("=", data.Skip(1)).Trim();
+
+                            // Section names are prepended to the key with a '.' separating
+                            if (!string.IsNullOrEmpty(section))
+                                key = $"{section}.{key}";
+
+                            // Set or overwrite keys in the returned dictionary
+                            _keyValuePairs[key.ToLowerInvariant()] = value;
+                        }
+
+                        // All other lines are ignored
+                    }
+                }
+            }
+            catch
+            {
+                // We don't care what the error was, just catch and return
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Write an INI file to a path
+        /// </summary>
+        public bool Write(string path)
+        {
+            // If we don't have a valid dictionary with values, we can't write out
+            if (_keyValuePairs == null || _keyValuePairs.Count == 0)
+                return false;
+
+            using (var fileStream = File.OpenWrite(path))
+            {
+                return Write(fileStream);
+            }
+        }
+
+        /// <summary>
+        /// Write an INI file to a stream
+        /// </summary>
+        public bool Write(Stream stream)
+        {
+            // If we don't have a valid dictionary with values, we can't write out
+            if (_keyValuePairs == null || _keyValuePairs.Count == 0)
+                return false;
+
+            // If the stream is invalid or unwritable, we can't output to it
+            if (stream == null || !stream.CanWrite || stream.Position >= stream.Length - 1)
+                return false;
+
+            try
+            {
+                using (StreamWriter sw = new StreamWriter(stream))
+                {
+                    // Order the dictionary by keys to link sections together
+                    var orderedKeyValuePairs = _keyValuePairs.OrderBy(kvp => kvp.Key);
+
+                    string section = string.Empty;
+                    foreach (var keyValuePair in orderedKeyValuePairs)
+                    {
+                        // Extract the key and value
+                        string key = keyValuePair.Key;
+                        string value = keyValuePair.Value;
+
+                        // We assume '.' is a section name separator
+                        if (key.Contains('.'))
+                        {
+                            // Split the key by '.'
+                            string[] data = keyValuePair.Key.Split('.');
+
+                            // If the key contains an '.', we need to put them back in
+                            string newSection = data[0].Trim();
+                            key = string.Join(".", data.Skip(1)).Trim();
+
+                            // If we have a new section, write it out
+                            if (!string.Equals(newSection, section, StringComparison.OrdinalIgnoreCase))
+                            {
+                                sw.WriteLine($"[{newSection}]");
+                                section = newSection;
+                            }
+                        }
+
+                        // Now write out the key and value in a standardized way
+                        sw.WriteLine($"{key}={value}");
+                    }
+                }
+            }
+            catch
+            {
+                // We don't care what the error was, just catch and return
+                return false;
+            }
+
+            return true;
+        }
+
+        #region IDictionary Impelementations
+
+        public ICollection<string> Keys => ((IDictionary<string, string>)_keyValuePairs).Keys;
+
+        public ICollection<string> Values => ((IDictionary<string, string>)_keyValuePairs).Values;
+
+        public int Count => ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).Count;
+
+        public bool IsReadOnly => ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).IsReadOnly;
+
+        public void Add(string key, string value)
+        {
+            ((IDictionary<string, string>)_keyValuePairs).Add(key.ToLowerInvariant(), value);
+        }
+
+        bool IDictionary<string, string>.Remove(string key)
+        {
+            return ((IDictionary<string, string>)_keyValuePairs).Remove(key.ToLowerInvariant());
+        }
+
+        public bool TryGetValue(string key, out string value)
+        {
+            return ((IDictionary<string, string>)_keyValuePairs).TryGetValue(key.ToLowerInvariant(), out value);
+        }
+
+        public void Add(KeyValuePair<string, string> item)
+        {
+            var newItem = new KeyValuePair<string, string>(item.Key.ToLowerInvariant(), item.Value);
+            ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).Add(newItem);
+        }
+
+        public void Clear()
+        {
+            ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).Clear();
+        }
+
+        public bool Contains(KeyValuePair<string, string> item)
+        {
+            var newItem = new KeyValuePair<string, string>(item.Key.ToLowerInvariant(), item.Value);
+            return ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).Contains(newItem);
+        }
+
+        public bool ContainsKey(string key)
+        {
+            return _keyValuePairs.ContainsKey(key.ToLowerInvariant());
+        }
+
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+        {
+            ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).CopyTo(array, arrayIndex);
+        }
+
+        public bool Remove(KeyValuePair<string, string> item)
+        {
+            var newItem = new KeyValuePair<string, string>(item.Key.ToLowerInvariant(), item.Value);
+            return ((ICollection<KeyValuePair<string, string>>)_keyValuePairs).Remove(newItem);
+        }
+
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            return ((IEnumerable<KeyValuePair<string, string>>)_keyValuePairs).GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IEnumerable)_keyValuePairs).GetEnumerator();
+        }
+
+        #endregion
+    }
+}

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/Tools.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Reflection;
+using DICUI.Web;
+
+namespace DICUI.Utilities
+{
+    public static class Tools
+    {
+        #region Byte Arrays
+
+        /// <summary>
+        /// Search for a byte array in another array
+        /// </summary>
+        public static bool Contains(this byte[] stack, byte[] needle, out int position, int start = 0, int end = -1)
+        {
+            // Initialize the found position to -1
+            position = -1;
+
+            // If either array is null or empty, we can't do anything
+            if (stack == null || stack.Length == 0 || needle == null || needle.Length == 0)
+                return false;
+
+            // If the needle array is larger than the stack array, it can't be contained within
+            if (needle.Length > stack.Length)
+                return false;
+
+            // If start or end are not set properly, set them to defaults
+            if (start < 0)
+                start = 0;
+            if (end < 0)
+                end = stack.Length - needle.Length;
+
+            for (int i = start; i < end; i++)
+            {
+                if (stack.EqualAt(needle, i))
+                {
+                    position = i;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// See if a byte array starts with another
+        /// </summary>
+        public static bool StartsWith(this byte[] stack, byte[] needle)
+        {
+            return stack.Contains(needle, out int _, start: 0, end: 1);
+        }
+
+        /// <summary>
+        /// Get if a stack at a certain index is equal to a needle
+        /// </summary>
+        private static bool EqualAt(this byte[] stack, byte[] needle, int index)
+        {
+            // If we're too close to the end of the stack, return false
+            if (needle.Length >= stack.Length - index)
+                return false;
+
+            for (int i = 0; i < needle.Length; i++)
+            {
+                if (stack[i + index] != needle[i])
+                    return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Versioning
+
+        /// <summary>
+        /// Check for a new DICUI version
+        /// </summary>
+        /// <returns>
+        /// Bool representing if the values are different.
+        /// String representing the message to display the the user.
+        /// String representing the new release URL.
+        /// </returns>
+        public static (bool different, string message, string url) CheckForNewVersion()
+        {
+            // Get current assembly version
+            string version = GetCurrentVersion();
+
+            // Get the latest tag from GitHub
+            using (var client = new RedumpWebClient())
+            {
+                (string tag, string url) = client.GetRemoteVersionAndUrl();
+                bool different = version != tag;
+
+                string message = $"Local version: {version}"
+                    + $"{Environment.NewLine}Remote version: {tag}"
+                    + (different
+                        ? $"{Environment.NewLine}The update URL has been added copied to your clipboard"
+                        : $"{Environment.NewLine}You have the newest version!");
+
+                return (different, message, url);
+            }
+        }
+
+        /// <summary>
+        /// Get the current assembly version formatted as a string
+        /// </summary>
+        private static string GetCurrentVersion()
+        {
+            var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version;
+            return $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty);
+        }
+
+        #endregion
+    }
+}

DICUI.Library/Web/Enumerations.cs

@@ -0,0 +1,244 @@
+namespace DICUI.Web
+{
+    /// <summary>
+    /// List of all disc categories
+    /// </summary>
+    public enum DiscCategory
+    {
+        Games = 1,
+        Demos = 2,
+        Video = 3,
+        Audio = 4,
+        Multimedia = 5,
+        Applications = 6,
+        Coverdiscs = 7,
+        Educational = 8,
+        BonusDiscs = 9,
+        Preproduction = 10,
+        AddOns = 11,
+    }
+
+    /// <summary>
+    /// Dump status
+    /// </summary>
+    public enum DumpStatus
+    {
+        BadDumpRed = 2,
+        PossibleBadDumpYellow = 3,
+        OriginalMediaBlue = 4,
+        TwoOrMoreDumpsGreen = 5,
+    }
+
+    /// <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>
+    /// List of all known Redump systems
+    /// </summary>
+    public enum RedumpSystem
+    {
+        // Special BIOS sets
+        MicrosoftXboxBIOS,
+        NintendoGameCubeBIOS,
+        SonyPlayStationBIOS,
+        SonyPlayStation2BIOS,
+
+        // Regular systems
+        AcornArchimedes,
+        AppleMacintosh,
+        AtariJaguarCDInteractiveMultimediaSystem,
+        AudioCD,
+        BandaiPippin,
+        BandaiPlaydiaQuickInteractiveSystem,
+        BDVideo,
+        CommodoreAmigaCD,
+        CommodoreAmigaCD32,
+        CommodoreAmigaCDTV,
+        DVDVideo,
+        EnhancedCD,
+        FujitsuFMTownsseries,
+        funworldPhotoPlay,
+        HasbroVideoNow,
+        HasbroVideoNowColor,
+        HasbroVideoNowJr,
+        HasbroVideoNowXP,
+        IBMPCcompatible,
+        IncredibleTechnologiesEagle,
+        KonamieAmusement,
+        KonamiFireBeat,
+        KonamiM2,
+        KonamiSystem573,
+        KonamiSystemGV,
+        KonamiTwinkle,
+        MattelFisherPriceiXL,
+        MattelHyperScan,
+        MemorexVisualInformationSystem,
+        MicrosoftXbox,
+        MicrosoftXbox360,
+        MicrosoftXboxOne,
+        NamcoSegaNintendoTriforce,
+        NamcoSystem12,
+        NamcoSystem246,
+        NavisoftNaviken21,
+        NECPCEngineCDTurboGrafxCD,
+        NECPC88series,
+        NECPC98series,
+        NECPCFXPCFXGA,
+        NintendoGameCube,
+        NintendoWii,
+        NintendoWiiU,
+        PalmOS,
+        Panasonic3DOInteractiveMultiplayer,
+        PanasonicM2,
+        PhilipsCDi,
+        PhilipsCDiDigitalVideo,
+        PhotoCD,
+        PlayStationGameSharkUpdates,
+        SegaChihiro,
+        SegaDreamcast,
+        SegaLindbergh,
+        SegaMegaCDSegaCD,
+        SegaNaomi,
+        SegaNaomi2,
+        SegaPrologue21,
+        SegaRingEdge,
+        SegaRingEdge2,
+        SegaSaturn,
+        SegaTitanVideo,
+        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,
+        SpainPortugal,
+        Sweden,
+        Switzerland,
+        Taiwan,
+        Thailand,
+        Turkey,
+        UnitedArabEmirates,
+        UK,
+        UKAustralia,
+        Ukraine,
+        USA,
+        USAAsia,
+        USABrazil,
+        USACanada,
+        USAEurope,
+        USAGermany,
+        USAJapan,
+        World,
+    }
+}

DICUI.Library/Web/SubmissionInfo.cs

@@ -0,0 +1,311 @@
+using System;
+using System.Collections.Generic;
+using DICUI.Data;
+using DICUI.Utilities;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace DICUI.Web
+{
+    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();
+    }
+
+    /// <summary>
+    /// Common disc info section of New Disc Form
+    /// </summary>
+    public class CommonDiscInfoSection
+    {
+        // Name not defined by Redump
+        [JsonProperty(PropertyName = "d_system", Required = Required.AllowNull)]
+        [JsonConverter(typeof(KnownSystemConverter))]
+        public KnownSystem? System { get; set; }
+
+        // Name not defined by Redump
+        // 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 DiscCategory? 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/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>net472;net48;netcoreapp3.1</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,22 @@
       <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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <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.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </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/UI/AllowedSpeedsTest.cs

@@ -10,11 +10,11 @@ namespace DICUI.Test.Data
         [InlineData(MediaType.CDROM, 72)]
         [InlineData(MediaType.DVD, 24)]
         [InlineData(MediaType.BluRay, 16)]
-        [InlineData(MediaType.LaserDisc, 72)] // TODO: Update when fully determined
-        [InlineData(null, 72)] // TODO: Update when fully determined
+        [InlineData(MediaType.LaserDisc, 1)]
+        [InlineData(null, 1)]
         public void GetAllowedDriveSpeedForMediaTypeTest(MediaType? mediaType, int maxExpected)
         {
-            var actual = Constants.GetSpeedsForMediaType(mediaType);
+            var actual = Interface.GetSpeedsForMediaType(mediaType);
             Assert.Equal(maxExpected, actual.Last());
         }
     }

DICUI.Test/Utilities/ConvertersTest.cs

@@ -8,48 +8,50 @@ namespace DICUI.Test.Utilities
     public class ConvertersTest
     {
         [Theory]
-        [InlineData(DICCommand.Audio, MediaType.CDROM)]
-        [InlineData(DICCommand.BluRay, MediaType.BluRay)]
-        [InlineData(DICCommand.Close, null)]
-        [InlineData(DICCommand.CompactDisc, MediaType.CDROM)]
-        [InlineData(DICCommand.Data, MediaType.CDROM)]
-        [InlineData(DICCommand.DigitalVideoDisc, MediaType.DVD)]
-        [InlineData(DICCommand.Eject, null)]
-        [InlineData(DICCommand.Floppy, MediaType.FloppyDisk)]
-        [InlineData(DICCommand.GDROM, MediaType.GDROM)]
-        [InlineData(DICCommand.MDS, null)]
-        [InlineData(DICCommand.Reset, null)]
-        [InlineData(DICCommand.Start, null)]
-        [InlineData(DICCommand.Stop, null)]
-        [InlineData(DICCommand.Sub, null)]
-        [InlineData(DICCommand.Swap, MediaType.GDROM)]
-        [InlineData(DICCommand.XBOX, MediaType.DVD)]
-        public void BaseCommandToMediaTypeTest(DICCommand command, MediaType? expected)
+        [InlineData(DiscImageCreator.Command.Audio, MediaType.CDROM)]
+        [InlineData(DiscImageCreator.Command.BluRay, MediaType.BluRay)]
+        [InlineData(DiscImageCreator.Command.Close, null)]
+        [InlineData(DiscImageCreator.Command.CompactDisc, MediaType.CDROM)]
+        [InlineData(DiscImageCreator.Command.Data, MediaType.CDROM)]
+        [InlineData(DiscImageCreator.Command.DigitalVideoDisc, MediaType.DVD)]
+        [InlineData(DiscImageCreator.Command.Eject, null)]
+        [InlineData(DiscImageCreator.Command.Floppy, MediaType.FloppyDisk)]
+        [InlineData(DiscImageCreator.Command.GDROM, MediaType.GDROM)]
+        [InlineData(DiscImageCreator.Command.MDS, null)]
+        [InlineData(DiscImageCreator.Command.Reset, null)]
+        [InlineData(DiscImageCreator.Command.SACD, MediaType.CDROM)]
+        [InlineData(DiscImageCreator.Command.Start, null)]
+        [InlineData(DiscImageCreator.Command.Stop, null)]
+        [InlineData(DiscImageCreator.Command.Sub, null)]
+        [InlineData(DiscImageCreator.Command.Swap, MediaType.GDROM)]
+        [InlineData(DiscImageCreator.Command.XBOX, MediaType.DVD)]
+        public void BaseCommandToMediaTypeTest(DiscImageCreator.Command command, MediaType? expected)
         {
-            MediaType? actual = Converters.BaseCommmandToMediaType(command);
+            MediaType? actual = DiscImageCreator.Converters.ToMediaType(command);
             Assert.Equal(expected, actual);
         }
 
         [Theory]
-        [InlineData(DICCommand.Audio, KnownSystem.AudioCD)]
-        [InlineData(DICCommand.BluRay, KnownSystem.SonyPlayStation3)]
-        [InlineData(DICCommand.Close, null)]
-        [InlineData(DICCommand.CompactDisc, KnownSystem.IBMPCCompatible)]
-        [InlineData(DICCommand.Data, KnownSystem.IBMPCCompatible)]
-        [InlineData(DICCommand.DigitalVideoDisc, KnownSystem.IBMPCCompatible)]
-        [InlineData(DICCommand.Eject, null)]
-        [InlineData(DICCommand.Floppy, KnownSystem.IBMPCCompatible)]
-        [InlineData(DICCommand.GDROM, KnownSystem.SegaDreamcast)]
-        [InlineData(DICCommand.MDS, null)]
-        [InlineData(DICCommand.Reset, null)]
-        [InlineData(DICCommand.Start, null)]
-        [InlineData(DICCommand.Stop, null)]
-        [InlineData(DICCommand.Sub, null)]
-        [InlineData(DICCommand.Swap, KnownSystem.SegaDreamcast)]
-        [InlineData(DICCommand.XBOX, KnownSystem.MicrosoftXBOX)]
-        public void BaseCommandToKnownSystemTest(DICCommand command, KnownSystem? expected)
+        [InlineData(DiscImageCreator.Command.Audio, KnownSystem.AudioCD)]
+        [InlineData(DiscImageCreator.Command.BluRay, KnownSystem.SonyPlayStation3)]
+        [InlineData(DiscImageCreator.Command.Close, null)]
+        [InlineData(DiscImageCreator.Command.CompactDisc, KnownSystem.IBMPCCompatible)]
+        [InlineData(DiscImageCreator.Command.Data, KnownSystem.IBMPCCompatible)]
+        [InlineData(DiscImageCreator.Command.DigitalVideoDisc, KnownSystem.IBMPCCompatible)]
+        [InlineData(DiscImageCreator.Command.Eject, null)]
+        [InlineData(DiscImageCreator.Command.Floppy, KnownSystem.IBMPCCompatible)]
+        [InlineData(DiscImageCreator.Command.GDROM, KnownSystem.SegaDreamcast)]
+        [InlineData(DiscImageCreator.Command.MDS, null)]
+        [InlineData(DiscImageCreator.Command.Reset, null)]
+        [InlineData(DiscImageCreator.Command.SACD, KnownSystem.SuperAudioCD)]
+        [InlineData(DiscImageCreator.Command.Start, null)]
+        [InlineData(DiscImageCreator.Command.Stop, null)]
+        [InlineData(DiscImageCreator.Command.Sub, null)]
+        [InlineData(DiscImageCreator.Command.Swap, KnownSystem.SegaDreamcast)]
+        [InlineData(DiscImageCreator.Command.XBOX, KnownSystem.MicrosoftXBOX)]
+        public void BaseCommandToKnownSystemTest(DiscImageCreator.Command command, KnownSystem? expected)
         {
-            KnownSystem? actual = Converters.BaseCommandToKnownSystem(command);
+            KnownSystem? actual = DiscImageCreator.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 = DiscImageCreator.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;
                 }