Bump version to 1.17

Add Avalonia UI

.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,4 +1,26 @@
+### 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)

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

@@ -0,0 +1,35 @@
+using Avalonia.Media;
+using DICUI.Data;
+using DICUI.Utilities;
+
+namespace DICUI.Avalonia
+{
+    /// <summary>
+    /// Represents a single item in the System combo box
+    /// </summary>
+    public class KnownSystemComboBoxItem
+    {
+        private object data;
+
+        public KnownSystemComboBoxItem(KnownSystem? system) => data = system;
+        public KnownSystemComboBoxItem(KnownSystemCategory? category) => data = category;
+
+        public ISolidColorBrush Foreground { get => IsHeader() ? Brushes.Gray : Brushes.Black; }
+
+        public bool IsHeader() => data is KnownSystemCategory?;
+        public bool IsSystem() => data is KnownSystem?;
+
+        public static implicit operator KnownSystem? (KnownSystemComboBoxItem item) => item.data as KnownSystem?;
+
+        public string Name
+        {
+            get
+            {
+                if (IsHeader())
+                    return "---------- " + (data as KnownSystemCategory?).LongName() + " ----------";
+                else
+                    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,55 @@
+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 string StartDumping = "Start Dumping";
+        public const string StopDumping = "Stop Dumping";
+
+        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();
+        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.NintendoGameCubeGameDisc:
+                case MediaType.NintendoWiiOpticalDisc:
+                    return dvd;
+                case MediaType.BluRay:
+                    return bd;
+                default:
+                    return unknown;
+            }
+        }
+
+        // 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,51 @@
+<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.17.0</Version>
+    <AssemblyVersion>1.17.0</AssemblyVersion>
+    <FileVersion>1.17.0</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" Version="1.4.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+  </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,264 @@
+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.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

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

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,820 @@
+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.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 (!UIOptions.SkipMediaTypeDetection)
+                {
+                    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." : ("detected " + CurrentMediaType.LongName() + "."));
+                }
+            }
+        }
+
+        /// <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.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.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.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()
+        {
+            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 = 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(Env.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}", Env.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 = Constants.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>
+        /// 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 = Constants.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 = Constants.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.ResetDriveAfterDump,
+                        (si) =>
+                        {
+                            var discInformationWindow = new DiscInformationWindow();
+                            discInformationWindow.SubmissionInfo = si;
+                            discInformationWindow.Load();
+                            discInformationWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                            discInformationWindow.ShowDialog(this).ConfigureAwait(false).GetAwaiter().GetResult();
+                            return true;
+                        }
+                    );
+                }
+            }
+            catch
+            {
+                // No-op, we don't care what it was
+            }
+            finally
+            {
+                this.Find<Button>("StartStopButton").Content = Constants.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;
+            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 == Constants.StartDumping)
+            {
+                StartDumping();
+            }
+            else if ((string)this.Find<Button>("StartStopButton").Content == Constants.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.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,162 @@
+<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="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="dd Path" />
+      <TextBox Name="DDPathTextBox" Grid.Row="0" 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="0" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+      -->
+
+      <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5" Text="Subdump Path" />
+      <TextBox Name="SubDumpPathTextBox" Grid.Row="2" Grid.Column="1" Height="25" HorizontalAlignment="Stretch"
+               DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+               Text="{Binding Path=SubDumpPath}" ScrollViewer.VerticalScrollBarVisibility="Disabled" />
+      <Button Name="SubDumpPathButton" Grid.Row="2" Grid.Column="2" Height="25" Width="25" Content="..." Click="BrowseForPathClick" />
+
+      <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,142 @@
+using System;
+using System.IO;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using DICUI.Web;
+
+namespace DICUI.Avalonia
+{
+    public class OptionsWindow : Window
+    {
+        #region Fields
+
+        /// <summary>
+        /// Current UI options
+        /// </summary>
+        public UIOptions UIOptions { get; set; }
+
+        #endregion
+
+        public OptionsWindow()
+        {
+            this.InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        #region Helpers
+
+        /// <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)
+        {
+            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,122 @@
+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; }
+
+        #region Passthrough readonly values
+
+        // TODO: Can any of these be removed?
+        public string DefaultOutputPath { get { return Options.DefaultOutputPath; } }
+        public bool IgnoreFixedDrives { get { return Options.IgnoreFixedDrives; } }
+        public bool ResetDriveAfterDump { get { return Options.ResetDriveAfterDump; } }
+        public bool SkipMediaTypeDetection { get { return Options.SkipMediaTypeDetection; } }
+        public bool SkipSystemDetection { get { return Options.SkipSystemDetection; } }
+        public bool OpenLogWindowAtStartup { get { return Options.OpenLogWindowAtStartup; } }
+
+        #endregion
+
+        /// <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,233 @@
+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; }
+        }
+
+        public string SubDumpPath
+        {
+            get { return _uiOptions.Options.SubDumpPath; }
+            set { _uiOptions.Options.SubDumpPath = 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/DICUI.Check.csproj

@@ -1,16 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;net48;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <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.17.0</Version>
+    <AssemblyVersion>1.17.0</AssemblyVersion>
+    <FileVersion>1.17.0</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="BurnOutSharp" Version="1.4.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
       <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>

DICUI.Check/Program.cs

@@ -1,7 +1,9 @@
 using System;
 using System.IO;
+using BurnOutSharp;
 using DICUI.Data;
 using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI.Check
 {
@@ -10,24 +12,26 @@ namespace DICUI.Check
         public static void Main(string[] args)
         {
             // Help options
-            if (args.Length == 0
-                || args[0] == "/h" || args[0] == "/?"
-                || args[0] == "-h" || args[0] == "-?")
+            if (args.Length == 0 || args[0] == "-h" || args[0] == "-?")
             {
                 DisplayHelp();
                 return;
             }
 
             // List options
-            if (args[0] == "/lm" || args[0] == "/listmedia"
-                || args[0] == "-lm" || args[0] == "--listmedia")
+            if (args[0] == "-lm" || args[0] == "--listmedia")
             {
                 ListMediaTypes();
                 Console.ReadLine();
                 return;
             }
-            else if (args[0] == "/ls" || args[0] == "/listsystems"
-                || args[0] == "-ls" || args[0] == "--listsystems")
+            else if (args[0] == "-lp" || args[0] == "--listprograms")
+            {
+                ListPrograms();
+                Console.ReadLine();
+                return;
+            }
+            else if (args[0] == "-ls" || args[0] == "--listsystems")
             {
                 ListKnownSystems();
                 Console.ReadLine();
@@ -57,14 +61,24 @@ namespace DICUI.Check
                 return;
             }
 
-            // Check for additional flags
+            // 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] == "-c" || args[startIndex] == "--credentials")
+                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];
@@ -76,6 +90,28 @@ namespace DICUI.Check
                 {
                     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
@@ -84,41 +120,58 @@ namespace DICUI.Check
                 }
             }
 
-            // Make a new Progress object
-            var progress = new Progress<Result>();
-            progress.ProgressChanged += ProgressUpdated;
+            // 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]))
+                if (!File.Exists(args[i].Trim('"')))
                 {
-                    DisplayHelp($"{args[i]} does not exist");
+                    DisplayHelp($"{args[i].Trim('"')} does not exist");
                     return;
                 }
 
                 // Get the full file path
-                string filepath = Path.GetFullPath(args[i]);
+                string filepath = Path.GetFullPath(args[i].Trim('"'));
 
                 // Now populate an environment
-                var env = new DumpEnvironment
+                // TODO: Replace this with Dictionary constructor
+                var options = new Options
                 {
-                    OutputDirectory = "",
-                    OutputFilename = filepath,
-                    System = knownSystem,
-                    Type = mediaType,
-                    ScanForProtection = false,
+                    InternalProgram = internalProgram,
+                    ScanForProtection = scan && !string.IsNullOrWhiteSpace(path),
                     PromptForDiscInformation = false,
-                    InternalProgram = Converters.ToInternalProgram(internalProgram),
 
                     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(progress);
+                var result = env.VerifyAndSaveDumpOutput(resultProgress, protectionProgress).ConfigureAwait(false).GetAwaiter().GetResult();
                 Console.WriteLine(result.Message);
             }
         }
@@ -135,30 +188,18 @@ namespace DICUI.Check
             Console.WriteLine("Usage:");
             Console.WriteLine("DICUI.Check.exe <mediatype> <system> [options] </path/to/output.bin> ...");
             Console.WriteLine();
-            Console.WriteLine(@"Common Media Types:\r\n
-bd / bluray     - BD-ROM
-cd / cdrom      - CD-ROM
-dvd             - DVD-ROM
-fd / floppy     - Floppy Disk
-gd / gdrom      - GD-ROM
-umd             - UMD");
-            Console.WriteLine("Run 'DICUI.Check.exe [-lm|--listmedia' for more options");
+            Console.WriteLine("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(@"Common Systems:\r\n
-apple / mac     - Apple Macintosh
-cdi             - Philips CD-i
-ibm / ibmpc     - IBM PC Compatible
-psx / ps1       - Sony PlayStation
-ps2             - Sony PlayStation 2
-psp             - Sony PlayStation Portable
-saturn          - Sega Saturn
-xbox            - Microsoft XBOX
-x360            - Microsoft XBOX 360");
-            Console.WriteLine("Run 'DICUI.Check.exe [-ls|--listsystems' for more options");
+            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();
-            Console.WriteLine(@"Common Options:\r\n
--c username password    - Redump credentials
--u                      - Check for Aaru");
         }
 
         /// <summary>
@@ -176,6 +217,21 @@ x360            - Microsoft XBOX 360");
             }
         }
 
+        /// <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>
@@ -198,5 +254,13 @@ x360            - Microsoft XBOX 360");
         {
             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/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.Check")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI.Check")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
-[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("8cfde289-e171-4d49-a40d-5293265c1253")]
-
-// 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.16")]
-[assembly: AssemblyFileVersion("1.16.0.0")]

DICUI.Check/launchSettings.json

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

DICUI.Library/Aaru/Constants.cs

@@ -62,41 +62,42 @@ namespace DICUI.Aaru
     /// <summary>
     /// Supported encodings for Aaru
     /// </summary>
+    /// TODO: Use to verify encoding settings
     public static class EncodingStrings
     {
-        public static string ArabicMac = "x-mac-arabic";
-        public static string AtariASCII = "atascii";
-        public static string CentralEuropeanMac = "x-mac-ce";
-        public static string CommodorePETSCII = "petscii";
-        public static string CroatianMac = "x-mac-croatian";
-        public static string CyrillicMac = "x-mac-cryillic";
-        public static string FarsiMac = "x-mac-farsi";
-        public static string GreekMac = "x-mac-greek";
-        public static string HebrewMac = "x-mac-hebrew";
-        public static string RomanianMac = "x-mac-romanian";
-        public static string SinclairZXSpectrum = "spectrum";
-        public static string SinclairZX80 = "zx80";
-        public static string SinclairZX81 = "zx81";
-        public static string TurkishMac = "x-mac-turkish";
-        public static string UkrainianMac = "x-mac-ukrainian";
-        public static string Unicode = "utf-16";
-        public static string UnicodeBigEndian = "utf-16BE";
-        public static string UnicodeUTF32BigEndian = "utf-32BE";
-        public static string UnicodeUTF32 = "utf-32";
-        public static string UnicodeUTF7 = "utf-7";
-        public static string UnicodeUTF8 = "utf-8";
-        public static string USASCII = "us-ascii";
-        public static string WesternEuropeanAppleII = "apple2";
-        public static string WesternEuropeanAppleIIc = "apple2c";
-        public static string WesternEuropeanAppleIIe = "apple2e";
-        public static string WesternEuropeanAppleIIgs = "apple2gs";
-        public static string WesternEuropeanAppleLisa = "lisa";
-        public static string WesternEuropeanAtariST = "atarist";
-        public static string WesternEuropeanGEM = "gem";
-        public static string WesternEuropeanGEOS = "geos";
-        public static string WesternEuropeanISO = "iso-8859-1";
-        public static string WesternEuropeanMac = "macintosh";
-        public static string WesternEuropeanRadix50 = "radix50";
+        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>
@@ -119,16 +120,24 @@ namespace DICUI.Aaru
         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";
@@ -139,8 +148,10 @@ namespace DICUI.Aaru
         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";
@@ -150,6 +161,7 @@ namespace DICUI.Aaru
         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";
@@ -231,225 +243,233 @@ namespace DICUI.Aaru
     /// <summary>
     /// Supported formats for Aaru
     /// </summary>
+    /// TODO: Use to verify format settings
     public static class FormatStrings
     {
         // Supported filters
-        public static string AppleDouble = "AppleDouble";
-        public static string AppleSingle = "AppleSingle";
-        public static string BZip2 = "BZip2";
-        public static string GZip = "GZip";
-        public static string LZip = "LZip";
-        public static string MacBinary = "MacBinary";
-        public static string NoFilter = "No filter";
-        public static string PCExchange = "PCExchange";
-        public static string XZ = "XZ";
+        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 static string AppleDiskArchivalRetrievalTool = "Apple Disk Archival/Retrieval Tool";
-        public static string AppleNewDiskImageFormat = "Apple New Disk Image Format";
-        public static string AppleNIB = "Apple NIB";
-        public static string BlindWrite4 = "BlindWrite 4";
-        public static string BlindWrite5 = "BlindWrite 5";
-        public static string CPCEMUDiskFileAndExtendedCPCDiskFile = "CPCEMU Disk-File and Extended CPC Disk-File";
-        public static string D2FDiskImage = "d2f disk image";
-        public static string D88DiskImage = "D88 Disk Image";
-        public static string DIMDiskImage = "DIM Disk Image";
-        public static string DiscFerret = "DiscFerret";
-        public static string DiscJuggler = "DiscJuggler";
-        public static string DreamcastGDIImage = "Dreamcast GDI image";
-        public static string DunfieldsIMD = "Dunfield's IMD";
-        public static string HDCopyDiskImage = "HD-Copy disk image";
-        public static string KryoFluxSTREAM = "KryoFlux STREAM";
-        public static string MAMECompressedHunksOfData = "MAME Compressed Hunks of Data";
-        public static string MicrosoftVHDX = "Microsoft VHDX";
-        public static string NeroBurningROMImage = "Nero Burning ROM image";
-        public static string PartCloneDiskImage = "PartClone disk image";
-        public static string PartimageDiskImage = "Partimage disk image";
-        public static string SpectrumFloppyDiskImage = "Spectrum Floppy Disk Image";
-        public static string SuperCardPro = "SuperCardPro";
-        public static string SydexCopyQM = "Sydex CopyQM";
-        public static string SydexTeleDisk = "Sydex TeleDisk";
+        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 static string ACTApricotDiskImage = "ACT Apricot Disk Image";
-        public static string Alcohol120MediaDescriptorStructure = "Alcohol 120% Media Descriptor Structure";
-        public static string Anex86DiskImage = "Anex86 Disk Image";
-        public static string Apple2InterleavedDiskImage = "Apple ][Interleaved Disk Image";
-        public static string Apple2IMG = "Apple 2IMG";
-        public static string AppleDiskCopy42 = "Apple DiskCopy 4.2";
-        public static string AppleUniversalDiskImageFormat = "Apple Universal Disk Image Format";
-        public static string BasicLisaUtility = "Basic Lisa Utility";
-        public static string CDRDAOTocfile = "CDRDAO tocfile";
-        public static string CDRWinCuesheet = "CDRWin cuesheet";
-        public static string CisCopyDiskImageDCFile = "CisCopy Disk Image(DC-File)";
-        public static string CloneCD = "CloneCD";
-        public static string CopyTape = "CopyTape";
-        public static string DigitalResearchDiskCopy = "Digital Research DiskCopy";
-        public static string AaruFormat = "Aaru format";
-        public static string IBMSaveDskF = "IBM SaveDskF";
-        public static string MAXIDiskImage = "MAXI Disk image";
-        public static string ParallelsDiskImage = "Parallels disk image";
-        public static string QEMUCopyOnWriteDiskImage = "QEMU Copy-On-Write disk image";
-        public static string QEMUCopyOnWriteDiskImageV2 = "QEMU Copy-On-Write disk image v2";
-        public static string QEMUEnhancedDiskImage = "QEMU Enhanced Disk image";
-        public static string RawDiskImage = "Raw Disk Image";
-        public static string RayAracheliansDiskIMage = "Ray Arachelian's Disk IMage";
-        public static string RSIDEHardDiskImage = "RS-IDE Hard Disk Image";
-        public static string T98HardDiskImage = "T98 Hard Disk Image";
-        public static string T98NextNHDr0DiskImage = "T98-Next NHD r0 Disk Image";
-        public static string Virtual98DiskImage = "Virtual98 Disk Image";
-        public static string VirtualBoxDiskImage = "VirtualBox Disk Image";
-        public static string VirtualPC = "VirtualPC";
-        public static string VMwareDiskImage = "VMware disk image";
+        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 static string AcornAdvancedDiscFilingSystem = "Acorn Advanced Disc Filing System";
-        public static string AlexanderOsipovDOSFileSystem = "Alexander Osipov DOS file system";
-        public static string AmigaDOSFilesystem = "Amiga DOS filesystem";
-        public static string AppleFileSystem = "Apple File System";
-        public static string AppleHFSPlusFilesystem = "Apple HFS+ filesystem";
-        public static string AppleHierarchicalFileSystem = "Apple Hierarchical File System";
-        public static string AppleProDOSFilesystem = "Apple ProDOS filesystem";
-        public static string AtheOSFilesystem = "AtheOS Filesystem";
-        public static string BeFilesystem = "Be Filesystem";
-        public static string BSDFastFileSystem = "BSD Fast File System(aka UNIX File System, UFS)";
-        public static string BTreeFileSystem = "B-tree file system";
-        public static string CommodoreFileSystem = "Commodore file system";
-        public static string CramFilesystem = "Cram filesystem";
-        public static string DumpEightPlugin = "dump(8) Plugin";
-        public static string ECMA67 = "ECMA-67";
-        public static string ExtentFileSystemPlugin = "Extent File System Plugin";
-        public static string F2FSPlugin = "F2FS Plugin";
-        public static string Files11OnDiskStructure = "Files-11 On-Disk Structure";
-        public static string FossilFilesystemPlugin = "Fossil Filesystem Plugin";
-        public static string HAMMERFilesystem = "HAMMER Filesystem";
-        public static string HighPerformanceOpticalFileSystem = "High Performance Optical File System";
-        public static string HPLogicalInterchangeFormatPlugin = "HP Logical Interchange Format Plugin";
-        public static string JFSPlugin = "JFS Plugin";
-        public static string LinuxExtendedFilesystem = "Linux extended Filesystem";
-        public static string LinuxExtendedFilesystem234 = "Linux extended Filesystem 2, 3 and 4";
-        public static string LocusFilesystemPlugin = "Locus Filesystem Plugin";
-        public static string MicroDOSFileSystem = "MicroDOS file system";
-        public static string MicrosoftExtendedFileAllocationTable = "Microsoft Extended File Allocation Table";
-        public static string MinixFilesystem = "Minix Filesystem";
-        public static string NewTechnologyFileSystem = "New Technology File System(NTFS)";
-        public static string NILFS2Plugin = "NILFS2 Plugin";
-        public static string NintendoOpticalFilesystems = "Nintendo optical filesystems";
-        public static string OS2HighPerformanceFileSystem = "OS/2 High Performance File System";
-        public static string OS9RandomBlockFilePlugin = "OS-9 Random Block File Plugin";
-        public static string PCEngineCDPlugin = "PC Engine CD Plugin";
-        public static string PCFXPlugin = "PC-FX Plugin";
-        public static string ProfessionalFileSystem = "Professional File System";
-        public static string QNX4Plugin = "QNX4 Plugin";
-        public static string QNX6Plugin = "QNX6 Plugin";
-        public static string ReiserFilesystemPlugin = "Reiser Filesystem Plugin";
-        public static string Reiser4FilesystemPlugin = "Reiser4 Filesystem Plugin";
-        public static string ResilientFileSystemPlugin = "Resilient File System plugin";
-        public static string RT11FileSystem = "RT-11 file system";
-        public static string SmartFileSystem = "SmartFileSystem";
-        public static string SolarOSFilesystem = "Solar_OS filesystem";
-        public static string SquashFilesystem = "Squash filesystem";
-        public static string UNICOSFilesystemPlugin = "UNICOS Filesystem Plugin";
-        public static string UniversalDiskFormat = "Universal Disk Format";
-        public static string UNIXBootFilesystem = "UNIX Boot filesystem";
-        public static string UNIXSystemVFilesystem = "UNIX System V filesystem";
-        public static string VeritasFilesystem = "Veritas filesystem";
-        public static string VMwareFilesystem = "VMware filesystem";
-        public static string XFSFilesystemPlugin = "XFS Filesystem Plugin";
-        public static string XiaFilesystem = "Xia filesystem";
-        public static string ZFSFilesystemPlugin = "ZFS Filesystem Plugin";
+        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 static string AppleDOSFileSystem = "Apple DOS File System";
-        public static string AppleLisaFileSystem = "Apple Lisa File System";
-        public static string AppleMacintoshFileSystem = "Apple Macintosh File System";
-        public static string CPMFileSystem = "CP/M File System";
-        public static string FATXFilesystemPlugin = "FATX Filesystem Plugin";
-        public static string ISO9660Filesystem = "ISO9660 Filesystem";
-        public static string MicrosoftFileAllocationTable = "Microsoft File Allocation Table";
-        public static string OperaFilesystemPlugin = "Opera Filesystem Plugin";
-        public static string UCSDPascalFilesystem = "U.C.S.D.Pascal filesystem";
+        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 static string AcornFileCorePartitions = "Acorn FileCore partitions";
-        public static string ACTApricotPartitions = "ACT Apricot partitions";
-        public static string AmigaRigidDiskBlock = "Amiga Rigid Disk Block";
-        public static string ApplePartitionMap = "Apple Partition Map";
-        public static string AtariPartitions = "Atari partitions";
-        public static string BSDDisklabel = "BSD disklabel";
-        public static string DECDisklabel = "DEC disklabel";
-        public static string DragonFlyBSD64bitDisklabel = "DragonFly BSD 64-bit disklabel";
-        public static string GUIDPartitionTable = "GUID Partition Table";
-        public static string Human68kPartitions = "Human 68k partitions";
-        public static string MasterBootRecord = "Master Boot Record";
-        public static string NECPC9800PartitionTable = "NEC PC-9800 partition table";
-        public static string NeXTDisklabel = "NeXT Disklabel";
-        public static string Plan9PartitionTable = "Plan9 partition table";
-        public static string RioKarmaPartitioning = "Rio Karma partitioning";
-        public static string SGIDiskVolumeHeader = "SGI Disk Volume Header";
-        public static string SunDisklabel = "Sun Disklabel";
-        public static string UNIXHardwired = "UNIX hardwired";
-        public static string UNIXVTOC = "UNIX VTOC";
-        public static string XboxPartitioning = "Xbox partitioning";
-        public static string XENIX = "XENIX";
+        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 static string LisaOfficeSystem = "office";
-        public static string LisaPascalWorkshop = "workshop";
+        public const string LisaOfficeSystem = "office";
+        public const string LisaPascalWorkshop = "workshop"; // Default
 
         // Namespaces for ISO9660 Filesystem
-        public static string JolietVolumeDescriptor = "joliet";
-        public static string PrimaryVolumeDescriptor = "normal";
-        public static string PrimaryVolumeDescriptorwithEncoding = "romeo";
-        public static string RockRidge = "rrip";
-        public static string PrimaryVolumeDescriptorVersionSuffix = "vms";
+        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 static string DOS = "dos";
-        public static string LFNWhenAvailable = "ecs";
-        public static string LongFileNames = "lfn";
-        public static string WindowsNT = "nt";
-        public static string OS2Extended = "os2";
+        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 static string ACTApricotDiskImageCompress = "compress"; // boolean, default false
+        public const string ACTApricotDiskImageCompress = "compress"; // boolean, default false
 
         // Apple DiskCopy 4.2
-        public static string AppleDiskCopyMacOSX = "macosx"; // boolean, default false
+        public const string AppleDiskCopyMacOSX = "macosx"; // boolean, default false
 
         // CDRDAO tocfile
-        public static string CDRDAOTocfileSeparate = "separate"; // boolean, default false
+        public const string CDRDAOTocfileSeparate = "separate"; // boolean, default false
 
         // CDRWin cuesheet
-        public static string CDRWinCuesheetSeparate = "separate"; // boolean, default false
+        public const string CDRWinCuesheetSeparate = "separate"; // boolean, default false
 
-        // Aaru format
-        public static string AaruDeduplicate = "deduplicate"; // boolean, default true
-        public static string AaruDictionary = "dictionary"; // number, default 33554432
-        public static string AaruMaxDDTSize = "max_ddt_size"; // number, default 256
-        public static string AaruMD5 = "md5"; // boolean, default false
-        public static string AaruNoCompress = "nocompress"; // boolean, default false
-        public static string AaruSectorsPerBlock = "sectors_per_block"; // number, default 4096
-        public static string AaruSHA1 = "sha1"; // boolean, default false
-        public static string AaruSHA256 = "sha256"; // boolean, default false
-        public static string AaruSpamSum = "spamsum"; // 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 static string VMwareDiskImageAdapterType = "adapter_type"; // string, default ide
-        public static string VMwareDiskImageHWVersion = "hwversion"; // number, default 4
-        public static string VMwareDiskImageSparse = "sparse"; // boolean, default false
-        public static string VMwareDiskImageSplit = "split"; // boolean, default false
+        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

@@ -130,6 +130,8 @@ namespace DICUI.Aaru
                     return FlagStrings.DiskTagsLong;
                 case Flag.DuplicatedSectors:
                     return FlagStrings.DuplicatedSectorsLong;
+                case Flag.Eject:
+                    return FlagStrings.EjectLong;
                 case Flag.ExtendedAttributes:
                     return FlagStrings.ExtendedAttributesLong;
                 case Flag.Filesystems:
@@ -138,12 +140,22 @@ namespace DICUI.Aaru
                     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:
@@ -156,8 +168,12 @@ namespace DICUI.Aaru
                     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:
@@ -170,6 +186,8 @@ namespace DICUI.Aaru
                     return FlagStrings.SHA384Long;
                 case Flag.SHA512:
                     return FlagStrings.SHA512Long;
+                case Flag.SkipCdiReadyHole:
+                    return FlagStrings.SkipCdiReadyHoleLong;
                 case Flag.SpamSum:
                     return FlagStrings.SpamSumLong;
                 case Flag.StopOnError:

DICUI.Library/Aaru/Enumerations.cs

@@ -64,26 +64,35 @@ namespace DICUI.Aaru
         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,

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/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,16 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;net48;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
+    <Title>DICUI Library</Title>
+    <AssemblyName>DICUI.Library</AssemblyName>
+    <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.17.0</Version>
+    <AssemblyVersion>1.17.0</AssemblyVersion>
+    <FileVersion>1.17.0</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'!='netcoreapp2.1' AND '$(TargetFramework)'!='netcoreapp3.1'">
+  <PropertyGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
     <DefineConstants>NET_FRAMEWORK</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp2.1' AND '$(TargetFramework)'!='netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
     <COMReference Include="IMAPI2">
       <Guid>{2735412F-7F64-5B0F-8F00-5D77AFBE261E}</Guid>
       <VersionMajor>1</VersionMajor>
@@ -32,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" Version="1.3.9.1" />
+    <PackageReference Include="BurnOutSharp" Version="1.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Management" Version="4.7.0" />
   </ItemGroup>

DICUI.Library/Data/BaseParameters.cs

@@ -1,5 +1,11 @@
+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
 {
@@ -8,13 +14,18 @@ namespace DICUI.Data
         /// <summary>
         /// Path to the executable
         /// </summary>
-        public string Path { get; set; }
+        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>
@@ -126,13 +137,104 @@ namespace DICUI.Data
         /// <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 bool DoesExist(List<string> parameters, int index)
+        protected static bool DoesExist(List<string> parameters, int index)
         {
             if (index >= parameters.Count)
                 return false;
@@ -140,12 +242,41 @@ namespace DICUI.Data
             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 bool IsFlag(string parameter)
+        protected static bool IsFlag(string parameter)
         {
             if (parameter.Trim('\"').StartsWith("/"))
                 return true;
@@ -158,7 +289,7 @@ namespace DICUI.Data
         /// </summary>
         /// <param name="parameter">String value to check</param>
         /// <returns>True if it's a valid drive letter, false otherwise</returns>
-        protected bool IsValidDriveLetter(string parameter)
+        protected static bool IsValidDriveLetter(string parameter)
         {
             if (!Regex.IsMatch(parameter, @"^[A-Z]:?\\?$"))
                 return false;
@@ -171,9 +302,9 @@ namespace DICUI.Data
         /// </summary>
         /// <param name="parameter">String value to check</param>
         /// <returns>True if it's a valid bool, false otherwise</returns>
-        protected bool IsValidBool(string parameter)
+        protected static bool IsValidBool(string parameter)
         {
-            return bool.TryParse(parameter, out bool temp);
+            return bool.TryParse(parameter, out bool _);
         }
 
         /// <summary>
@@ -183,7 +314,7 @@ namespace DICUI.Data
         /// <param name="lowerBound">Lower bound (>=)</param>
         /// <param name="upperBound">Upper bound (<=)</param>
         /// <returns>True if it's a valid byte, false otherwise</returns>
-        protected bool IsValidInt8(string parameter, sbyte lowerBound = -1, sbyte upperBound = -1)
+        protected static bool IsValidInt8(string parameter, sbyte lowerBound = -1, sbyte upperBound = -1)
         {
             if (!sbyte.TryParse(parameter, out sbyte temp))
                 return false;
@@ -202,7 +333,7 @@ namespace DICUI.Data
         /// <param name="lowerBound">Lower bound (>=)</param>
         /// <param name="upperBound">Upper bound (<=)</param>
         /// <returns>True if it's a valid Int16, false otherwise</returns>
-        protected bool IsValidInt16(string parameter, short lowerBound = -1, short upperBound = -1)
+        protected static bool IsValidInt16(string parameter, short lowerBound = -1, short upperBound = -1)
         {
             if (!short.TryParse(parameter, out short temp))
                 return false;
@@ -221,7 +352,7 @@ namespace DICUI.Data
         /// <param name="lowerBound">Lower bound (>=)</param>
         /// <param name="upperBound">Upper bound (<=)</param>
         /// <returns>True if it's a valid Int32, false otherwise</returns>
-        protected bool IsValidInt32(string parameter, int lowerBound = -1, int upperBound = -1)
+        protected static bool IsValidInt32(string parameter, int lowerBound = -1, int upperBound = -1)
         {
             if (!int.TryParse(parameter, out int temp))
                 return false;
@@ -240,7 +371,7 @@ namespace DICUI.Data
         /// <param name="lowerBound">Lower bound (>=)</param>
         /// <param name="upperBound">Upper bound (<=)</param>
         /// <returns>True if it's a valid Int64, false otherwise</returns>
-        protected bool IsValidInt64(string parameter, long lowerBound = -1, long upperBound = -1)
+        protected static bool IsValidInt64(string parameter, long lowerBound = -1, long upperBound = -1)
         {
             if (!long.TryParse(parameter, out long temp))
                 return false;
@@ -251,5 +382,329 @@ namespace DICUI.Data
 
             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/Enumerations.cs

@@ -1,34 +1,7 @@
-namespace DICUI.Data
+using System;
+
+namespace DICUI.Data
 {
-    /// <summary>
-    /// Category for Redump
-    /// </summary>
-    public enum Category
-    {
-        Games = 1,
-        Demos = 2,
-        Video = 3,
-        Audio = 4,
-        Multimedia = 5,
-        Applications = 6,
-        Coverdiscs = 7,
-        Educational = 8,
-        BonusDiscs = 9,
-        Preproduction = 10,
-        AddOns = 11,
-    }
-
-    /// <summary>
-    /// Dump status for Redump
-    /// </summary>
-    public enum DumpStatus
-    {
-        BadDumpRed = 2,
-        PossibleBadDumpYellow = 3,
-        OriginalMediaBlue = 4,
-        TwoOrMoreDumpsGreen = 5,
-    }
-
     /// <summary>
     /// Drive type for dumping
     /// </summary>
@@ -47,9 +20,15 @@
     {
         NONE = 0,
 
-        DiscImageCreator,
+        // Dumping support
         Aaru,
-        DD, // TODO: Currently unimplemented
+        DD,
+        DiscImageCreator,
+
+        // Verification support only
+        CleanRip,
+        DCDumper,
+        UmdImageCreator,
     }
 
     /// <summary>
@@ -72,6 +51,7 @@
         HasbroVideoNowColor,
         HasbroVideoNowJr,
         HasbroVideoNowXP,
+        MattelFisherPriceiXL,
         MattelHyperscan,
         MicrosoftXBOX,
         MicrosoftXBOX360,
@@ -240,6 +220,7 @@
 
         AudioCD,
         BDVideo,
+        DVDAudio,
         DVDVideo,
         EnhancedCD,
         HDDVDVideo,
@@ -273,59 +254,6 @@
         Custom
     };
 
-    /// <summary>
-    /// List of all disc langauges
-    /// </summary>
-    public enum Language
-    {
-        Afrikaans,
-        Arabic,
-        Basque,
-        Bulgarian,
-        Catalan,
-        Chinese,
-        Croatian,
-        Czech,
-        Danish,
-        Dutch,
-        English,
-        Finnish,
-        French,
-        Gaelic,
-        German,
-        Greek,
-        Hebrew,
-        Hindi,
-        Hungarian,
-        Italian,
-        Japanese,
-        Korean,
-        Norwegian,
-        Polish,
-        Portuguese,
-        Punjabi,
-        Romanian,
-        Russian,
-        Slovak,
-        Slovenian,
-        Spanish,
-        Swedish,
-        Tamil,
-        Thai,
-        Turkish,
-        Ukrainian,
-    }
-
-    /// <summary>
-    /// All possible language selections
-    /// </summary>
-    public enum LanguageSelection
-    {
-        BiosSettings,
-        LanguageSelector,
-        OptionsMenu,
-    }
-
     /// <summary>
     /// Known media types
     /// </summary>
@@ -385,8 +313,9 @@
     }
 
     /// <summary>
-    /// Media types according to https://docs.microsoft.com/en-us/previous-versions/windows/desktop/cimwin32a/win32-physicalmedia
+    /// 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,
@@ -458,159 +387,6 @@
         TapeDSTLarge = 66,
     }
 
-    /// <summary>
-    /// List of all known Redump systems
-    /// </summary>
-    public enum RedumpSystem
-    {
-        // Special BIOS sets
-        MicrosoftXboxBIOS,
-        NintendoGameCubeBIOS,
-        SonyPlayStationBIOS,
-        SonyPlayStation2BIOS,
-
-        // Regular systems
-        AcornArchimedes,
-        AppleMacintosh,
-        AudioCD,
-        BDVideo,
-        BandaiPippin,
-        BandaiPlaydiaQuickInteractiveSystem,
-        CommodoreAmigaCD,
-        CommodoreAmigaCD32,
-        CommodoreAmigaCDTV,
-        DVDVideo,
-        FujitsuFMTownsseries,
-        HasbroVideoNow,
-        HasbroVideoNowColor,
-        HasbroVideoNowJr,
-        HasbroVideoNowXP,
-        IBMPCcompatible,
-        IncredibleTechnologiesEagle,
-        KonamiFireBeat,
-        KonamiM2,
-        KonamiSystem573,
-        KonamiSystemGV,
-        KonamiTwinkle,
-        KonamieAmusement,
-        MattelHyperScan,
-        MemorexVisualInformationSystem,
-        MicrosoftXbox,
-        MicrosoftXbox360,
-        MicrosoftXboxOne,
-        NECPC88series,
-        NECPC98series,
-        NECPCEngineCDTurboGrafxCD,
-        NECPCFXPCFXGA,
-        NamcoSystem12,
-        NamcoSystem246,
-        NavisoftNaviken21,
-        NinendoGameCube,
-        NintendoWii,
-        NintendoWiiU,
-        PalmOS,
-        Panasonic3DOInteractiveMultiplayer,
-        PanasonicM2,
-        PhilipsCDi,
-        PhilipsCDiDigitalVideo,
-        PhotoCD,
-        PlayStationGameSharkUpdates,
-        SegaChihiro,
-        SegaDreamcast,
-        SegaLindbergh,
-        SegaMegaCDSegaCD,
-        SegaNaomi,
-        SegaNaomi2,
-        SegaRingEdge,
-        SegaRingEdge2,
-        SegaSaturn,
-        SegaTitanVideo,
-        SegaTriforce,
-        SharpX68000,
-        SNKNeoGeoCD,
-        SonyPlayStation,
-        SonyPlayStation2,
-        SonyPlayStation3,
-        SonyPlayStation4,
-        SonyPlayStationPortable,
-        TABAustriaQuizard,
-        TaoiKTV,
-        TomyKissSite,
-        VideoCD,
-        VMLabsNUON,
-        VTechVFlashVSmilePro,
-        ZAPiTGamesGameWaveFamilyEntertainmentSystem,
-    }
-
-    /// <summary>
-    /// List of all known Redump regions
-    /// </summary>
-    public enum Region
-    {
-        Argentina,
-        Asia,
-        AsiaEurope,
-        AsiaUSA,
-        Australia,
-        Austria,
-        AustriaSwitzerland,
-        Belgium,
-        BelgiumNetherlands,
-        Brazil,
-        Canada,
-        China,
-        Croatia,
-        Czech,
-        Denmark,
-        Europe,
-        EuropeAsia,
-        EuropeAustralia,
-        Finland,
-        France,
-        FranceSpain,
-        Germany,
-        GreaterChina,
-        Greece,
-        Hungary,
-        India,
-        Ireland,
-        Israel,
-        Italy,
-        Japan,
-        JapanAsia,
-        JapanEurope,
-        JapanKorea,
-        JapanUSA,
-        Korea,
-        LatinAmerica,
-        Netherlands,
-        Norway,
-        Poland,
-        Portugal,
-        Russia,
-        Scandinavia,
-        Singapore,
-        Slovakia,
-        SouthAfrica,
-        Spain,
-        Sweden,
-        Switzerland,
-        Taiwan,
-        Thailand,
-        Turkey,
-        UnitedArabEmirates,
-        UK,
-        UKAustralia,
-        Ukraine,
-        USA,
-        USAAsia,
-        USABrazil,
-        USACanada,
-        USAEurope,
-        USAJapan,
-        World,
-    }
-
     /// <summary>
     /// Generic yes/no values for Redump
     /// </summary>
@@ -620,4 +396,97 @@
         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,286 @@
+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; }
+        }
+
+        public string SubDumpPath
+        {
+            get { return GetStringSetting(_settings, "SubDumpPath", "Programs\\Subdump\\subdump.exe"); }
+            set { _settings["SubDumpPath"] = 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", false); }
+            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>();
+        }
+
+        /// <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;
+        }
+
+        #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

@@ -24,6 +24,7 @@ namespace DICUI.DiscImageCreator
         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";
@@ -43,6 +44,7 @@ namespace DICUI.DiscImageCreator
         public const string CopyrightManagementInformation = "/c";
         public const string D8Opcode = "/d8";
         public const string DisableBeep = "/q";
+        public const string ExtractMicroSoftCabFile = "/mscf";
         public const string ForceUnitAccess = "/f";
         public const string MultiSession = "/ms";
         public const string NoFixSubP = "/np";
@@ -59,6 +61,7 @@ namespace DICUI.DiscImageCreator
         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

@@ -1,8 +1,4 @@
-using System;
-using System.IO;
 using DICUI.Data;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace DICUI.DiscImageCreator
 {
@@ -26,6 +22,7 @@ namespace DICUI.DiscImageCreator
                 case Command.DigitalVideoDisc:
                 case Command.Disk:
                 case Command.Floppy:
+                case Command.Tape:
                     return KnownSystem.IBMPCCompatible;
                 case Command.GDROM:
                 case Command.Swap:
@@ -77,6 +74,8 @@ namespace DICUI.DiscImageCreator
                     return MediaType.FloppyDisk;
                 case Command.Disk:
                     return MediaType.HardDisk;
+                case Command.Tape:
+                    return MediaType.DataCartridge;
                 default:
                     return null;
             }
@@ -104,7 +103,6 @@ namespace DICUI.DiscImageCreator
                 case MediaType.HDDVD:
                 case MediaType.BluRay:
                 case MediaType.NintendoWiiOpticalDisc:
-                case MediaType.UMD:
                     return ".iso";
                 case MediaType.LaserDisc:
                 case MediaType.NintendoGameCubeGameDisc:
@@ -172,6 +170,8 @@ namespace DICUI.DiscImageCreator
                     return CommandStrings.Sub;
                 case Command.Swap:
                     return CommandStrings.Swap;
+                case Command.Tape:
+                    return CommandStrings.Tape;
                 case Command.XBOX:
                     return CommandStrings.XBOX;
                 case Command.XBOXSwap:
@@ -212,6 +212,8 @@ namespace DICUI.DiscImageCreator
                     return FlagStrings.D8Opcode;
                 case Flag.DisableBeep:
                     return FlagStrings.DisableBeep;
+                case Flag.ExtractMicroSoftCabFile:
+                    return FlagStrings.ExtractMicroSoftCabFile;
                 case Flag.ForceUnitAccess:
                     return FlagStrings.ForceUnitAccess;
                 case Flag.MultiSession:
@@ -244,6 +246,8 @@ namespace DICUI.DiscImageCreator
                     return FlagStrings.SkipSector;
                 case Flag.SubchannelReadLevel:
                     return FlagStrings.SubchannelReadLevel;
+                case Flag.UseAnchorVolumeDescriptorPointer:
+                    return FlagStrings.UseAnchorVolumeDescriptorPointer;
                 case Flag.VideoNow:
                     return FlagStrings.VideoNow;
                 case Flag.VideoNowColor:
@@ -308,6 +312,8 @@ namespace DICUI.DiscImageCreator
                     return Command.Sub;
                 case CommandStrings.Swap:
                     return Command.Swap;
+                case CommandStrings.Tape:
+                    return Command.Tape;
                 case CommandStrings.XBOX:
                     return Command.XBOX;
                 case CommandStrings.XBOXSwap:

DICUI.Library/DiscImageCreator/Enumerations.cs

@@ -25,6 +25,7 @@ namespace DICUI.DiscImageCreator
         Stop,
         Sub,
         Swap,
+        Tape,
         XBOX,
         XBOXSwap,
         XGD2Swap,
@@ -45,6 +46,7 @@ namespace DICUI.DiscImageCreator
         CopyrightManagementInformation,
         D8Opcode,
         DisableBeep,
+        ExtractMicroSoftCabFile,
         ForceUnitAccess,
         MultiSession,
         NoFixSubP,
@@ -61,6 +63,7 @@ namespace DICUI.DiscImageCreator
         SeventyFour,
         SkipSector,
         SubchannelReadLevel,
+        UseAnchorVolumeDescriptorPointer,
         VideoNow,
         VideoNowColor,
         VideoNowXP,

DICUI.Library/Properties/AssemblyInfo.cs

@@ -1,37 +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 ©  2019")]
-[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.16")]
-[assembly: AssemblyFileVersion("1.16.0.0")]
-[assembly: InternalsVisibleTo("DICUI.Test")]

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

@@ -30,17 +30,19 @@ namespace DICUI.Utilities
         {
             get
             {
+                string volumeLabel = Template.DiscNotDetected;
                 if (DriveInfo.IsReady)
                 {
                     if (string.IsNullOrWhiteSpace(DriveInfo.VolumeLabel))
-                        return "track";
+                        volumeLabel = "track";
                     else
-                        return DriveInfo.VolumeLabel;
-                }
-                else
-                {
-                    return Template.DiscNotDetected;
+                        volumeLabel = DriveInfo.VolumeLabel;
                 }
+
+                foreach (char c in Path.GetInvalidFileNameChars())
+                    volumeLabel = volumeLabel.Replace(c, '_');
+
+                return volumeLabel;
             }
         }
 

DICUI.Library/Utilities/Extensions.cs

@@ -4,210 +4,6 @@ namespace DICUI.Utilities
 {
     public static class Extensions
     {
-        #region Redump Information Lists
-
-        /// <summary>
-        /// List of systems that are not publically accessible
-        /// </summary>
-        public static readonly RedumpSystem[] BannedSystems = new RedumpSystem[]
-        {
-            RedumpSystem.AudioCD,
-            RedumpSystem.BDVideo,
-            RedumpSystem.DVDVideo,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowColor,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.HasbroVideoNowXP,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.MicrosoftXboxOne,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NintendoWii,
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.SegaRingEdge,
-            RedumpSystem.SegaRingEdge2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.SonyPlayStation4,
-            RedumpSystem.VideoCD,
-        };
-
-        /// <summary>
-        /// List of systems that have a Cues pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasCues = new RedumpSystem[]
-        {
-            RedumpSystem.AppleMacintosh,
-            RedumpSystem.AudioCD,
-            RedumpSystem.BandaiPippin,
-            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
-            RedumpSystem.CommodoreAmigaCD,
-            RedumpSystem.CommodoreAmigaCD32,
-            RedumpSystem.CommodoreAmigaCDTV,
-            RedumpSystem.FujitsuFMTownsseries,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.IncredibleTechnologiesEagle,
-            RedumpSystem.KonamieAmusement,
-            RedumpSystem.KonamiFireBeat,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.KonamiSystemGV,
-            RedumpSystem.MattelHyperScan,
-            RedumpSystem.MicrosoftXbox,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.NamcoSystem246,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NECPC88series,
-            RedumpSystem.NECPC98series,
-            RedumpSystem.NECPCEngineCDTurboGrafxCD,
-            RedumpSystem.NECPCFXPCFXGA,
-            RedumpSystem.PalmOS,
-            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.PhotoCD,
-            RedumpSystem.PlayStationGameSharkUpdates,
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaMegaCDSegaCD,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-            RedumpSystem.SegaSaturn,
-            RedumpSystem.SegaTriforce,
-            RedumpSystem.SNKNeoGeoCD,
-            RedumpSystem.SonyPlayStation,
-            RedumpSystem.SonyPlayStation2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.TABAustriaQuizard,
-            RedumpSystem.TomyKissSite,
-            RedumpSystem.VideoCD,
-            RedumpSystem.VTechVFlashVSmilePro,
-};
-
-        /// <summary>
-        /// List of systems that has a Dat pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasDat = new RedumpSystem[]
-        {
-            RedumpSystem.MicrosoftXboxBIOS,
-            RedumpSystem.NintendoGameCubeBIOS,
-            RedumpSystem.SonyPlayStationBIOS,
-            RedumpSystem.SonyPlayStation2BIOS,
-
-            RedumpSystem.AppleMacintosh,
-            RedumpSystem.AudioCD,
-            RedumpSystem.BDVideo,
-            RedumpSystem.BandaiPippin,
-            RedumpSystem.BandaiPlaydiaQuickInteractiveSystem,
-            RedumpSystem.CommodoreAmigaCD,
-            RedumpSystem.CommodoreAmigaCD32,
-            RedumpSystem.CommodoreAmigaCDTV,
-            RedumpSystem.DVDVideo,
-            RedumpSystem.FujitsuFMTownsseries,
-            RedumpSystem.HasbroVideoNow,
-            RedumpSystem.HasbroVideoNowJr,
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.IncredibleTechnologiesEagle,
-            RedumpSystem.KonamiFireBeat,
-            RedumpSystem.KonamiM2,
-            RedumpSystem.KonamiSystemGV,
-            RedumpSystem.KonamieAmusement,
-            RedumpSystem.MattelHyperScan,
-            RedumpSystem.MicrosoftXbox,
-            RedumpSystem.MicrosoftXbox360,
-            RedumpSystem.MicrosoftXboxOne,
-            RedumpSystem.NamcoSystem246,
-            RedumpSystem.NavisoftNaviken21,
-            RedumpSystem.NECPC88series,
-            RedumpSystem.NECPC98series,
-            RedumpSystem.NECPCEngineCDTurboGrafxCD,
-            RedumpSystem.NECPCFXPCFXGA,
-            RedumpSystem.NinendoGameCube,
-            RedumpSystem.NintendoWii,
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.PalmOS,
-            RedumpSystem.Panasonic3DOInteractiveMultiplayer,
-            RedumpSystem.PanasonicM2,
-            RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
-            RedumpSystem.PhotoCD,
-            RedumpSystem.PlayStationGameSharkUpdates,
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaLindbergh,
-            RedumpSystem.SegaMegaCDSegaCD,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-            RedumpSystem.SegaRingEdge,
-            RedumpSystem.SegaRingEdge2,
-            RedumpSystem.SegaSaturn,
-            RedumpSystem.SegaTriforce,
-            RedumpSystem.SNKNeoGeoCD,
-            RedumpSystem.SonyPlayStation,
-            RedumpSystem.SonyPlayStation2,
-            RedumpSystem.SonyPlayStation3,
-            RedumpSystem.SonyPlayStation4,
-            RedumpSystem.SonyPlayStationPortable,
-            RedumpSystem.TABAustriaQuizard,
-            RedumpSystem.TomyKissSite,
-            RedumpSystem.VideoCD,
-            RedumpSystem.VMLabsNUON,
-            RedumpSystem.VTechVFlashVSmilePro,
-            RedumpSystem.ZAPiTGamesGameWaveFamilyEntertainmentSystem,
-        };
-
-        /// <summary>
-        /// List of systems that has a Decrypted Keys pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasDkeys = new RedumpSystem[]
-        {
-            RedumpSystem.SonyPlayStation3,
-        };
-
-        /// <summary>
-        /// List of systems that has a GDI pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasGdi = new RedumpSystem[]
-        {
-            RedumpSystem.SegaChihiro,
-            RedumpSystem.SegaDreamcast,
-            RedumpSystem.SegaNaomi,
-            RedumpSystem.SegaNaomi2,
-            RedumpSystem.SegaTriforce,
-        };
-
-        /// <summary>
-        /// List of systems that has a Keys pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasKeys = new RedumpSystem[]
-        {
-            RedumpSystem.NintendoWiiU,
-            RedumpSystem.SonyPlayStation3,
-        };
-
-        /// <summary>
-        /// List of systems that has an LSD pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasLsd = new RedumpSystem[]
-        {
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.SonyPlayStation,
-        };
-
-        /// <summary>
-        /// List of systems that has an SBI pack
-        /// </summary>
-        public static readonly RedumpSystem[] HasSbi = new RedumpSystem[]
-        {
-            RedumpSystem.IBMPCcompatible,
-            RedumpSystem.SonyPlayStation,
-        };
-
-        #endregion
-
         public static bool DoesSupportDriveSpeed(this MediaType? type)
         {
             switch (type)

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

@@ -0,0 +1,48 @@
+using System;
+using System.Reflection;
+using DICUI.Web;
+
+namespace DICUI.Utilities
+{
+    public class Tools
+    {
+        /// <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);
+        }
+
+    }
+}

DICUI.Library/Utilities/Validators.cs

@@ -84,6 +84,10 @@ namespace DICUI.Utilities
                     types.Add(MediaType.CDROM);
                     break;
 
+                case KnownSystem.MattelFisherPriceiXL:
+                    types.Add(MediaType.CDROM);
+                    break;
+
                 // https://en.wikipedia.org/wiki/HyperScan
                 case KnownSystem.MattelHyperscan:
                     types.Add(MediaType.CDROM);
@@ -91,14 +95,14 @@ namespace DICUI.Utilities
 
                 // https://en.wikipedia.org/wiki/Xbox_(console)
                 case KnownSystem.MicrosoftXBOX:
-                    types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
+                    types.Add(MediaType.CDROM);
                     break;
 
                 // https://en.wikipedia.org/wiki/Xbox_360
                 case KnownSystem.MicrosoftXBOX360:
-                    types.Add(MediaType.CDROM);
                     types.Add(MediaType.DVD);
+                    types.Add(MediaType.CDROM);
                     break;
 
                 // https://en.wikipedia.org/wiki/Xbox_One
@@ -118,6 +122,7 @@ namespace DICUI.Utilities
 
                 // https://en.wikipedia.org/wiki/GameCube
                 case KnownSystem.NintendoGameCube:
+                    types.Add(MediaType.DVD); // Only added here to help users; not strictly correct
                     types.Add(MediaType.NintendoGameCubeGameDisc);
                     break;
 
@@ -128,6 +133,7 @@ namespace DICUI.Utilities
 
                 // https://en.wikipedia.org/wiki/Wii
                 case KnownSystem.NintendoWii:
+                    types.Add(MediaType.DVD); // Only added here to help users; not strictly correct
                     types.Add(MediaType.NintendoWiiOpticalDisc);
                     break;
 
@@ -258,6 +264,7 @@ namespace DICUI.Utilities
                     types.Add(MediaType.DVD);
                     types.Add(MediaType.FloppyDisk);
                     types.Add(MediaType.HardDisk);
+                    types.Add(MediaType.DataCartridge);
                     break;
 
                 // https://en.wikipedia.org/wiki/PC-8800_series
@@ -611,6 +618,11 @@ namespace DICUI.Utilities
                     types.Add(MediaType.BluRay);
                     break;
 
+                // https://en.wikipedia.org/wiki/DVD-Audio
+                case KnownSystem.DVDAudio:
+                    types.Add(MediaType.DVD);
+                    break;
+
                 // https://en.wikipedia.org/wiki/DVD-Video
                 case KnownSystem.DVDVideo:
                     types.Add(MediaType.DVD);
@@ -778,7 +790,7 @@ namespace DICUI.Utilities
 
             // Get the DeviceID and MediaType from the current drive letter
             string deviceId = null;
-            ushort mediaType = 0;
+            int mediaType = 0;
             try
             {
                 // Get the device ID first
@@ -789,6 +801,36 @@ namespace DICUI.Utilities
                 foreach (ManagementObject queryObj in searcher.Get())
                 {
                     deviceId = (string)queryObj["DeviceID"];
+
+                    #region Possibly useful fields
+
+                    //foreach (var property in queryObj.Properties)
+                    //{
+                    //    Console.WriteLine(property);
+                    //}
+
+                    //// Capabilities list
+                    //ushort?[] capabilities = (ushort?[])queryObj["Capabilities"];
+
+                    //// Internal name of the device
+                    //string caption = (string)queryObj["Caption"];
+
+                    //// Flags for the file system, see FileSystemFlags
+                    //uint? fileSystemFlagsEx = (uint?)queryObj["FileSystemFlagsEx"];
+
+                    //// "CD Writer" doesn't fit https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-cdromdrive
+                    //string mediaTypeString = (string)queryObj["MediaType"];
+
+                    //// Internal name of the device (Seems like a duplicate of Caption)
+                    //string name = (string)queryObj["Name"];
+
+                    //// Full device ID for the drive (Seems like duplicate of DeviceID)
+                    //string pnpDeviceId = (string)queryObj["PNPDeviceId"];
+
+                    //// Size of the loaded media (extrapolate disc type from this?)
+                    //ulong? size = (ulong?)queryObj["Size"];
+
+                    #endregion
                 }
 
                 // If we got no valid device, we don't care and just return
@@ -820,16 +862,23 @@ namespace DICUI.Utilities
 
                 return null;
 #else
+                // TODO: This entire .NET Core path still doesn't work
+                // This may honestly require an entire import of IMAPI2 stuff and then try
+                // as best as possible to get it working.
+
                 // Now try to get the physical media associated
                 searcher = new ManagementObjectSearcher(
                     "root\\CIMV2",
                     $"SELECT * FROM Win32_PhysicalMedia");
-                    //$"SELECT * FROM Win32_PhysicalMedia WHERE Name = '{deviceId}'");
 
                 foreach (ManagementObject queryObj in searcher.Get())
                 {
-                    deviceId = (string)queryObj["Tag"];
-                    mediaType = (ushort)queryObj["MediaType"];
+                    foreach (var property in queryObj.Properties)
+                    {
+                        Console.WriteLine(property);
+                    }
+
+                    mediaType = (int)(queryObj["MediaType"] ?? 0);
                 }
 
                 return ((PhysicalMediaType)mediaType).ToMediaType();
@@ -865,6 +914,24 @@ namespace DICUI.Utilities
             if (drive.InternalDriveType != InternalDriveType.Optical)
                 return KnownSystem.IBMPCCompatible;
 
+            // DVD-Audio
+            if (Directory.Exists(Path.Combine(drivePath, "AUDIO_TS"))
+                && Directory.EnumerateFiles(Path.Combine(drivePath, "AUDIO_TS")).Count() > 0)
+            {
+                return KnownSystem.DVDAudio;
+            }
+
+            // DVD-Video and Xbox
+            if (Directory.Exists(Path.Combine(drivePath, "VIDEO_TS"))
+                && Directory.EnumerateFiles(Path.Combine(drivePath, "VIDEO_TS")).Count() > 0)
+            {
+                // TODO: Maybe add video track hashes to compare for Xbox and X360?
+                if (string.Equals(drive.VolumeLabel, "SEP13011042072", StringComparison.OrdinalIgnoreCase))
+                    return KnownSystem.MicrosoftXBOX;
+
+                return KnownSystem.DVDVideo;
+            }
+
             // Sega Dreamcast
             if (File.Exists(Path.Combine(drivePath, "IP.BIN")))
             {
@@ -881,22 +948,19 @@ namespace DICUI.Utilities
             }
 
             // Sony PlayStation and Sony PlayStation 2
-            if (File.Exists(Path.Combine(drivePath, "SYSTEM.CNF")))
+            string psxExePath = Path.Combine(drivePath, "PSX.EXE");
+            string systemCnfPath = Path.Combine(drivePath, "SYSTEM.CNF");
+            if (File.Exists(systemCnfPath))
             {
                 // Check for either BOOT or BOOT2
-                using (StreamReader reader = File.OpenText(Path.Combine(drivePath, "SYSTEM.CNF")))
-                {
-                    while (!reader.EndOfStream)
-                    {
-                        string line = reader.ReadLine();
-                        if (line.Contains("BOOT2"))
-                            return KnownSystem.SonyPlayStation2;
-                        else if (line.Contains("BOOT"))
-                            return KnownSystem.SonyPlayStation;
-                    }
-                }
-
-                // If we have a weird disc, just assume PS1
+                var systemCnf = new IniFile(systemCnfPath);
+                if (systemCnf.ContainsKey("BOOT"))
+                    return KnownSystem.SonyPlayStation;
+                else if (systemCnf.ContainsKey("BOOT2"))
+                    return KnownSystem.SonyPlayStation2;
+            }
+            else if (File.Exists(psxExePath))
+            {
                 return KnownSystem.SonyPlayStation;
             }
 
@@ -963,15 +1027,17 @@ namespace DICUI.Utilities
         /// <summary>
         /// Run protection scan on a given dump environment
         /// </summary>
-        /// <param name="env">DumpEnvirionment containing all required information</param>
+        /// <param name="path">Path to scan for protection</param>
+        /// <param name="progress">Optional progress callback</param>
         /// <returns>Copy protection detected in the envirionment, if any</returns>
-        public static async Task<string> RunProtectionScanOnPath(string path)
+        public static async Task<string> RunProtectionScanOnPath(string path, IProgress<FileProtection> progress = null)
         {
+#if NET_FRAMEWORK
             try
             {
                 var found = await Task.Run(() =>
                 {
-                    return ProtectionFind.Scan(path);
+                    return ProtectionFind.Scan(path, includePosition: false, progress: progress);
                 });
 
                 if (found == null || found.Count == 0)
@@ -984,6 +1050,9 @@ namespace DICUI.Utilities
             {
                 return $"Path could not be scanned! {ex}";
             }
+#else
+            return "Copy protection scanning is not available on .NET Core builds";
+#endif
         }
     }
 }

DICUI.Library/Web/CookieAwareWebClient.cs

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

DICUI.Library/Web/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/RedumpAccess.cs

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

DICUI.Library/Web/SubmissionInfo.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Net;
+using DICUI.Data;
 using DICUI.Utilities;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 
-namespace DICUI.Data
+namespace DICUI.Web
 {
     public class SubmissionInfo
     {
@@ -55,193 +53,6 @@ namespace DICUI.Data
 
         [JsonProperty(PropertyName = "size_and_checksums", DefaultValueHandling = DefaultValueHandling.Ignore)]
         public SizeAndChecksumsSection SizeAndChecksums { get; set; } = new SizeAndChecksumsSection();
-
-        #region Regexes
-
-        private readonly Regex addedRegex = new Regex(@"<tr><th>Added</th><td>(.*?)</td></tr>");
-        private readonly Regex barcodeRegex = new Regex(@"<tr><th>Barcode</th></tr><tr><td>(.*?)</td></tr>");
-        private readonly Regex bcaRegex = new Regex(@"<h3>BCA .*?/></h3></td><td .*?></td></tr>"
-            + "<tr><th>Row</th><th>Contents</th><th>ASCII</th></tr>"
-            + "<tr><td>(?<row1number>.*?)</td><td>(?<row1contents>.*?)</td><td>(?<row1ascii>.*?)</td></tr>"
-            + "<tr><td>(?<row2number>.*?)</td><td>(?<row2contents>.*?)</td><td>(?<row2ascii>.*?)</td></tr>"
-            + "<tr><td>(?<row3number>.*?)</td><td>(?<row3contents>.*?)</td><td>(?<row3ascii>.*?)</td></tr>"
-            + "<tr><td>(?<row4number>.*?)</td><td>(?<row4contents>.*?)</td><td>(?<row4ascii>.*?)</td></tr>");
-        private readonly Regex categoryRegex = new Regex(@"<tr><th>Category</th><td>(.*?)</td></tr>");
-        private readonly Regex commentsRegex = new Regex(@"<tr><th>Comments</th></tr><tr><td>(.*?)</td></tr>");
-        private readonly Regex contentsRegex = new Regex(@"<tr><th>Contents</th></tr><tr .*?><td>(.*?)</td></tr>");
-        private readonly Regex discNumberLetterRegex = new Regex(@"\((.*?)\)");
-        private readonly Regex dumpersRegex = new Regex(@"<a href=""/discs/dumper/(.*?)/"">");
-        private readonly Regex editionRegex = new Regex(@"<tr><th>Edition</th><td>(.*?)</td></tr>");
-        private readonly Regex errorCountRegex = new Regex(@"<tr><th>Errors count</th><td>(.*?)</td></tr>");
-        private readonly Regex foreignTitleRegex = new Regex(@"<h2>(.*?)</h2>");
-        private readonly Regex fullMatchRegex = new Regex(@"<td class=""static"">full match ids: (.*?)</td>");
-        private readonly Regex languagesRegex = new Regex(@"<img src=""/images/languages/(.*?)\.png"" alt="".*?"" title="".*?"" />\s*");
-        private readonly Regex lastModifiedRegex = new Regex(@"<tr><th>Last modified</th><td>(.*?)</td></tr>");
-        private readonly Regex mediaRegex = new Regex(@"<tr><th>Media</th><td>(.*?)</td></tr>");
-        private readonly Regex partialMatchRegex = new Regex(@"<td class=""static"">partial match ids: (.*?)</td>");
-        private readonly Regex pvdRegex = new Regex(@"<h3>Primary Volume Descriptor (PVD) <img .*?/></h3></td><td .*?></td></tr>"
-            + @"<tr><th>Record / Entry</th><th>Contents</th><th>Date</th><th>Time</th><th>GMT</th></tr>"
-            + @"<tr><td>Creation</td><td>(?<creationbytes>.*?)</td><td>(?<creationdate>.*?)</td><td>(?<creationtime>.*?)</td><td>(?<creationtimezone>.*?)</td></tr>"
-            + @"<tr><td>Modification</td><td>(?<modificationbytes>.*?)</td><td>(?<modificationdate>.*?)</td><td>(?<modificationtime>.*?)</td><td>(?<modificationtimezone>.*?)</td></tr>"
-            + @"<tr><td>Expiration</td><td>(?<expirationbytes>.*?)</td><td>(?<expirationdate>.*?)</td><td>(?<expirationtime>.*?)</td><td>(?<expirationtimezone>.*?)</td></tr>"
-            + @"<tr><td>Effective</td><td>(?<effectivebytes>.*?)</td><td>(?<effectivedate>.*?)</td><td>(?<effectivetime>.*?)</td><td>(?<effectivetimezone>.*?)</td></tr>");
-        private readonly Regex regionRegex = new Regex(@"<tr><th>Region</th><td><a href=""/discs/region/(.*?)/"">");
-        private readonly Regex ringCodeDoubleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould
-        private readonly Regex ringCodeSingleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould
-        private readonly Regex serialRegex = new Regex(@"<tr><th>Serial</th><td>(.*?)</td></tr>");
-        private readonly Regex systemRegex = new Regex(@"<tr><th>System</th><td><a href=""/discs/system/(.*?)/"">");
-        private readonly Regex titleRegex = new Regex(@"<h1>(.*?)</h1>");
-        private readonly Regex trackRegex = new Regex(@"<tr><td>(?<number>.*?)</td><td>(?<type>.*?)</td><td>(?<pregap>.*?)</td><td>(?<length>.*?)</td><td>(?<sectors>.*?)</td><td>(?<size>.*?)</td><td>(?<crc32>.*?)</td><td>(?<md5>.*?)</td><td>(?<sha1>.*?)</td></tr>");
-        private readonly Regex trackCountRegex = new Regex(@"<tr><th>Number of tracks</th><td>(.*?)</td></tr>");
-        private readonly Regex versionRegex = new Regex(@"<tr><th>Version</th><td>(.*?)</td></tr>");
-        private readonly Regex writeOffsetRegex = new Regex(@"<tr><th>Write offset</th><td>(.*?)</td></tr>");
-
-        #endregion
-
-        /// <summary>
-        /// Fill in information from a Redump disc page
-        /// </summary>
-        /// <param name="discData">String representation of the disc page</param>
-        public void FillFromDiscPage(string discData)
-        {
-            // Title, Disc Number/Letter, Disc Title
-            var match = titleRegex.Match(discData);
-            if (match.Success)
-            {
-                string title = WebUtility.HtmlDecode(match.Groups[1].Value);
-
-                // If we have parenthesis, title is everything before the first one
-                int firstParenLocation = title.IndexOf(" (");
-                if (firstParenLocation >= 0)
-                {
-                    this.CommonDiscInfo.Title = title.Substring(0, firstParenLocation);
-                    var subMatches = discNumberLetterRegex.Match(title);
-                    for (int i = 1; i < subMatches.Groups.Count; i++)
-                    {
-                        string subMatch = subMatches.Groups[i].Value;
-
-                        // Disc number or letter
-                        if (subMatch.StartsWith("Disc"))
-                            this.CommonDiscInfo.DiscNumberLetter = subMatch.Remove(0, "Disc ".Length);
-
-                        // Disc title
-                        else
-                            this.CommonDiscInfo.DiscTitle = subMatch;
-                    }
-                }
-                // Otherwise, leave the title as-is
-                else
-                {
-                    this.CommonDiscInfo.Title = title;
-                }
-            }
-
-            // Foreign Title
-            match = foreignTitleRegex.Match(discData);
-            if (match.Success)
-                this.CommonDiscInfo.ForeignTitleNonLatin = WebUtility.HtmlDecode(match.Groups[1].Value);
-            else
-                this.CommonDiscInfo.ForeignTitleNonLatin = null;
-
-            // Category
-            match = categoryRegex.Match(discData);
-            if (match.Success)
-                this.CommonDiscInfo.Category = Converters.ToCategory(match.Groups[1].Value);
-            else
-                this.CommonDiscInfo.Category = Data.Category.Games;
-
-            // Region
-            match = regionRegex.Match(discData);
-            if (match.Success)
-                this.CommonDiscInfo.Region = Converters.ToRegion(match.Groups[1].Value);
-
-            // Languages
-            var matches = languagesRegex.Matches(discData);
-            if (matches.Count > 0)
-            {
-                List<Language?> tempLanguages = new List<Language?>();
-                foreach (Match submatch in matches)
-                    tempLanguages.Add(Converters.ToLanguage(submatch.Groups[1].Value));
-
-                this.CommonDiscInfo.Languages = tempLanguages.ToArray();
-            }
-
-            // Serial
-            match = serialRegex.Match(discData);
-            if (match.Success)
-                this.CommonDiscInfo.Serial = WebUtility.HtmlDecode(match.Groups[1].Value);
-
-            // Error count
-            match = errorCountRegex.Match(discData);
-            if (match.Success)
-            {
-                // If the error counts don't match, then use the one from the disc page
-                if (!string.IsNullOrEmpty(this.CommonDiscInfo.ErrorsCount) && match.Groups[1].Value != this.CommonDiscInfo.ErrorsCount)
-                    this.CommonDiscInfo.ErrorsCount = match.Groups[1].Value;
-            }
-
-            // Version
-            match = versionRegex.Match(discData);
-            if (match.Success)
-                this.VersionAndEditions.Version = WebUtility.HtmlDecode(match.Groups[1].Value);
-
-            // Edition
-            match = editionRegex.Match(discData);
-            if (match.Success)
-                this.VersionAndEditions.OtherEditions = WebUtility.HtmlDecode(match.Groups[1].Value);
-
-            // Dumpers
-            matches = dumpersRegex.Matches(discData);
-            if (matches.Count > 0)
-            {
-                // Start with any currently listed dumpers
-                List<string> tempDumpers = new List<string>();
-                if (this.DumpersAndStatus.Dumpers.Length > 0)
-                {
-                    foreach (string dumper in this.DumpersAndStatus.Dumpers)
-                        tempDumpers.Add(dumper);
-                }
-
-                foreach (Match submatch in matches)
-                    tempDumpers.Add(WebUtility.HtmlDecode(submatch.Groups[1].Value));
-
-                this.DumpersAndStatus.Dumpers = tempDumpers.ToArray();
-            }
-
-            // Barcode
-            match = barcodeRegex.Match(discData);
-            if (match.Success)
-                this.CommonDiscInfo.Barcode = WebUtility.HtmlDecode(match.Groups[1].Value);
-
-            // Comments
-            match = commentsRegex.Match(discData);
-            if (match.Success)
-            {
-                this.CommonDiscInfo.Comments = WebUtility.HtmlDecode(match.Groups[1].Value)
-                    .Replace("<br />", "\n")
-                    .Replace("<b>ISBN</b>", "[T:ISBN]") + "\n";
-            }
-
-            // Contents
-            match = contentsRegex.Match(discData);
-            if (match.Success)
-            {
-                this.CommonDiscInfo.Contents = WebUtility.HtmlDecode(match.Groups[1].Value)
-                       .Replace("<br />", "\n")
-                       .Replace("</div>", "");
-                this.CommonDiscInfo.Contents = Regex.Replace(this.CommonDiscInfo.Contents, @"<div .*?>", "");
-            }
-
-            // Added
-            match = addedRegex.Match(discData);
-            if (match.Success)
-                this.Added = DateTime.Parse(match.Groups[1].Value);
-
-            // Last Modified
-            match = lastModifiedRegex.Match(discData);
-            if (match.Success)
-                this.LastModified = DateTime.Parse(match.Groups[1].Value);
-        }
     }
 
     /// <summary>
@@ -249,12 +60,12 @@ namespace DICUI.Data
     /// </summary>
     public class CommonDiscInfoSection
     {
-        // TODO: Name not defined
+        // Name not defined by Redump
         [JsonProperty(PropertyName = "d_system", Required = Required.AllowNull)]
         [JsonConverter(typeof(KnownSystemConverter))]
         public KnownSystem? System { get; set; }
 
-        // TODO: Name not defined
+        // 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))]
@@ -273,7 +84,7 @@ namespace DICUI.Data
         public string DiscTitle { get; set; }
 
         [JsonProperty(PropertyName = "d_category", Required = Required.AllowNull)]
-        public Category? Category { get; set; }
+        public DiscCategory? Category { get; set; }
 
         [JsonProperty(PropertyName = "d_region", Required = Required.AllowNull)]
         [JsonConverter(typeof(RegionConverter))]

DICUI.Test/DICUI.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeCoverage" Version="16.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <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" />
@@ -27,7 +27,10 @@
     <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <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/Utilities/DumpEnvironmentTest.cs

@@ -16,14 +16,12 @@ namespace DICUI.Test
         [InlineData("stop D", 'D', false, MediaType.DVD, true)]
         public void ParametersValidTest(string parameters, char letter, bool isFloppy, MediaType? mediaType, bool expected)
         {
-            var env = new DumpEnvironment
-            {
-                Parameters = new DiscImageCreator.Parameters(parameters),
-                Drive = isFloppy
-                    ? new Drive(InternalDriveType.Floppy, new DriveInfo(letter.ToString()))
-                    : new Drive(InternalDriveType.Optical, new DriveInfo(letter.ToString())),
-                Type = mediaType,
-            };
+            var options = new Options() { InternalProgram = "dic" };
+            var drive = isFloppy
+                ? new Drive(InternalDriveType.Floppy, new DriveInfo(letter.ToString()))
+                : new Drive(InternalDriveType.Optical, new DriveInfo(letter.ToString()));
+
+            var env = new DumpEnvironment(options, string.Empty, string.Empty, drive, KnownSystem.IBMPCCompatible, mediaType, parameters);
 
             bool actual = env.ParametersValid();
             Assert.Equal(expected, actual);
@@ -40,11 +38,8 @@ namespace DICUI.Test
         [InlineData("superhero", "blah&foo.bin", "superhero", "blah&foo.bin")]
         public void FixOutputPathsTest(string outputDirectory, string outputFilename, string expectedOutputDirectory, string expectedOutputFilename)
         {
-            var env = new DumpEnvironment
-            {
-                OutputDirectory = outputDirectory,
-                OutputFilename = outputFilename,
-            };
+            var options = new Options() { InternalProgram = "dic" };
+            var env = new DumpEnvironment(options, outputDirectory, outputFilename, null, KnownSystem.IBMPCCompatible, MediaType.CDROM, string.Empty);
 
             env.FixOutputPaths();
             Assert.Equal(expectedOutputDirectory, env.OutputDirectory);

DICUI.sln

@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI", "DICUI\DICUI.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI", "DICUI\DICUI.csproj", "{7B1B75EB-8940-466F-BD51-76471A57F9BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Test", "DICUI.Test\DICUI.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Test", "DICUI.Test\DICUI.Test.csproj", "{7CC064D2-38AB-4A05-8519-28660DE4562A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Library", "DICUI.Library\DICUI.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Library", "DICUI.Library\DICUI.Library.csproj", "{51AB0928-13F9-44BF-A407-B6957A43A056}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D1DCF5A-F0B0-4E81-A05B-F1A7D37C9D9D}"
 	ProjectSection(SolutionItems) = preProject
@@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Avalonia", "DICUI.Avalonia\DICUI.Avalonia.csproj", "{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,6 +42,10 @@ Global
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D09902F-D93E-42D9-84C7-E0246A2EF1CD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DICUI/App.config

@@ -3,6 +3,7 @@
   <appSettings>
     <add key="AaruPath" value="Programs\Aaru\Aaru.exe"/>
     <add key="CreatorPath" value="Programs\Creator\DiscImageCreator.exe"/>
+    <add key="DDPath" value="Programs\DD\dd.exe"/>
     <add key="SubDumpPath" value="Programs\Subdump\subdump.exe"/>
     <add key="DefaultOutputPath" value="ISO"/>
     <add key="InternalProgram" value="DiscImageCreator"/>

DICUI/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/ComboBoxItems/CategoryComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {
@@ -10,20 +10,20 @@ namespace DICUI
     {
         private object data;
 
-        public CategoryComboBoxItem(Category? category) => data = category;
+        public CategoryComboBoxItem(DiscCategory? category) => data = category;
 
-        public static implicit operator Category? (CategoryComboBoxItem item) => item.data as Category?;
+        public static implicit operator DiscCategory? (CategoryComboBoxItem item) => item.data as DiscCategory?;
 
         public string Name
         {
-            get { return (data as Category?).LongName(); }
+            get { return (data as DiscCategory?).LongName(); }
         }
 
         public bool IsChecked { get; set; }
 
-        public Category? Value
+        public DiscCategory? Value
         {
-            get { return data as Category?; }
+            get { return data as DiscCategory?; }
         }
     }
 }

DICUI/ComboBoxItems/LanguageComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {

DICUI/ComboBoxItems/RegionComboBoxItem.cs

@@ -1,5 +1,5 @@
-using DICUI.Data;
-using DICUI.Utilities;
+using DICUI.Utilities;
+using DICUI.Web;
 
 namespace DICUI
 {

DICUI/DICUI.csproj

@@ -1,13 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;net48;netcoreapp3.1</TargetFrameworks>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Prefer32Bit>true</Prefer32Bit>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
+    <Prefer32Bit>true</Prefer32Bit>
+    <Title>DICUI</Title>
+    <AssemblyName>DICUI</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.17.0</Version>
+    <AssemblyVersion>1.17.0</AssemblyVersion>
+    <FileVersion>1.17.0</FileVersion>
+    <IncludeSource>true</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>

DICUI/Options.cs

@@ -1,208 +0,0 @@
-using System;
-using System.Configuration;
-using System.Linq;
-using System.Reflection;
-using DICUI.Data;
-
-namespace DICUI
-{
-    public class Options
-    {
-        public string DefaultOutputPath { get; private set; }
-        public string AaruPath { get; private set; }
-        public string CreatorPath { get; private set; }
-        public string SubDumpPath { get; private set; }
-
-        public string InternalProgram { get; 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 AddPlaceholders { get; set; }
-        public bool PromptForDiscInformation { get; set; }
-        public bool IgnoreFixedDrives { get; set; }
-        public bool ResetDriveAfterDump { get; set; }
-
-        public bool SkipMediaTypeDetection { get; set; }
-        public bool SkipSystemDetection { get; set; }
-
-        public bool VerboseLogging { get; set; }
-        public bool OpenLogWindowAtStartup { get; set; }
-
-        public string Username { get; set; }
-        public string Password { get; set; }
-
-        public void Save()
-        {
-            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
-            //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()
-        {
-            Configuration configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-
-            //TODO: hardcoded, we should find a better way
-            this.AaruPath = GetStringSetting(configFile, "AaruPath", "Programs\\Aaru\\Aaru.exe");
-            this.CreatorPath = GetStringSetting(configFile, "CreatorPath", "Programs\\Creator\\DiscImageCreator.exe");
-            this.SubDumpPath = GetStringSetting(configFile, "SubDumpPath", "Programs\\Subdump\\subdump.exe");
-            this.DefaultOutputPath = GetStringSetting(configFile, "DefaultOutputPath", "ISO");
-            this.InternalProgram = GetStringSetting(configFile, "InternalProgram", Data.InternalProgram.DiscImageCreator.ToString());
-
-            this.PreferredDumpSpeedCD = GetInt32Setting(configFile, "PreferredDumpSpeedCD", 72);
-            this.PreferredDumpSpeedDVD = GetInt32Setting(configFile, "PreferredDumpSpeedDVD", 24);
-            this.PreferredDumpSpeedBD = GetInt32Setting(configFile, "PreferredDumpSpeedBD", 16);
-
-            this.QuietMode = GetBooleanSetting(configFile, "QuietMode", false);
-            this.ParanoidMode = GetBooleanSetting(configFile, "ParanoidMode", false);
-            this.ScanForProtection = GetBooleanSetting(configFile, "ScanForProtection", true);
-            this.SkipMediaTypeDetection = GetBooleanSetting(configFile, "SkipMediaTypeDetection", false);
-            this.SkipSystemDetection = GetBooleanSetting(configFile, "SkipSystemDetection", false);
-            this.RereadAmountForC2 = GetInt32Setting(configFile, "RereadAmountForC2", 20);
-            this.VerboseLogging = GetBooleanSetting(configFile, "VerboseLogging", true);
-            this.OpenLogWindowAtStartup = GetBooleanSetting(configFile, "OpenLogWindowAtStartup", true);
-            this.AddPlaceholders = GetBooleanSetting(configFile, "AddPlaceholders", true);
-            this.PromptForDiscInformation = GetBooleanSetting(configFile, "PromptForDiscInformation", true);
-            this.IgnoreFixedDrives = GetBooleanSetting(configFile, "IgnoreFixedDrives", false);
-            this.ResetDriveAfterDump = GetBooleanSetting(configFile, "ResetDriveAfterDump", false);
-
-            this.Username = GetStringSetting(configFile, "Username", "");
-            this.Password = GetStringSetting(configFile, "Password", "");
-        }
-
-        /// <summary>
-        /// Get a boolean setting from a configuration
-        /// </summary>
-        /// <param name="configFile">Current configuration file</param>
-        /// <param name="key">Setting key to get a value for</param>
-        /// <param name="defaultValue">Default value to return if no value is found</param>
-        /// <returns>Setting value if possible, default value otherwise</returns>
-        public bool GetBooleanSetting(Configuration configFile, string key, bool defaultValue)
-        {
-            var settings = configFile.AppSettings.Settings;
-            if (settings.AllKeys.Contains(key))
-            {
-                if (Boolean.TryParse(settings[key].Value, out bool value))
-                    return value;
-                else
-                    return defaultValue;
-
-            }
-            else
-            {
-                return defaultValue;
-            }
-        }
-
-        /// <summary>
-        /// Get a boolean setting from a configuration
-        /// </summary>
-        /// <param name="configFile">Current configuration file</param>
-        /// <param name="key">Setting key to get a value for</param>
-        /// <param name="defaultValue">Default value to return if no value is found</param>
-        /// <returns>Setting value if possible, default value otherwise</returns>
-        public int GetInt32Setting(Configuration configFile, string key, int defaultValue)
-        {
-            var settings = configFile.AppSettings.Settings;
-            if (settings.AllKeys.Contains(key))
-            {
-                if (Int32.TryParse(settings[key].Value, out int value))
-                    return value;
-                else
-                    return defaultValue;
-
-            }
-            else
-            {
-                return defaultValue;
-            }
-        }
-
-        /// <summary>
-        /// Get a boolean setting from a configuration
-        /// </summary>
-        /// <param name="configFile">Current configuration file</param>
-        /// <param name="key">Setting key to get a value for</param>
-        /// <param name="defaultValue">Default value to return if no value is found</param>
-        /// <returns>Setting value if possible, default value otherwise</returns>
-        public long GetInt64Setting(Configuration configFile, string key, long defaultValue)
-        {
-            var settings = configFile.AppSettings.Settings;
-            if (settings.AllKeys.Contains(key))
-            {
-                if (Int64.TryParse(settings[key].Value, out long value))
-                    return value;
-                else
-                    return defaultValue;
-
-            }
-            else
-            {
-                return defaultValue;
-            }
-        }
-
-        /// <summary>
-        /// Get a boolean setting from a configuration
-        /// </summary>
-        /// <param name="configFile">Current configuration file</param>
-        /// <param name="key">Setting key to get a value for</param>
-        /// <param name="defaultValue">Default value to return if no value is found</param>
-        /// <returns>Setting value if possible, default value otherwise</returns>
-        public string GetStringSetting(Configuration configFile, string key, string defaultValue)
-        {
-            var settings = configFile.AppSettings.Settings;
-            if (settings.AllKeys.Contains(key))
-                return settings[key].Value;
-            else
-                return defaultValue;
-        }
-
-        //TODO: probably should be generic for non-string options
-        //TODO: using reflection for Set and Get is orthodox but it works, should be changed to a key,value map probably
-        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.NintendoGameCubeGameDisc:
-                case MediaType.NintendoWiiOpticalDisc:
-                    return PreferredDumpSpeedDVD;
-                case MediaType.BluRay:
-                    return PreferredDumpSpeedBD;
-                default:
-                    return 8;
-            }
-        }
-    }
-}

DICUI/Properties/AssemblyInfo.cs

@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// 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")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DICUI")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[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)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// 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.16")]
-[assembly: AssemblyFileVersion("1.16.0.0")]
-
-// Anything marked as internal can be used by the test methods
-[assembly: InternalsVisibleTo("DICUI.Test")]

DICUI/UIOptions.cs

@@ -0,0 +1,122 @@
+using System.Collections.Generic;
+using System.Configuration;
+using DICUI.Data;
+
+namespace DICUI
+{
+    public class UIOptions
+    {
+        // TODO: Is there any way that this can be made private?
+        public Options Options { get; set; }
+
+        #region Passthrough readonly values
+
+        // TODO: Can any of these be removed?
+        public string DefaultOutputPath { get { return Options.DefaultOutputPath; } }
+        public bool IgnoreFixedDrives { get { return Options.IgnoreFixedDrives; } }
+        public bool ResetDriveAfterDump { get { return Options.ResetDriveAfterDump; } }
+        public bool SkipMediaTypeDetection { get { return Options.SkipMediaTypeDetection; } }
+        public bool SkipSystemDetection { get { return Options.SkipSystemDetection; } }
+        public bool OpenLogWindowAtStartup { get { return Options.OpenLogWindowAtStartup; } }
+
+        #endregion
+
+        /// <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/ViewModels.cs

@@ -6,113 +6,189 @@ namespace DICUI
 {
     public class OptionsViewModel
     {
-        private Options _options;
+        private readonly UIOptions _uiOptions;
 
-        public OptionsViewModel(Options options)
+        #region Internal Program
+
+        public string AaruPath
         {
-            this._options = options;
+            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 _options.InternalProgram; }
-            set { _options.InternalProgram = value; }
+            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; }
+        }
+
+        public string SubDumpPath
+        {
+            get { return _uiOptions.Options.SubDumpPath; }
+            set { _uiOptions.Options.SubDumpPath = 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 _options.QuietMode; }
-            set { _options.QuietMode = value; }
+            get { return _uiOptions.Options.QuietMode; }
+            set { _uiOptions.Options.QuietMode = value; }
         }
 
         public bool ParanoidMode
         {
-            get { return _options.ParanoidMode; }
-            set { _options.ParanoidMode = value; }
+            get { return _uiOptions.Options.ParanoidMode; }
+            set { _uiOptions.Options.ParanoidMode = value; }
         }
 
         public bool ScanForProtection
         {
-            get { return _options.ScanForProtection; }
-            set { _options.ScanForProtection = value; }
+            get { return _uiOptions.Options.ScanForProtection; }
+            set { _uiOptions.Options.ScanForProtection = value; }
         }
 
         public string RereadAmountForC2
         {
-            get { return Convert.ToString(_options.RereadAmountForC2); }
+            get { return Convert.ToString(_uiOptions.Options.RereadAmountForC2); }
             set
             {
                 if (Int32.TryParse(value, out int result))
-                    _options.RereadAmountForC2 = result;
+                    _uiOptions.Options.RereadAmountForC2 = result;
             }
         }
 
         public bool AddPlaceholders
         {
-            get { return _options.AddPlaceholders; }
-            set { _options.AddPlaceholders = value; }
+            get { return _uiOptions.Options.AddPlaceholders; }
+            set { _uiOptions.Options.AddPlaceholders = value; }
         }
 
         public bool PromptForDiscInformation
         {
-            get { return _options.PromptForDiscInformation; }
-            set { _options.PromptForDiscInformation = value; }
+            get { return _uiOptions.Options.PromptForDiscInformation; }
+            set { _uiOptions.Options.PromptForDiscInformation = value; }
         }
 
         public bool IgnoreFixedDrives
         {
-            get { return _options.IgnoreFixedDrives; }
-            set { _options.IgnoreFixedDrives = value; }
+            get { return _uiOptions.Options.IgnoreFixedDrives; }
+            set { _uiOptions.Options.IgnoreFixedDrives = value; }
         }
 
         public bool ResetDriveAfterDump
         {
-            get { return _options.ResetDriveAfterDump; }
-            set { _options.ResetDriveAfterDump = value; }
+            get { return _uiOptions.Options.ResetDriveAfterDump; }
+            set { _uiOptions.Options.ResetDriveAfterDump = value; }
         }
 
+        #endregion
+
+        #region Skip Options
+
         public bool SkipMediaTypeDetection
         {
-            get { return _options.SkipMediaTypeDetection; }
-            set { _options.SkipMediaTypeDetection = value; }
+            get { return _uiOptions.Options.SkipMediaTypeDetection; }
+            set { _uiOptions.Options.SkipMediaTypeDetection = value; }
         }
 
         public bool SkipSystemDetection
         {
-            get { return _options.SkipSystemDetection; }
-            set { _options.SkipSystemDetection = value; }
+            get { return _uiOptions.Options.SkipSystemDetection; }
+            set { _uiOptions.Options.SkipSystemDetection = value; }
         }
 
+        #endregion
+
+        #region Logging Options
+
         public bool VerboseLogging
         {
-            get { return _options.VerboseLogging; }
+            get { return _uiOptions.Options.VerboseLogging; }
             set
             {
-                _options.VerboseLogging = value;
-                _options.Save();
+                _uiOptions.Options.VerboseLogging = value;
+                _uiOptions.Save(); // TODO: Why does this save here?
             }
         }
 
         public bool OpenLogWindowAtStartup
         {
-            get { return _options.OpenLogWindowAtStartup; }
+            get { return _uiOptions.Options.OpenLogWindowAtStartup; }
             set
             {
-                _options.OpenLogWindowAtStartup = value;
-                _options.Save();
+                _uiOptions.Options.OpenLogWindowAtStartup = value;
+                _uiOptions.Save(); // TODO: Why does this save here?
             }
         }
 
+        #endregion
+
+        #region Redump Login Information
+
         public string Username
         {
-            get { return _options.Username; }
-            set { _options.Username = value; }
+            get { return _uiOptions.Options.Username; }
+            set { _uiOptions.Options.Username = value; }
         }
 
         public string Password
         {
-            get { return _options.Password; }
-            set { _options.Password = value; }
+            get { return _uiOptions.Options.Password; }
+            set { _uiOptions.Options.Password = value; }
+        }
+
+        #endregion
+
+        public OptionsViewModel(UIOptions uiOptions)
+        {
+            this._uiOptions = uiOptions;
         }
     }
 

DICUI/Windows/DiscInformationWindow.xaml

@@ -5,13 +5,14 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:DICUI"
         mc:Ignorable="d"
-        Title="Disc Information" Height="705" Width="515.132" ResizeMode="NoResize"
+        Title="Disc Information" Height="733" Width="515.132" ResizeMode="NoResize"
         Closed="OnClosed">
 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="585"/>
             <RowDefinition Height="80"/>
+            <RowDefinition Height="25"/>
         </Grid.RowDefinitions>
 
         <GroupBox Grid.Row="0" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Common Disc Information">
@@ -152,5 +153,17 @@
                 <TextBox x:Name="EditionTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
             </Grid>
         </GroupBox>
+
+        <!-- Accept / Cancel -->
+        <Grid Height="28" Grid.Row="2" Grid.Column="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            
+            <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/Windows/DiscInformationWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using DICUI.Data;
+using DICUI.Web;
 
 namespace DICUI.Windows
 {
@@ -12,18 +12,30 @@ namespace DICUI.Windows
     /// </summary>
     public partial class DiscInformationWindow : Window
     {
-        private readonly MainWindow _mainWindow;
-        private readonly SubmissionInfo _submissionInfo;
+        /// <summary>
+        /// List of available disc categories
+        /// </summary>
+        public List<CategoryComboBoxItem> Categories { get; private set; }
 
-        private List<CategoryComboBoxItem> _categories;
-        private List<RegionComboBoxItem> _regions;
-        private List<LanguageComboBoxItem> _languages;
+        /// <summary>
+        /// SubmissionInfo object to fill and save
+        /// </summary>
+        public SubmissionInfo SubmissionInfo { get; set; }
 
-        public DiscInformationWindow(MainWindow mainWindow, SubmissionInfo submissionInfo)
+        /// <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; }
+
+        public DiscInformationWindow(SubmissionInfo submissionInfo)
         {
             InitializeComponent();
-            _mainWindow = mainWindow;
-            _submissionInfo = submissionInfo;
+            SubmissionInfo = submissionInfo;
 
             PopulateCategories();
             PopulateRegions();
@@ -31,102 +43,13 @@ namespace DICUI.Windows
             DisableFieldsIfNeeded();
         }
 
-        public void Refresh()
-        {
-            TitleTextBox.Text = _submissionInfo.CommonDiscInfo.Title ?? "";
-            ForeignTitleTextBox.Text = _submissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
-            DiscNumberLetterTextBox.Text = _submissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
-            DiscTitleTextBox.Text = _submissionInfo.CommonDiscInfo.DiscTitle ?? "";
-            CategoryComboBox.SelectedIndex = _categories.FindIndex(r => r == _submissionInfo.CommonDiscInfo.Category);
-            RegionComboBox.SelectedIndex = _regions.FindIndex(r => r == _submissionInfo.CommonDiscInfo.Region);
-            if (_submissionInfo.CommonDiscInfo.Languages != null)
-            {
-                foreach (var language in _submissionInfo.CommonDiscInfo.Languages)
-                    _languages.Find(l => l == language).IsChecked = true;
-            }
-            SerialTextBox.Text = _submissionInfo.CommonDiscInfo.Serial ?? "";
-            L0MasteringRingTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
-            L0MasteringSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
-            L0ToolstampTextBox.Text = _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
-            L0MouldSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
-            L0AdditionalMouldTextBox.Text = _submissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
-            L1MasteringRingTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
-            L1MasteringSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
-            L1ToolstampTextBox.Text = _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
-            L1MouldSIDTextBox.Text = _submissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
-            L1AdditionalMouldTextBox.Text = _submissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
-            BarcodeTextBox.Text = _submissionInfo.CommonDiscInfo.Barcode ?? "";
-            CommentsTextBox.Text = _submissionInfo.CommonDiscInfo.Comments ?? "";
-            ContentsTextBox.Text = _submissionInfo.CommonDiscInfo.Contents ?? "";
-
-            VersionTextBox.Text = _submissionInfo.VersionAndEditions.Version ?? "";
-            EditionTextBox.Text = _submissionInfo.VersionAndEditions.OtherEditions ?? "";
-        }
-
-        /// <summary>
-        /// Get a complete list of categories and fill the combo box
-        /// </summary>
-        private void PopulateCategories()
-        {
-            var categories = Enum.GetValues(typeof(Category)).OfType<Category?>().ToList();
-
-            ViewModels.LoggerViewModel.VerboseLogLn("Populating categories, {0} categories found.", categories.Count);
-
-            _categories = new List<CategoryComboBoxItem>();
-            foreach (var category in categories)
-            {
-                _categories.Add(new CategoryComboBoxItem(category));
-            }
-
-            CategoryComboBox.ItemsSource = _categories;
-            CategoryComboBox.SelectedIndex = 0;
-        }
-
-        /// <summary>
-        /// Get a complete list of regions and fill the combo box
-        /// </summary>
-        private void PopulateRegions()
-        {
-            var regions = Enum.GetValues(typeof(Region)).OfType<Region?>().ToList();
-
-            ViewModels.LoggerViewModel.VerboseLogLn("Populating regions, {0} regions found.", regions.Count);
-
-            _regions = new List<RegionComboBoxItem>();
-            foreach (var region in regions)
-            {
-                _regions.Add(new RegionComboBoxItem(region));
-            }
-
-            RegionComboBox.ItemsSource = _regions;
-            RegionComboBox.SelectedIndex = 0;
-        }
-
-        /// <summary>
-        /// Get a complete list of languages and fill the combo box
-        /// </summary>
-        private void PopulateLanguages()
-        {
-            var languages = Enum.GetValues(typeof(Language)).OfType<Language?>().ToList();
-
-            ViewModels.LoggerViewModel.VerboseLogLn("Populating languages, {0} languages found.", languages.Count);
-
-            _languages = new List<LanguageComboBoxItem>();
-            foreach (var language in languages)
-            {
-                _languages.Add(new LanguageComboBoxItem(language));
-            }
-
-            LanguagesComboBox.ItemsSource = _languages;
-            LanguagesComboBox.SelectedIndex = 0;
-        }
-
         /// <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))
+            if (SubmissionInfo.SizeAndChecksums.Layerbreak == default(long))
             {
                 L1MasteringRingTextBox.IsEnabled = false;
                 L1MasteringRingTextBox.Background = Brushes.Gray;
@@ -145,43 +68,161 @@ namespace DICUI.Windows
             }
         }
 
-        #region Event Handlers
-
-        private void OnClosed(object sender, EventArgs e)
+        /// <summary>
+        /// Load the current contents of the base SubmissionInfo to the UI
+        /// </summary>
+        public void Load()
         {
-            _submissionInfo.CommonDiscInfo.Title = TitleTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.ForeignTitleNonLatin = ForeignTitleTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.DiscNumberLetter = DiscNumberLetterTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.DiscTitle = DiscTitleTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.Category = (CategoryComboBox.SelectedItem as CategoryComboBoxItem)?.Value ?? Category.Games;
-            _submissionInfo.CommonDiscInfo.Region = (RegionComboBox.SelectedItem as RegionComboBoxItem)?.Value ?? Region.World;
+            TitleTextBox.Text = SubmissionInfo.CommonDiscInfo.Title ?? "";
+            ForeignTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
+            DiscNumberLetterTextBox.Text = SubmissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
+            DiscTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.DiscTitle ?? "";
+            CategoryComboBox.SelectedIndex = Categories.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Category);
+            RegionComboBox.SelectedIndex = Regions.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Region);
+            if (SubmissionInfo.CommonDiscInfo.Languages != null)
+            {
+                foreach (var language in SubmissionInfo.CommonDiscInfo.Languages)
+                    Languages.Find(l => l == language).IsChecked = true;
+            }
+            SerialTextBox.Text = SubmissionInfo.CommonDiscInfo.Serial ?? "";
+            L0MasteringRingTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
+            L0MasteringSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
+            L0ToolstampTextBox.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
+            L0MouldSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
+            L0AdditionalMouldTextBox.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
+            L1MasteringRingTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
+            L1MasteringSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
+            L1ToolstampTextBox.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
+            L1MouldSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
+            L1AdditionalMouldTextBox.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
+            BarcodeTextBox.Text = SubmissionInfo.CommonDiscInfo.Barcode ?? "";
+            CommentsTextBox.Text = SubmissionInfo.CommonDiscInfo.Comments ?? "";
+            ContentsTextBox.Text = SubmissionInfo.CommonDiscInfo.Contents ?? "";
+
+            VersionTextBox.Text = SubmissionInfo.VersionAndEditions.Version ?? "";
+            EditionTextBox.Text = SubmissionInfo.VersionAndEditions.OtherEditions ?? "";
+        }
+
+        /// <summary>
+        /// Get a complete list of categories and fill the combo box
+        /// </summary>
+        private void PopulateCategories()
+        {
+            var categories = Enum.GetValues(typeof(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));
+            }
+
+            CategoryComboBox.ItemsSource = Categories;
+            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));
+            }
+
+            LanguagesComboBox.ItemsSource = Languages;
+            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));
+            }
+
+            RegionComboBox.ItemsSource = Regions;
+            RegionComboBox.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Save the current contents of the UI to the base SubmissionInfo
+        /// </summary>
+        private void Save()
+        {
+            SubmissionInfo.CommonDiscInfo.Title = TitleTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin = ForeignTitleTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscNumberLetter = DiscNumberLetterTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscTitle = DiscTitleTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Category = (CategoryComboBox.SelectedItem as CategoryComboBoxItem)?.Value ?? DiscCategory.Games;
+            SubmissionInfo.CommonDiscInfo.Region = (RegionComboBox.SelectedItem as RegionComboBoxItem)?.Value ?? Region.World;
             var languages = new List<Language?>();
-            foreach (var language in _languages)
+            foreach (var language in Languages)
             {
                 if (language.IsChecked)
                     languages.Add(language.Value);
             }
             if (languages.Count == 0)
                 languages.Add(null);
-            _submissionInfo.CommonDiscInfo.Languages = languages.ToArray();
-            _submissionInfo.CommonDiscInfo.Serial = SerialTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = L0MasteringRingTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = L0MasteringSIDTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = L0ToolstampTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = L0MouldSIDTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = L0AdditionalMouldTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = L1MasteringRingTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = L1MasteringSIDTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = L1ToolstampTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = L1MouldSIDTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = L1AdditionalMouldTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.Barcode = BarcodeTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.Comments = CommentsTextBox.Text ?? "";
-            _submissionInfo.CommonDiscInfo.Contents = ContentsTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Languages = languages.ToArray();
+            SubmissionInfo.CommonDiscInfo.Serial = SerialTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = L0MasteringRingTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = L0MasteringSIDTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = L0ToolstampTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = L0MouldSIDTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = L0AdditionalMouldTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = L1MasteringRingTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = L1MasteringSIDTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = L1ToolstampTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = L1MouldSIDTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = L1AdditionalMouldTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Barcode = BarcodeTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Comments = CommentsTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Contents = ContentsTextBox.Text ?? "";
 
-            _submissionInfo.VersionAndEditions.Version = VersionTextBox.Text ?? "";
-            _submissionInfo.VersionAndEditions.OtherEditions = EditionTextBox.Text ?? "";
+            SubmissionInfo.VersionAndEditions.Version = VersionTextBox.Text ?? "";
+            SubmissionInfo.VersionAndEditions.OtherEditions = EditionTextBox.Text ?? "";
+        }
 
+        #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();
         }
 

DICUI/Windows/LogWindow.xaml.cs

@@ -23,11 +23,11 @@ namespace DICUI.Windows
         [DllImport("user32.dll")]
         private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
-        private MainWindow _mainWindow;
+        private readonly MainWindow _mainWindow;
 
-        private FlowDocument _document;
-        private Paragraph _paragraph;
-        private List<Matcher> _matchers;
+        private readonly FlowDocument _document;
+        private readonly Paragraph _paragraph;
+        private readonly List<Matcher> _matchers;
 
         volatile Process _process;
 
@@ -370,9 +370,9 @@ namespace DICUI.Windows
             {
                 foreach (var inline in _paragraph.Inlines)
                 {
-                    if (inline is Run)
+                    if (inline is Run run)
                     {
-                        tw.Write(((Run)(inline)).Text);
+                        tw.Write(run.Text);
                     }
                 }
             }

DICUI/Windows/MainWindow.xaml

@@ -30,7 +30,7 @@
                     <MenuItem x:Name="AppExit" Header="E_xit" HorizontalAlignment="Left" Width="185" Click="AppExitClick" />
                 </MenuItem>
                 <MenuItem Header="_Tools">
-                    <MenuItem x:Name="OptionsMenuItem" Header="_Options" HorizontalAlignment="Left" Width="185" Click="OptionsClick" />
+                    <MenuItem x:Name="OptionsMenuItem" Header="_Options" HorizontalAlignment="Left" Width="185" Click="OptionsMenuItemClick" />
                     <MenuItem x:Name="ShowLogMenuItem" Header="Show _Log Window" IsCheckable="true" Width="185" HorizontalAlignment="Left"
                               DataContext="{Binding Source={x:Static local:ViewModels.LoggerViewModel}}" 
                               IsChecked="{Binding Path=WindowVisible}"
@@ -112,7 +112,7 @@
             </Grid.RowDefinitions>
 
             <Button x:Name="StartStopButton" Grid.Row="0" Grid.Column="0" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="StartStopButtonClick" IsEnabled="False" />
-            <Button x:Name="DiskScanButton" Grid.Row="0" Grid.Column="1" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for disks" Click="DiskScanButtonClick" />
+            <Button x:Name="MediaScanButton" Grid.Row="0" Grid.Column="1" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for disks" Click="MediaScanButtonClick" />
             <Button x:Name="CopyProtectScanButton" Grid.Row="0" Grid.Column="2" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for protection" Click="CopyProtectScanButtonClick" />
             <CheckBox x:Name="EjectWhenDoneCheckBox" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Eject When Done" IsChecked="False" />
         </Grid>

DICUI/Windows/OptionsWindow.xaml

@@ -33,19 +33,35 @@
             </Grid.RowDefinitions>
 
             <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Aaru Path" />
-            <TextBox x:Name="AaruPathTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+            <TextBox x:Name="AaruPathTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=AaruPath}" />
             <Button x:Name="AaruPathButton" Grid.Row="0" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick" />
 
             <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DiscImageCreator Path" />
-            <TextBox x:Name="CreatorPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+            <TextBox x:Name="CreatorPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=CreatorPath}" />
             <Button x:Name="CreatorPathButton" Grid.Row="1" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick" />
 
+            <!--
+            <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DD Path" />
+            <TextBox x:Name="DDPathTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=DDPath}" />
+            <Button x:Name="DDPathButton" Grid.Row="1" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick" />
+            -->
+
             <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="subdump Path" />
-            <TextBox x:Name="SubDumpPathTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+            <TextBox x:Name="SubDumpPathTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=SubDumpPath}" />
             <Button x:Name="SubDumpPathButton" Grid.Row="2" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick"/>
 
             <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path" />
-            <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+            <TextBox x:Name="DefaultOutputPathTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=DefaultOutputPath}" />
             <Button x:Name="DefaultOutputPathButton" Grid.Row="3" Grid.Column="2" Height="22" Width="22" Content="..." Click="BrowseForPathClick" />
         </Grid>
 
@@ -64,16 +80,28 @@
                 </Grid.RowDefinitions>
 
                 <Label Grid.Row="0" Grid.Column="0" Content="CD-ROM" />
-                <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight" Ticks="{Binding Source={x:Static local:Constants.SpeedsForCDAsCollection}}" />
-                <TextBox x:Name="DumpSpeedCDTextBox" Grid.Row="0" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center" Text="{Binding ElementName=DumpSpeedCDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
+                <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                        Ticks="{Binding Source={x:Static local:Constants.SpeedsForCDAsCollection}}"
+                        DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                        Value="{Binding Path=PreferredDumpSpeedCD}" />
+                <TextBox x:Name="DumpSpeedCDTextBox" Grid.Row="0" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
+                        Text="{Binding ElementName=DumpSpeedCDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
                 <Label Grid.Row="1" Grid.Column="0" Content="DVD-ROM" />
-                <Slider x:Name="DumpSpeedDVDSlider" Grid.Row="1" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight" Ticks="{Binding Source={x:Static local:Constants.SpeedsForDVDAsCollection}}" />
-                <TextBox x:Name="DumpSpeedDVDTextBox" Grid.Row="1" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center" Text="{Binding ElementName=DumpSpeedDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
+                <Slider x:Name="DumpSpeedDVDSlider" Grid.Row="1" Grid.Column="1" Minimum="1" Maximum="24" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                        Ticks="{Binding Source={x:Static local:Constants.SpeedsForDVDAsCollection}}"
+                        DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                        Value="{Binding Path=PreferredDumpSpeedDVD}"  />
+                <TextBox x:Name="DumpSpeedDVDTextBox" Grid.Row="1" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
+                         Text="{Binding ElementName=DumpSpeedDVDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
                 <Label Grid.Row="2" Grid.Column="0" Content="BD-ROM" />
-                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="2" Grid.Column="1" Minimum="1" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight" Ticks="{Binding Source={x:Static local:Constants.SpeedsForBDAsCollection}}" />
-                <TextBox x:Name="DumpSpeedBDTextBox" Grid.Row="2" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center" Text="{Binding ElementName=DumpSpeedBDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
+                <Slider x:Name="DumpSpeedBDSlider" Grid.Row="2" Grid.Column="1" Minimum="1" Maximum="16" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
+                        Ticks="{Binding Source={x:Static local:Constants.SpeedsForBDAsCollection}}"
+                        DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                        Value="{Binding Path=PreferredDumpSpeedBD}"  />
+                <TextBox x:Name="DumpSpeedBDTextBox" Grid.Row="2" Grid.Column="2" Width="22" Height="22" TextAlignment="Center" IsReadOnly="True" IsReadOnlyCaretVisible="False" VerticalAlignment="Center"
+                         Text="{Binding ElementName=DumpSpeedBDSlider, Path=Value, UpdateSourceTrigger=PropertyChanged}" Background="LightGray" Foreground="Gray"/>
 
             </Grid>
 
@@ -167,7 +195,9 @@
                 </Grid.RowDefinitions>
 
                 <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
-                <TextBox x:Name="RedumpUsernameTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <TextBox x:Name="RedumpUsernameTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                    DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
+                    Text="{Binding Path=Username}" />
 
                 <Label Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Password" />
                 <PasswordBox x:Name="RedumpPasswordBox" Grid.Row="0" Grid.Column="3" Height="22" HorizontalAlignment="Stretch" PasswordChar="*" />

DICUI/Windows/OptionsWindow.xaml.cs

@@ -14,13 +14,13 @@ namespace DICUI.Windows
     public partial class OptionsWindow : Window
     {
         private readonly MainWindow _mainWindow;
-        private readonly Options _options;
+        private readonly UIOptions _uiOptions;
 
-        public OptionsWindow(MainWindow mainWindow, Options options)
+        public OptionsWindow(MainWindow mainWindow, UIOptions options)
         {
             InitializeComponent();
             _mainWindow = mainWindow;
-            _options = options;
+            _uiOptions = options;
         }
 
         private OpenFileDialog CreateOpenFileDialog()
@@ -41,12 +41,6 @@ namespace DICUI.Windows
             return dialog;
         }
 
-        private string[] PathSettings()
-        {
-            string[] pathSettings = { "AaruPath", "CreatorPath", "DefaultOutputPath", "SubDumpPath" };
-            return pathSettings;
-        }
-
         private TextBox TextBoxForPathSetting(string name)
         {
             return FindName(name + "TextBox") as TextBox;
@@ -83,7 +77,9 @@ namespace DICUI.Windows
                     }
 
                     if (exists)
+                    {
                         TextBoxForPathSetting(pathSettingName).Text = path;
+                    }
                     else
                     {
                         System.Windows.MessageBox.Show(
@@ -99,30 +95,18 @@ namespace DICUI.Windows
 
         public void Refresh()
         {
-            Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting));
-
-            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
-
-            RedumpUsernameTextBox.Text = _options.Username;
-            RedumpPasswordBox.Password = _options.Password;
+            // Handle non-bindable fields
+            RedumpPasswordBox.Password = _uiOptions.Options.Password;
         }
 
         #region Event Handlers
 
         private void OnAcceptClick(object sender, EventArgs e)
         {
-            Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text));
+            // Handle non-bindable fields
+            _uiOptions.Options.Password = RedumpPasswordBox.Password;
 
-            _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
-            _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
-            _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
-
-            _options.Username = RedumpUsernameTextBox.Text;
-            _options.Password = RedumpPasswordBox.Password;
-
-            _options.Save();
+            _uiOptions.Save();
             Hide();
 
             _mainWindow.OnOptionsUpdated();
@@ -134,12 +118,14 @@ namespace DICUI.Windows
             Hide();
         }
 
+        /// <summary>
+        /// Test Redump credentials for validity
+        /// </summary>
         private void OnRedumpTestClick(object sender, EventArgs e)
         {
-            using (CookieAwareWebClient wc = new CookieAwareWebClient())
+            using (RedumpWebClient wc = new RedumpWebClient())
             {
-                RedumpAccess access = new RedumpAccess();
-                if (access.RedumpLogin(wc, RedumpUsernameTextBox.Text, RedumpPasswordBox.Password))
+                if (wc.Login(RedumpUsernameTextBox.Text, RedumpPasswordBox.Password))
                     System.Windows.MessageBox.Show("Redump login credentials accepted!", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
                 else
                     System.Windows.MessageBox.Show("Redump login credentials denied!", "Failure", MessageBoxButton.OK, MessageBoxImage.Error);

README.md

@@ -4,37 +4,40 @@ DiscImageCreator/Aaru UI in C#
 
 [![Build status](https://ci.appveyor.com/api/projects/status/3ldav3v0c373jeqa?svg=true)](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts)
 
-This is a community project, so if you have some time and knowledge to give, we'll be glad to add you to the contributor of this project :)
+This is a community project, so if you have some time and knowledge to give, we'll be glad to add you as a contributor to this project. If you have any suggestions, issues, bugs, or crashes, please look at the [Issues](https://github.com/SabreTools/DICUI/issues) page first to see if it has been reported before and try out the latest AppVeyor WIP build below to see if it has already been addressed. If it hasn't, please open an issue that's as descriptive as you can be. Help me make this a better program for everyone :)
 
-DICUI relies on the following projects:
-- **DiscImageCreator** by Sarami - Dumping - [GitHub](https://github.com/saramibreak/DiscImageCreator)
-- **Aaru** by Claunia - Dumping - [GitHub](https://github.com/aaru-dps/Aaru)
-- **BurnOutSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/BurnOutSharp)
-- **UnshieldSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/UnshieldSharp)
+## Releases
 
-**Note:** Both DiscImageCreator and Aaru have WIP builds. In general, WIP builds are not supported with new flags or features until they make it into the stable release.
+For those who would rather use the most recent stable build, download the latest release here:
+[Releases Page](https://github.com/SabreTools/DICUI/releases)
+
+For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts)
 
 ## System Requirements
 
 Even though this is written in C#, this program can only be used on Windows systems due to one of the base programs, DiscImageCreator, being Windows-only. There is some preliminary support for Linux underway, and we will try to integrate with that when the time comes.
 
-- Windows 7 (newest version of Windows recommended)
-- .NET Framework 4.6.2, .NET Framework 4.7.2, or .NET Core 3.0 Runtimes (.NET Core 3.0 is not currently functional due to a dependency, please do not use it)
-- 128 MB of free RAM
-- As much hard drive space as amount of discs you will be dumping (20+ GB recommended)
+- Windows 7 (newest version of Windows recommended) or Mono-compatible Linux environment (DICUI.Check only)
+- .NET Framework 4.7.2, .NET Framework 4.8, or .NET Core 3.1 Runtimes (.NET Core 3.1 is only partially functional due to a dependency, use at your own risk)
+- 1 GB of free RAM
+- As much hard drive space as the amount of discs you will be dumping (20+ GB recommended)
 
 Ensure that your operating system is as up-to-date as possible, since some features may rely on those updates.
 
-## Releases
+## Information
 
-For those who would rather the most recently stable build, ownload the latest release here:
-[Releases Page](https://github.com/SabreTools/DICUI/releases)
-
-For those who like to test the newest features, download the latest AppVeyor WIP build here: [AppVeyor](https://ci.appveyor.com/project/mnadareski/dicui/build/artifacts)
+For all additional information, including information about the individual components included in the project and what dumping programs are supported, please see [the wiki](https://github.com/SabreTools/DICUI/wiki) for more details.
 
 ## Changelist
 
-A list of all changes can now be found [here](https://github.com/SabreTools/DICUI/blob/master/CHANGELIST.md).
+A list of all changes in each stable release can now be found [here](https://github.com/SabreTools/DICUI/blob/master/CHANGELIST.md).
+
+## External Libraries
+
+DICUI uses some external libraries to assist with additional information gathering after the dumping process.
+
+- **BurnOutSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/BurnOutSharp)
+- **UnshieldSharp** - Protection scanning - [GitHub](https://github.com/mnadareski/UnshieldSharp)
 
 ## Contributors
 
@@ -53,3 +56,4 @@ These are the tireless individuals who have dedicated countless hours to help te
 - **Kludge** - Primary stress tester
 - **ajshell1** - Tester
 - **eientei95** - Tester
+- **VGPC Discord** - Testing and feedback

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 1.16-{build}
+version: 1.17-{build}
 
 # pull request template
 pull_requests:
@@ -32,35 +32,60 @@ build:
 
 # post-build step
 after_build:
-- ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.0.0.2879/aaru-5.0.0.2879-1_windows_x64.zip
-- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/4426240/DiscImageCreator_20200403.zip
+- ps: appveyor DownloadFile https://github.com/aaru-dps/Aaru/releases/download/v5.1.0.3214/aaru-5.1.0.3214-1_windows_x64.zip
+- ps: appveyor DownloadFile http://www.chrysocome.net/downloads/8ab730cd2a29e76ddd89be1f99357942/dd-0.6beta3.zip
+- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/4931645/DiscImageCreator_20200716.zip
 - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip
-- 7z e aaru-5.0.0.2879-1_windows_x64.zip -oDICUI\bin\Debug\net462\Programs\Aaru *
-- 7z e aaru-5.0.0.2879-1_windows_x64.zip -oDICUI\bin\Debug\net472\Programs\Aaru *
-- 7z e aaru-5.0.0.2879-1_windows_x64.zip -oDICUI\bin\Debug\net48\Programs\Aaru *
-- 7z e aaru-5.0.0.2879-1_windows_x64.zip -oDICUI\bin\Debug\netcoreapp3.0\Programs\Aaru *
-- 7z e DiscImageCreator_20200403.zip -oDICUI\bin\Debug\net462\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20200403.zip -oDICUI\bin\Debug\net472\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20200403.zip -oDICUI\bin\Debug\net48\Programs\Creator Release_ANSI\*
-- 7z e DiscImageCreator_20200403.zip -oDICUI\bin\Debug\netcoreapp3.0\Programs\Creator Release_ANSI\*
-- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net462 *
-- mkdir DICUI\bin\Debug\net462\Programs\Subdump
-- mv DICUI\bin\Debug\net462\subdump_fua_0x28.exe DICUI\bin\Debug\net462\Programs\Subdump\subdump.exe
+
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net472\Programs\Aaru *
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net48\Programs\Aaru *
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Aaru *
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\Aaru *
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\Aaru *
+- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Aaru *
+
+- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net472\Programs\DD *
+- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net48\Programs\DD *
+- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\DD *
+- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\DD *
+- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\DD *
+- 7z e dd-0.6beta3.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\DD *
+
+- 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\net472\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\net48\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20200716.zip -oDICUI.Avalonia\bin\Debug\net472\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20200716.zip -oDICUI.Avalonia\bin\Debug\net48\Programs\Creator Release_ANSI\*
+- 7z e DiscImageCreator_20200716.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\*
+
 - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net472 *
 - mkdir DICUI\bin\Debug\net472\Programs\Subdump
 - mv DICUI\bin\Debug\net472\subdump_fua_0x28.exe DICUI\bin\Debug\net472\Programs\Subdump\subdump.exe
 - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net48 *
 - mkdir DICUI\bin\Debug\net48\Programs\Subdump
-- mv DICUI\bin\Debug\net48\subdump_fua_0x28.exe DICUI\bin\Debug\net462\Programs\Subdump\subdump.exe
-- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.0 *
-- mkdir DICUI\bin\Debug\netcoreapp3.0\Programs\Subdump
-- mv DICUI\bin\Debug\netcoreapp3.0\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.0\Programs\Subdump\subdump.exe
+- mv DICUI\bin\Debug\net48\subdump_fua_0x28.exe DICUI\bin\Debug\net48\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.1 *
+- mkdir DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump
+- mv DICUI\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\net472 *
+- mkdir DICUI.Avalonia\bin\Debug\net472\Programs\Subdump
+- mv DICUI.Avalonia\bin\Debug\net472\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\net472\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\net48 *
+- mkdir DICUI.Avalonia\bin\Debug\net48\Programs\Subdump
+- mv DICUI.Avalonia\bin\Debug\net48\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\net48\Programs\Subdump\subdump.exe
+- 7z e subdump_fua_0x28.zip -oDICUI.Avalonia\bin\Debug\netcoreapp3.1 *
+- mkdir DICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump
+- mv DICUI.Avalonia\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe DICUI.Avalonia\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe
+
 - 7z a DICUI.zip DICUI\bin\Debug\*
+- 7z a DICUI-Avalonia.zip DICUI.Avalonia\bin\Debug\*
 - 7z a DICUI-Check.zip DICUI.Check\bin\Debug\*
 
 # artifact linking
 artifacts:
 - path: DICUI.zip
-  name: DICUI
+  name: DICUI (WPF UI)
+- path: DICUI-Avalonia.zip
+  name: DICUI (Avalonia UI)
 - path: DICUI-Check.zip
   name: DICUI Check