Support JagCD (may need /ms still)

CHANGELIST.md

@@ -1,3 +1,12 @@
+### 1.12 (2019-01-27)
+- Added a few new systems and formats
+- Added new DIC commands and flags
+- Updated the `!submissionInfo.txt` file order
+- Fixed Audio CD handling
+- Added Sega CD / Mega CD header extraction
+- Readded Floppy Disk as a supported format
+- And more! See the full Git commit list for more details
+
 ### 1.11 (2018-09-20)
 
 - Fix formatting of XBOX and XBOX 360 security sector output

DICUI.Check/App.config

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

DICUI.Check/DICUI.Check.csproj

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8CFDE289-E171-4D49-A40D-5293265C1253}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>DICUI.Check</RootNamespace>
+    <AssemblyName>DICUI.Check</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DICUI.Library\DICUI.Library.csproj">
+      <Project>{51ab0928-13f9-44bf-a407-b6957a43a056}</Project>
+      <Name>DICUI.Library</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

DICUI.Check/Program.cs

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

DICUI.Check/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DICUI.Forms/DICUI.Forms.csproj

@@ -58,6 +58,7 @@
     <Compile Include="Constants.cs" />
     <Compile Include="EnumDescriptionConverter.cs" />
     <Compile Include="KnownSystemComboBoxItem.cs" />
+    <Compile Include="MediaTypeComboBoxItem.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Properties\Settings1.Designer.cs">
       <AutoGen>True</AutoGen>

DICUI.Forms/KnownSystemComboBoxItem.cs

@@ -1,5 +1,4 @@
-using System.Windows.Media;
-using DICUI.Data;
+using DICUI.Data;
 using DICUI.Utilities;
 
 namespace DICUI

DICUI.Forms/MediaTypeComboBoxItem.cs

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

DICUI.Forms/Options.cs

@@ -11,9 +11,9 @@ namespace DICUI
         public string DICPath { get; private set; }
         public string SubDumpPath { get; private set; }
 
-        public int preferredDumpSpeedCD { get; set; }
-        public int preferredDumpSpeedDVD { get; set; }
-        public int preferredDumpSpeedBD { get; set; }
+        public int PreferredDumpSpeedCD { get; set; }
+        public int PreferredDumpSpeedDVD { get; set; }
+        public int PreferredDumpSpeedBD { get; set; }
 
         public bool QuietMode { get; set; }
         public bool ParanoidMode { get; set; }
@@ -49,9 +49,9 @@ namespace DICUI
             SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe";
             DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO";
 
-            this.preferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
-            this.preferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
-            this.preferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
+            this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
+            this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
+            this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
 
             this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false;
             this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false;
@@ -81,14 +81,14 @@ namespace DICUI
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    return preferredDumpSpeedCD;
+                    return PreferredDumpSpeedCD;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
                 case MediaType.NintendoGameCube:
                 case MediaType.NintendoWiiOpticalDisc:
-                    return preferredDumpSpeedDVD;
+                    return PreferredDumpSpeedDVD;
                 case MediaType.BluRay:
-                    return preferredDumpSpeedBD;
+                    return PreferredDumpSpeedBD;
                 default:
                     return 8;
             }

DICUI.Forms/ViewModels.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Media;
 using DICUI.Forms.Windows;
 
 namespace DICUI.Forms

DICUI.Forms/Windows/MainWindow.Designer.cs

@@ -30,6 +30,9 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
             this.MenuBar = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mainWindowLayout = new System.Windows.Forms.TableLayoutPanel();
             this.settingsGroupBox = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
@@ -56,9 +59,6 @@
             this.EjectWhenDoneCheckBox = new System.Windows.Forms.CheckBox();
             this.statusGroupBox = new System.Windows.Forms.GroupBox();
             this.StatusLabel = new System.Windows.Forms.TextBox();
-            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.showLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,13 +74,36 @@
             // 
             // MenuBar
             // 
+            this.MenuBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.toolsToolStripMenuItem,
+            this.helpToolStripMenuItem});
             this.MenuBar.Location = new System.Drawing.Point(0, 0);
             this.MenuBar.Name = "MenuBar";
             this.MenuBar.Size = new System.Drawing.Size(584, 24);
             this.MenuBar.TabIndex = 0;
             this.MenuBar.Text = "menuStrip1";
-            this.MenuBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-                fileToolStripMenuItem, toolsToolStripMenuItem, helpToolStripMenuItem});
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F)));
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Text = "File";
+            // 
+            // toolsToolStripMenuItem
+            // 
+            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+            this.toolsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T)));
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+            this.toolsToolStripMenuItem.Text = "Tools";
+            // 
+            // helpToolStripMenuItem
+            // 
+            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+            this.helpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.H)));
+            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+            this.helpToolStripMenuItem.Text = "Help";
             // 
             // mainWindowLayout
             // 
@@ -117,7 +140,7 @@
             this.tableLayoutPanel2.ColumnCount = 3;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.32794F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 73.67206F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 144F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 145F));
             this.tableLayoutPanel2.Controls.Add(this.parametersLabel, 0, 5);
             this.tableLayoutPanel2.Controls.Add(this.driveSpeedLabel, 0, 4);
             this.tableLayoutPanel2.Controls.Add(this.driveLetterLabel, 0, 3);
@@ -230,7 +253,7 @@
             this.SystemTypeComboBox.FormattingEnabled = true;
             this.SystemTypeComboBox.Location = new System.Drawing.Point(110, 13);
             this.SystemTypeComboBox.Name = "SystemTypeComboBox";
-            this.SystemTypeComboBox.Size = new System.Drawing.Size(295, 21);
+            this.SystemTypeComboBox.Size = new System.Drawing.Size(294, 21);
             this.SystemTypeComboBox.TabIndex = 13;
             this.SystemTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.SystemTypeComboBoxSelectionChanged);
             // 
@@ -239,7 +262,7 @@
             this.MediaTypeComboBox.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.MediaTypeComboBox.DisplayMember = "Name";
             this.MediaTypeComboBox.FormattingEnabled = true;
-            this.MediaTypeComboBox.Location = new System.Drawing.Point(415, 13);
+            this.MediaTypeComboBox.Location = new System.Drawing.Point(414, 13);
             this.MediaTypeComboBox.Name = "MediaTypeComboBox";
             this.MediaTypeComboBox.Size = new System.Drawing.Size(131, 21);
             this.MediaTypeComboBox.TabIndex = 14;
@@ -250,16 +273,16 @@
             this.OutputDirectoryTextBox.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.OutputDirectoryTextBox.Location = new System.Drawing.Point(110, 87);
             this.OutputDirectoryTextBox.Name = "OutputDirectoryTextBox";
-            this.OutputDirectoryTextBox.Size = new System.Drawing.Size(295, 20);
+            this.OutputDirectoryTextBox.Size = new System.Drawing.Size(294, 20);
             this.OutputDirectoryTextBox.TabIndex = 15;
             this.OutputDirectoryTextBox.TextChanged += new System.EventHandler(this.OutputDirectoryTextBoxTextChanged);
             // 
             // OutputDirectoryBrowseButton
             // 
             this.OutputDirectoryBrowseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.OutputDirectoryBrowseButton.Location = new System.Drawing.Point(411, 84);
+            this.OutputDirectoryBrowseButton.Location = new System.Drawing.Point(410, 84);
             this.OutputDirectoryBrowseButton.Name = "OutputDirectoryBrowseButton";
-            this.OutputDirectoryBrowseButton.Size = new System.Drawing.Size(139, 26);
+            this.OutputDirectoryBrowseButton.Size = new System.Drawing.Size(140, 26);
             this.OutputDirectoryBrowseButton.TabIndex = 16;
             this.OutputDirectoryBrowseButton.Text = "Browse";
             this.OutputDirectoryBrowseButton.UseVisualStyleBackColor = true;
@@ -293,16 +316,16 @@
             this.ParametersTextBox.Location = new System.Drawing.Point(110, 199);
             this.ParametersTextBox.Name = "ParametersTextBox";
             this.ParametersTextBox.ReadOnly = true;
-            this.ParametersTextBox.Size = new System.Drawing.Size(295, 20);
+            this.ParametersTextBox.Size = new System.Drawing.Size(294, 20);
             this.ParametersTextBox.TabIndex = 19;
             // 
             // EnableParametersCheckBox
             // 
             this.EnableParametersCheckBox.AutoSize = true;
             this.EnableParametersCheckBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.EnableParametersCheckBox.Location = new System.Drawing.Point(411, 193);
+            this.EnableParametersCheckBox.Location = new System.Drawing.Point(410, 193);
             this.EnableParametersCheckBox.Name = "EnableParametersCheckBox";
-            this.EnableParametersCheckBox.Size = new System.Drawing.Size(139, 33);
+            this.EnableParametersCheckBox.Size = new System.Drawing.Size(140, 33);
             this.EnableParametersCheckBox.TabIndex = 20;
             this.EnableParametersCheckBox.Text = "Enable Editing";
             this.EnableParametersCheckBox.UseVisualStyleBackColor = true;
@@ -403,27 +426,6 @@
             this.StatusLabel.Text = "Waiting for media...";
             this.StatusLabel.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
-            // fileToolStripMenuItem
-            // 
-            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F)));
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.fileToolStripMenuItem.Text = "File";
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T)));
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // helpToolStripMenuItem
-            // 
-            this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
-            this.helpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.H)));
-            this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-            this.helpToolStripMenuItem.Text = "Help";
-            // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";

DICUI.Forms/Windows/MainWindow.cs

@@ -262,11 +262,15 @@ namespace DICUI.Forms.Windows
         private void PopulateMediaType()
         {
             KnownSystem? currentSystem = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem;
-
             if (currentSystem != null)
             {
                 _mediaTypes = Validators.GetValidMediaTypes(currentSystem).ToList();
-                MediaTypeComboBox.DataSource = _mediaTypes;
+
+                var comboBoxItems = new List<MediaTypeComboBoxItem>();
+                foreach (var mediaType in _mediaTypes)
+                    comboBoxItems.Add(new MediaTypeComboBoxItem(mediaType));
+
+                MediaTypeComboBox.DataSource = comboBoxItems;
 
                 MediaTypeComboBox.Enabled = _mediaTypes.Count > 1;
                 MediaTypeComboBox.SelectedIndex = (_mediaTypes.IndexOf(_currentMediaType) >= 0 ? _mediaTypes.IndexOf(_currentMediaType) : 0);
@@ -390,7 +394,7 @@ namespace DICUI.Forms.Windows
                 RereadAmountC2 = _options.RereadAmountForC2,
 
                 System = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem,
-                Type = MediaTypeComboBox.SelectedItem as MediaType?
+                Type = MediaTypeComboBox.SelectedItem as MediaTypeComboBoxItem,
             };
 
             // Fix the output paths
@@ -587,19 +591,19 @@ namespace DICUI.Forms.Windows
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    preferred = _options.preferredDumpSpeedCD;
+                    preferred = _options.PreferredDumpSpeedCD;
                     break;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
                 case MediaType.NintendoGameCube:
                 case MediaType.NintendoWiiOpticalDisc:
-                    preferred = _options.preferredDumpSpeedDVD;
+                    preferred = _options.PreferredDumpSpeedDVD;
                     break;
                 case MediaType.BluRay:
-                    preferred = _options.preferredDumpSpeedBD;
+                    preferred = _options.PreferredDumpSpeedBD;
                     break;
                 default:
-                    preferred = _options.preferredDumpSpeedCD;
+                    preferred = _options.PreferredDumpSpeedCD;
                     break;
             }
 
@@ -630,7 +634,7 @@ namespace DICUI.Forms.Windows
             {
                 ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
                 _currentMediaType = Validators.GetDiscType(drive.Letter);
-                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType != null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
+                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType == null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
             }
         }
 

DICUI.Forms/Windows/MainWindow.resx

@@ -138,27 +138,6 @@
   <metadata name="systemMediaTypeLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="parametersLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="driveSpeedLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="driveLetterLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="outputDirectoryLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="outputFilenameLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="systemMediaTypeLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="StatusLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="StatusLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DICUI.Forms/Windows/OptionsWindow.cs

@@ -29,9 +29,9 @@ namespace DICUI.Forms.Windows
             DumpSpeedBDSlider.Maximum = (int)Constants.SpeedsForBDAsCollection.Last();
 
             // Select the current values
-            DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD;
+            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
+            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
+            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
 
             // Create textbox outputs
             DumpSpeedCDTextBox.Text = DumpSpeedCDSlider.Value.ToString();
@@ -134,9 +134,9 @@ namespace DICUI.Forms.Windows
         {
             Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting));
 
-            DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD;
+            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
+            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
+            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
         }
 
         #region Event Handlers
@@ -152,9 +152,9 @@ namespace DICUI.Forms.Windows
         {
             Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text));
 
-            _options.preferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
-            _options.preferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
-            _options.preferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
+            _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
+            _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
+            _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
 
             _options.QuietMode = QuietModeCheckBox.Checked;
             _options.ParanoidMode = ParanoidModeCheckBox.Checked;

DICUI.Library/Data/Constants.cs

@@ -16,6 +16,7 @@
         public const string Floppy = "fd";
         public const string GDROM = "gd";
         public const string MDS = "mds";
+        public const string Merge = "merge";
         public const string Reset = "reset";
         public const string Start = "start";
         public const string Stop = "stop";
@@ -53,7 +54,9 @@
         public const string ScanFileProtect = "/sf";
         public const string ScanSectorProtect = "/ss";
         public const string SeventyFour = "/74";
+        public const string SkipSector = "/sk";
         public const string SubchannelReadLevel = "/s";
+        public const string VideoNow = "/vn";
     }
 
     /// <summary>
@@ -79,11 +82,11 @@
         public const string VersionField = "Version";
         public const string EditionField = "Edition/Release";
         public const string CopyProtectionField = "Copy Protection";
-        public const string MasteringRingField = "Mastering Ring";
+        public const string MasteringRingField = "Mastering Code (laser branded/etched)";
         public const string MasteringSIDField = "Mastering SID Code";
         public const string MouldSIDField = "Mould SID Code";
         public const string AdditionalMouldField = "Additional Mould";
-        public const string ToolstampField = "Toolstamp or Mastering Code";
+        public const string ToolstampField = "Toolstamp or Mastering Code (engraved/stamped)";
 
         // Automatic Information
 
@@ -99,8 +102,8 @@
         public const string PlayStationAntiModchipField = "Anti-modchip";
         public const string PlayStationLibCryptField = "LibCrypt";
         public const string PlayStation4PICField = "Permanent Information & Control (PIC)";
-        public const string SaturnHeaderField = "Header";
-        public const string SaturnBuildDateField = "Build Date";
+        public const string SegaHeaderField = "Header";
+        public const string SegaBuildDateField = "Build Date";
         public const string XBOXDMIHash = "DMI.bin Hashes";
         public const string XBOXPFIHash = "PFI.bin Hashes";
         public const string XBOXSSHash = "SS.bin Hashes";

DICUI.Library/Data/Enumerations.cs

@@ -17,6 +17,7 @@
         Floppy,
         GDROM,
         MDS,
+        Merge,
         Reset,
         Start,
         Stop,
@@ -55,7 +56,9 @@
         ScanFileProtect,
         ScanSectorProtect,
         SeventyFour,
+        SkipSector,
         SubchannelReadLevel,
+        VideoNow,
     }
 
     /// <summary>
@@ -67,6 +70,7 @@
 
         #region Consoles
 
+        AtariJaguarCD,
         BandaiPlaydiaQuickInteractiveSystem,
         BandaiApplePippin,
         CommodoreAmigaCD32,
@@ -153,6 +157,7 @@
         NichibutsuHighRateSystem,
         NichibutsuSuperCD,
         NichibutsuXRateSystem,
+        PanasonicM2,
         PhotoPlayVarious,
         RawThrillsVarious,
         SegaChihiro,
@@ -183,6 +188,7 @@
         EnhancedCD,
         EnhancedDVD,
         EnhancedBD,
+        HasbroVideoNow,
         HDDVDVideo,
         PalmOS,
         PhilipsCDiDigitalVideo,

DICUI.Library/Utilities/DumpEnvironment.cs

@@ -290,6 +290,9 @@ namespace DICUI.Utilities
             // First, sanitized the output filename to strip off any potential extension
             string outputFilename = Path.GetFileNameWithoutExtension(OutputFilename);
 
+            // Some disc types are audio-only
+            bool audioOnly = (System == KnownSystem.AtariJaguarCD) || (System == KnownSystem.AudioCD);
+
             // Now ensure that all required files exist
             string combinedBase = Path.Combine(OutputDirectory, outputFilename);
             switch (Type)
@@ -301,8 +304,8 @@ namespace DICUI.Utilities
                         && File.Exists(combinedBase + ".cue")
                         && File.Exists(combinedBase + ".dat")
                         && File.Exists(combinedBase + ".img")
-                        && File.Exists(combinedBase + ".img_EdcEcc.txt")
-                        && File.Exists(combinedBase + ".scm")
+                        && (audioOnly || File.Exists(combinedBase + ".img_EdcEcc.txt") || File.Exists(combinedBase + ".img_EccEdc.txt"))
+                        && (audioOnly || File.Exists(combinedBase + ".scm"))
                         && File.Exists(combinedBase + ".sub")
                         && File.Exists(combinedBase + "_c2Error.txt")
                         && File.Exists(combinedBase + "_cmd.txt")
@@ -455,11 +458,20 @@ namespace DICUI.Utilities
                 case MediaType.GDROM: // TODO: Verify GD-ROM outputs this
                     mappings[Template.MasteringRingField] = Template.RequiredIfExistsValue;
                     mappings[Template.MasteringSIDField] = Template.RequiredIfExistsValue;
-                    mappings[Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                    mappings["Label-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                    mappings["Data-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
                     mappings[Template.AdditionalMouldField] = Template.RequiredIfExistsValue;
                     mappings[Template.ToolstampField] = Template.RequiredIfExistsValue;
-                    mappings[Template.PVDField] = GetPVD(combinedBase + "_mainInfo.txt") ?? "";
-                    mappings[Template.ErrorCountField] = GetErrorCount(combinedBase + ".img_EdcEcc.txt").ToString();
+                    mappings[Template.PVDField] = GetPVD(combinedBase + "_mainInfo.txt") ?? "Disc has no PVD";
+
+                    long errorCount = -1;
+                    if (File.Exists(combinedBase + ".img_EdcEcc.txt"))
+                        errorCount = GetErrorCount(combinedBase + ".img_EdcEcc.txt");
+                    else if (File.Exists(combinedBase + ".img_EccEdc.txt"))
+                        errorCount = GetErrorCount(combinedBase + ".img_EccEdc.txt");
+
+                    mappings[Template.ErrorCountField] = (errorCount == -1 ? "Error retrieving error count" : errorCount.ToString());
+
                     mappings[Template.CuesheetField] = GetFullFile(combinedBase + ".cue") ?? "";
                     mappings[Template.WriteOffsetField] = GetWriteOffset(combinedBase + "_disc.txt") ?? "";
 
@@ -488,13 +500,32 @@ namespace DICUI.Utilities
                             }
 
                             break;
-                        case KnownSystem.SegaSaturn:
-                            mappings[Template.SaturnHeaderField] = GetSaturnHeader(combinedBase + "_mainInfo.txt") ?? "";
-                            if (GetSaturnBuildInfo(mappings[Template.SaturnHeaderField], out string serial, out string version, out string buildDate))
+                        case KnownSystem.SegaCDMegaCD:
+                            mappings[Template.SegaHeaderField] = GetSegaHeader(combinedBase + "_mainInfo.txt") ?? "";
+
+                            // Take only the last 16 lines for Sega CD
+                            if (!string.IsNullOrEmpty(mappings[Template.SegaHeaderField]))
+                                mappings[Template.SegaHeaderField] = string.Join("\n", mappings[Template.SegaHeaderField].Split('\n').Skip(16));
+
+                            if (GetSegaCDBuildInfo(mappings[Template.SegaHeaderField], out string scdSerial, out string fixedDate))
                             {
-                                mappings[Template.DiscSerialField] = serial ?? "";
+                                mappings[Template.DiscSerialField] = scdSerial ?? "";
+                                mappings[Template.SegaBuildDateField] = fixedDate ?? "";
+                            }
+
+                            break;
+                        case KnownSystem.SegaSaturn:
+                            mappings[Template.SegaHeaderField] = GetSegaHeader(combinedBase + "_mainInfo.txt") ?? "";
+
+                            // Take only the first 16 lines for Saturn
+                            if (!string.IsNullOrEmpty(mappings[Template.SegaHeaderField]))
+                                mappings[Template.SegaHeaderField] = string.Join("\n", mappings[Template.SegaHeaderField].Split('\n').Take(16));
+
+                            if (GetSaturnBuildInfo(mappings[Template.SegaHeaderField], out string saturnSerial, out string version, out string buildDate))
+                            {
+                                mappings[Template.DiscSerialField] = saturnSerial ?? "";
                                 mappings[Template.VersionField] = version ?? "";
-                                mappings[Template.SaturnBuildDateField] = buildDate ?? "";
+                                mappings[Template.SegaBuildDateField] = buildDate ?? "";
                             }
 
                             break;
@@ -541,7 +572,8 @@ namespace DICUI.Utilities
                         }
                         mappings[Template.MasteringRingField] = Template.RequiredIfExistsValue;
                         mappings[Template.MasteringSIDField] = Template.RequiredIfExistsValue;
-                        mappings[Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                        mappings["Label-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                        mappings["Data-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
                         mappings[Template.AdditionalMouldField] = Template.RequiredIfExistsValue;
                         mappings[Template.ToolstampField] = Template.RequiredIfExistsValue;
                         mappings[Template.PVDField] = GetPVD(combinedBase + "_mainInfo.txt") ?? "";
@@ -562,7 +594,8 @@ namespace DICUI.Utilities
                         mappings["Inner " + Template.MasteringRingField] = Template.RequiredIfExistsValue;
                         mappings["Outer " + Template.MasteringSIDField] = Template.RequiredIfExistsValue;
                         mappings["Inner " + Template.MasteringSIDField] = Template.RequiredIfExistsValue;
-                        mappings[Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                        mappings["Label-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
+                        mappings["Data-Side " + Template.MouldSIDField] = Template.RequiredIfExistsValue;
                         mappings[Template.AdditionalMouldField] = Template.RequiredIfExistsValue;
                         mappings["Outer " + Template.ToolstampField] = Template.RequiredIfExistsValue;
                         mappings["Inner " + Template.ToolstampField] = Template.RequiredIfExistsValue;
@@ -599,7 +632,6 @@ namespace DICUI.Utilities
                             mappings[Template.CopyProtectionField] = GetDVDProtection(combinedBase + "_CSSKey.txt", combinedBase + "_disc.txt") ?? "";
                             break;
                         case KnownSystem.MicrosoftXBOX:
-                        case KnownSystem.MicrosoftXBOX360:
                             if (GetXBOXAuxInfo(combinedBase + "_disc.txt", out string dmihash, out string pfihash, out string sshash, out string ss, out string ssver))
                             {
                                 mappings[Template.XBOXDMIHash] = dmihash ?? "";
@@ -608,7 +640,29 @@ namespace DICUI.Utilities
                                 mappings[Template.XBOXSSVersion] = ssver ?? "";
                                 mappings[Template.XBOXSSRanges] = ss ?? "";
                             }
+                            if (GetXBOXDMIInfo(Path.Combine(OutputDirectory, "DMI.bin"), out string serial, out string version, out string region))
+                            {
+                                mappings[Template.DiscSerialField] = serial ?? Template.RequiredValue;
+                                mappings[Template.VersionField] = version ?? Template.RequiredValue;
+                                mappings[Template.RegionField] = region ?? Template.RequiredValue;
+                            }
 
+                            break;
+                        case KnownSystem.MicrosoftXBOX360:
+                            if (GetXBOXAuxInfo(combinedBase + "_disc.txt", out string dmi360hash, out string pfi360hash, out string ss360hash, out string ss360, out string ssver360))
+                            {
+                                mappings[Template.XBOXDMIHash] = dmi360hash ?? "";
+                                mappings[Template.XBOXPFIHash] = pfi360hash ?? "";
+                                mappings[Template.XBOXSSHash] = ss360hash ?? "";
+                                mappings[Template.XBOXSSVersion] = ssver360 ?? "";
+                                mappings[Template.XBOXSSRanges] = ss360 ?? "";
+                            }
+                            if (GetXBOX360DMIInfo(Path.Combine(OutputDirectory, "DMI.bin"), out string serial360, out string version360, out string region360))
+                            {
+                                mappings[Template.DiscSerialField] = serial360 ?? Template.RequiredValue;
+                                mappings[Template.VersionField] = version360 ?? Template.RequiredValue;
+                                mappings[Template.RegionField] = region360 ?? Template.RequiredValue;
+                            }
                             break;
                         case KnownSystem.SonyPlayStation2:
                             mappings[Template.PlaystationEXEDateField] = GetPlayStationEXEDate(Drive.Letter) ?? "";
@@ -667,8 +721,9 @@ namespace DICUI.Utilities
                 output.Add(Template.DiscSerialField + ": " + info[Template.DiscSerialField]);
                 switch (System)
                 {
+                    case KnownSystem.SegaCDMegaCD:
                     case KnownSystem.SegaSaturn:
-                        output.Add(Template.SaturnBuildDateField + ": " + info[Template.SaturnBuildDateField]);
+                        output.Add(Template.SegaBuildDateField + ": " + info[Template.SegaBuildDateField]);
                         break;
                     case KnownSystem.SonyPlayStation:
                     case KnownSystem.SonyPlayStation2:
@@ -690,7 +745,8 @@ namespace DICUI.Utilities
                             output.Add("\tInner " + Template.MasteringRingField + ": " + info["Inner " + Template.MasteringRingField]);
                             output.Add("\tOuter " + Template.MasteringSIDField + ": " + info["Outer " + Template.MasteringSIDField]);
                             output.Add("\tInner " + Template.MasteringSIDField + ": " + info["Inner " + Template.MasteringSIDField]);
-                            output.Add("\t" + Template.MouldSIDField + ": " + info[Template.MouldSIDField]);
+                            output.Add("\tData-Side " + Template.MouldSIDField + ": " + info["Data-Side " + Template.MouldSIDField]);
+                            output.Add("\tLabel-Side " + Template.MouldSIDField + ": " + info["Label-Side " + Template.MouldSIDField]);
                             output.Add("\t" + Template.AdditionalMouldField + ": " + info[Template.AdditionalMouldField]);
                             output.Add("\tOuter " + Template.ToolstampField + ": " + info["Outer " + Template.ToolstampField]);
                             output.Add("\tInner " + Template.ToolstampField + ": " + info["Inner " + Template.ToolstampField]);
@@ -700,7 +756,8 @@ namespace DICUI.Utilities
                         {
                             output.Add("\t" + Template.MasteringRingField + ": " + info[Template.MasteringRingField]);
                             output.Add("\t" + Template.MasteringSIDField + ": " + info[Template.MasteringSIDField]);
-                            output.Add("\t" + Template.MouldSIDField + ": " + info[Template.MouldSIDField]);
+                            output.Add("\tData-Side " + Template.MouldSIDField + ": " + info["Data-Side " + Template.MouldSIDField]);
+                            output.Add("\tLabel-Side " + Template.MouldSIDField + ": " + info["Label-Side " + Template.MouldSIDField]);
                             output.Add("\t" + Template.AdditionalMouldField + ": " + info[Template.AdditionalMouldField]);
                             output.Add("\t" + Template.ToolstampField + ": " + info[Template.ToolstampField]);
                         }
@@ -731,9 +788,10 @@ namespace DICUI.Utilities
                 output.Add(Template.EditionField + ": " + info[Template.EditionField]);
                 switch (System)
                 {
+                    case KnownSystem.SegaCDMegaCD:
                     case KnownSystem.SegaSaturn:
-                        output.Add(Template.SaturnHeaderField + ":"); output.Add("");
-                        output.AddRange(info[Template.SaturnHeaderField].Split('\n')); output.Add("");
+                        output.Add(Template.SegaHeaderField + ":"); output.Add("");
+                        output.AddRange(info[Template.SegaHeaderField].Split('\n')); output.Add("");
                         break;
                     case KnownSystem.SonyPlayStation:
                         output.Add(Template.PlayStationEDCField + ": " + info[Template.PlayStationEDCField]);
@@ -791,20 +849,20 @@ namespace DICUI.Utilities
                     output.Add(Template.SubIntentionField + ":"); output.Add("");
                     output.AddRange(info[Template.SubIntentionField].Split('\n')); output.Add("");
                 }
+                if (info.ContainsKey(Template.DATField))
+                {
+                    output.Add(Template.DATField + ":"); output.Add("");
+                    output.AddRange(info[Template.DATField].Split('\n')); output.Add("");
+                }
                 switch (Type)
                 {
                     case MediaType.CDROM:
                     case MediaType.GDROM:
                         output.Add(Template.CuesheetField + ":"); output.Add("");
                         output.AddRange(info[Template.CuesheetField].Split('\n')); output.Add("");
-                        output.Add(Template.WriteOffsetField + ": " + info[Template.WriteOffsetField]); output.Add("");
+                        output.Add(Template.WriteOffsetField + ": " + info[Template.WriteOffsetField]);
                         break;
                 }
-                if (info.ContainsKey(Template.DATField))
-                {
-                    output.Add(Template.DATField + ":"); output.Add("");
-                    output.AddRange(info[Template.DATField].Split('\n'));
-                }
 
                 return output;
             }
@@ -1004,7 +1062,7 @@ namespace DICUI.Utilities
         /// <summary>
         /// Get the detected error count from the input files, if possible
         /// </summary>
-        /// <param name="edcecc">.img_EdcEcc.txt file location</param>
+        /// <param name="edcecc">.img_EdcEcc.txt/.img_EccEdc.txt file location</param>
         /// <returns>Error count if possible, -1 on error</returns>
         private long GetErrorCount(string edcecc)
         {
@@ -1352,11 +1410,11 @@ namespace DICUI.Utilities
         }
 
         /// <summary>
-        /// Get the header from a Saturn disc, if possible
+        /// Get the header from a Sega Saturn or Sega CD / Mega CD disc, if possible
         /// </summary>
         /// <param name="mainInfo">_mainInfo.txt file location</param>
         /// <returns>Header as a byte array if possible, null on error</returns>
-        private string GetSaturnHeader(string mainInfo)
+        private string GetSegaHeader(string mainInfo)
         {
             // If the file doesn't exist, we can't get info from it
             if (!File.Exists(mainInfo))
@@ -1376,9 +1434,9 @@ namespace DICUI.Utilities
 
                     // Now that we're at the Header, read each line in and concatenate
                     string header = "";
-                    for (int i = 0; i < 16; i++)
+                    for (int i = 0; i < 32; i++)
                     {
-                        header += sr.ReadLine() + "\n"; // 0000-00F0
+                        header += sr.ReadLine() + "\n"; // 0000-01F0
                     }
 
                     return header;
@@ -1392,16 +1450,17 @@ namespace DICUI.Utilities
         }
 
         /// <summary>
-        /// Get the build info from a Saturn disc, if possible
+        /// Get the build info from a Sega CD disc, if possible
         /// </summary>
-        /// <<param name="saturnHeader">String representing a formatter variant of the Saturn header</param>
+        /// <<param name="segaHeader">String representing a formatter variant of the  Sega CD header</param>
         /// <returns>True on successful extraction of info, false otherwise</returns>
-        private bool GetSaturnBuildInfo(string saturnHeader, out string serial, out string version, out string date)
+        /// <remarks>Note that this works for MOST headers, except ones where the copyright stretches > 1 line</remarks>
+        private bool GetSegaCDBuildInfo(string segaHeader, out string serial, out string date)
         {
-            serial = null; version = null; date = null;
+            serial = null; date = null;
 
             // If the input header is null, we can't do a thing
-            if (String.IsNullOrWhiteSpace(saturnHeader))
+            if (String.IsNullOrWhiteSpace(segaHeader))
             {
                 return false;
             }
@@ -1409,7 +1468,92 @@ namespace DICUI.Utilities
             // Now read it in cutting it into lines for easier parsing
             try
             {
-                string[] header = saturnHeader.Split('\n');
+                string[] header = segaHeader.Split('\n');
+                string serialVersionLine = header[8].Substring(58);
+                string dateLine = header[1].Substring(58);
+                serial = serialVersionLine.Substring(3, 7);
+                date = dateLine.Substring(8).Trim();
+
+                // Properly format the date string, if possible
+                string[] dateSplit = date.Split('.');
+
+                if (dateSplit.Length == 1)
+                    dateSplit = new string[] { date.Substring(0, 4), date.Substring(4) };
+
+                string month = dateSplit[1];
+                switch (month)
+                {
+                    case "JAN":
+                        dateSplit[1] = "01";
+                        break;
+                    case "FEB":
+                        dateSplit[1] = "02";
+                        break;
+                    case "MAR":
+                        dateSplit[1] = "03";
+                        break;
+                    case "APR":
+                        dateSplit[1] = "04";
+                        break;
+                    case "MAY":
+                        dateSplit[1] = "05";
+                        break;
+                    case "JUN":
+                        dateSplit[1] = "06";
+                        break;
+                    case "JUL":
+                        dateSplit[1] = "07";
+                        break;
+                    case "AUG":
+                        dateSplit[1] = "08";
+                        break;
+                    case "SEP":
+                        dateSplit[1] = "09";
+                        break;
+                    case "OCT":
+                        dateSplit[1] = "10";
+                        break;
+                    case "NOV":
+                        dateSplit[1] = "11";
+                        break;
+                    case "DEC":
+                        dateSplit[1] = "12";
+                        break;
+                    default:
+                        dateSplit[1] = "00";
+                        break;
+                }
+
+                date = string.Join("-", dateSplit);
+
+                return true;
+            }
+            catch
+            {
+                // We don't care what the error is
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get the build info from a Saturn disc, if possible
+        /// </summary>
+        /// <<param name="segaHeader">String representing a formatter variant of the Saturn header</param>
+        /// <returns>True on successful extraction of info, false otherwise</returns>
+        private bool GetSaturnBuildInfo(string segaHeader, out string serial, out string version, out string date)
+        {
+            serial = null; version = null; date = null;
+
+            // If the input header is null, we can't do a thing
+            if (String.IsNullOrWhiteSpace(segaHeader))
+            {
+                return false;
+            }
+
+            // Now read it in cutting it into lines for easier parsing
+            try
+            {
+                string[] header = segaHeader.Split('\n');
                 string serialVersionLine = header[2].Substring(58);
                 string dateLine = header[3].Substring(58);
                 serial = serialVersionLine.Substring(0, 8);
@@ -1540,6 +1684,98 @@ namespace DICUI.Utilities
             }
         }
 
+        /// <summary>
+        /// Get the XOX serial info from the DMI.bin file, if possible
+        /// </summary>
+        /// <param name="dmi">DMI.bin file location</param>
+        /// <returns>True on successful extraction of info, false otherwise</returns>
+        private bool GetXBOXDMIInfo(string dmi, out string serial, out string version, out string region)
+        {
+            serial = null; version = null; region = null;
+
+            if (!File.Exists(dmi))
+                return false;
+
+            using (BinaryReader br = new BinaryReader(File.OpenRead(dmi)))
+            {
+                try
+                {
+                    br.BaseStream.Seek(8, SeekOrigin.Begin);
+                    char[] str = br.ReadChars(8);
+
+                    serial = $"{str[0]}{str[1]}-{str[2]}{str[3]}{str[4]}";
+                    version = $"1.{str[5]}{str[6]}";
+                    region = GetXBOXRegion(str[7]);
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the XBOX 360 serial info from the DMI.bin file, if possible
+        /// </summary>
+        /// <param name="dmi">DMI.bin file location</param>
+        /// <returns>True on successful extraction of info, false otherwise</returns>
+        private bool GetXBOX360DMIInfo(string dmi, out string serial, out string version, out string region)
+        {
+            serial = null; version = null; region = null;
+
+            if (!File.Exists(dmi))
+                return false;
+
+            using (BinaryReader br = new BinaryReader(File.OpenRead(dmi)))
+            {
+                try
+                {
+                    br.BaseStream.Seek(64, SeekOrigin.Begin);
+                    char[] str = br.ReadChars(14);
+
+                    serial = $"{str[0]}{str[1]}-{str[2]}{str[3]}{str[4]}{str[5]}";
+                    version = $"1.{str[6]}{str[7]}";
+                    region = GetXBOXRegion(str[8]);
+                    // str[9], str[10], str[11] - unknown purpose
+                    // str[12], str[13] - disc <12> of <13>
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determine the region based on the XBOX serial character
+        /// </summary>
+        /// <param name="region">Character denoting the region</param>
+        /// <returns>Region name, if possible</returns>
+        private string GetXBOXRegion(char region)
+        {
+            switch (region)
+            {
+                case 'W':
+                    return "World";
+                case 'A':
+                    return "USA";
+                case 'J':
+                    return "Japan or Asia";
+                case 'E':
+                    return "Europe (or single country)";
+                case 'K':
+                    return "USA, Japan or USA, Asia";
+                case 'L':
+                    return "USA, Europe";
+                case 'H':
+                    return "Japan, Europe";
+                default:
+                    return "Could not determine region";
+            }
+        }
+
         /// <summary>
         /// Get the write offset from the input file, if possible
         /// </summary>
@@ -1597,7 +1833,7 @@ namespace DICUI.Utilities
         /// Verify that the current environment has a complete dump and create submission info is possible
         /// </summary>
         /// <returns>Result instance with the outcome</returns>
-        private Result VerifyAndSaveDumpOutput(IProgress<Result> progress)
+        public Result VerifyAndSaveDumpOutput(IProgress<Result> progress)
         {
             // Check to make sure that the output had all the correct files
             if (!FoundAllFiles())

DICUI.Library/Utilities/Extensions.cs

@@ -34,6 +34,11 @@ namespace DICUI.Utilities
             return Converters.MediaTypeToString(type);
         }
 
+        public static string ShortName(this MediaType? type)
+        {
+            return Converters.MediaTypeToShortString(type);
+        }
+
         public static string Extension(this MediaType? type)
         {
             return Converters.MediaTypeToExtension(type);
@@ -67,6 +72,11 @@ namespace DICUI.Utilities
             return Converters.KnownSystemToString(system);
         }
 
+        public static string ShortName(this KnownSystem? system)
+        {
+            return Converters.KnownSystemToShortString(system);
+        }
+
         public static KnownSystemCategory Category(this KnownSystem? system)
         {
             if (system < KnownSystem.MarkerConsoleEnd)

DICUI.Library/Utilities/Parameters.cs

@@ -21,6 +21,7 @@ namespace DICUI.Utilities
 
         // Path Information
         public string Filename;
+        public string OptiarcFilename;
 
         // Sector Information
         public int? StartLBAValue;
@@ -52,7 +53,9 @@ namespace DICUI.Utilities
         //public int? C2OpcodeValue4;   // Last LBA to reread (default EOS)
         public int? ForceUnitAccessValue; // Delete per specified (default 1)
         public int? ScanFileProtectValue; // Timeout value (default 60)
+        public int?[] SkipSectorValue = new int?[2]; // Skip between sectors
         public int? SubchannelReadLevelValue; // 0 no next sub, 1 next sub (default), 2 next and next next
+        public int? VideoNowValue; // Insert n empty bytes in the head of 1st track
 
         /// <summary>
         /// Generic empty constructor for adding things individually
@@ -88,6 +91,7 @@ namespace DICUI.Utilities
                 ForceUnitAccessValue = null;
                 ScanFileProtectValue = null;
                 SubchannelReadLevelValue = null;
+                VideoNowValue = null;
             }
         }
 
@@ -219,6 +223,7 @@ namespace DICUI.Utilities
                 || Command == DICCommand.Floppy
                 || Command == DICCommand.GDROM
                 || Command == DICCommand.MDS
+                || Command == DICCommand.Merge
                 || Command == DICCommand.Swap
                 || Command == DICCommand.Sub
                 || Command == DICCommand.XBOX
@@ -232,6 +237,15 @@ namespace DICUI.Utilities
                     return null;
             }
 
+            // Optiarc Filename
+            if (Command == DICCommand.Merge)
+            {
+                if (OptiarcFilename != null)
+                    parameters.Add("\"" + OptiarcFilename.Trim('"') + "\"");
+                else
+                    return null;
+            }
+
             // Drive Speed
             if (Command == DICCommand.Audio
                 || Command == DICCommand.BluRay
@@ -486,6 +500,7 @@ namespace DICUI.Utilities
             if (Command == DICCommand.Audio
                || Command == DICCommand.CompactDisc
                || Command == DICCommand.Data
+               || Command == DICCommand.DigitalVideoDisc
                || Command == DICCommand.Swap)
             {
                 if (this[DICFlag.ScanFileProtect])
@@ -517,6 +532,27 @@ namespace DICUI.Utilities
                     parameters.Add(DICFlag.SeventyFour.Name());
             }
 
+            // Skip sectors
+            if (Command == DICCommand.Data)
+            {
+                if (this[DICFlag.SkipSector])
+                {
+                    if (SkipSectorValue[0] != null && SkipSectorValue[1] != null)
+                    {
+                        parameters.Add(DICFlag.SkipSector.Name());
+                        if (SkipSectorValue[0] >= 0 && SkipSectorValue[1] >= 0)
+                        {
+                            parameters.Add(SkipSectorValue[0].ToString());
+                            parameters.Add(SkipSectorValue[1].ToString());
+                        }
+                        else
+                            return null;
+                    }
+                    else
+                        return null;
+                }
+            }
+
             // Set Subchannel read level
             if (Command == DICCommand.Audio
                || Command == DICCommand.CompactDisc
@@ -537,6 +573,22 @@ namespace DICUI.Utilities
                 }
             }
 
+            // VideoNow
+            if (Command == DICCommand.CompactDisc)
+            {
+                if (this[DICFlag.VideoNow])
+                {
+                    parameters.Add(DICFlag.VideoNow.Name());
+                    if (VideoNowValue != null)
+                    {
+                        if (VideoNowValue >= 0)
+                            parameters.Add(VideoNowValue.ToString());
+                        else
+                            return null;
+                    }
+                }
+            }
+
             return string.Join(" ", parameters);
         }
 
@@ -779,6 +831,23 @@ namespace DICUI.Utilities
                     Command = DICCommand.MDS;
                     break;
 
+                case DICCommandStrings.Merge:
+                    if (!DoesExist(parts, 1) || IsFlag(parts[1]) || !File.Exists(parts[1]))
+                        return false;
+                    else
+                        Filename = parts[1];
+
+                    if (!DoesExist(parts, 2) || IsFlag(parts[2]) || !File.Exists(parts[2]))
+                        return false;
+                    else
+                        OptiarcFilename = parts[2];
+
+                    if (parts.Count > 3)
+                        return false;
+
+                    Command = DICCommand.Merge;
+                    break;
+
                 case DICCommandStrings.Reset:
                     if (!DoesExist(parts, 1) || !IsValidDriveLetter(parts[1]))
                         return false;
@@ -1115,7 +1184,8 @@ namespace DICUI.Utilities
 
                         case DICFlagStrings.ScanFileProtect:
                             if (parts[0] != DICCommandStrings.CompactDisc
-                                && parts[0] != DICCommandStrings.Data)
+                                && parts[0] != DICCommandStrings.Data
+                                && parts[0] != DICCommandStrings.DigitalVideoDisc)
                                 return false;
                             else if (!DoesExist(parts, i + 1))
                             {
@@ -1150,6 +1220,22 @@ namespace DICUI.Utilities
                             this[DICFlag.SeventyFour] = true;
                             break;
 
+                        case DICFlagStrings.SkipSector:
+                            if (parts[0] != DICCommandStrings.Data)
+                                return false;
+                            else if (!DoesExist(parts, i + 1) || !DoesExist(parts, i + 2))
+                                return false;
+                            else if (IsFlag(parts[i + 1]) || IsFlag(parts[i + 2]))
+                                return false;
+                            else if (!IsValidNumber(parts[i + 1], lowerBound: 0) || !IsValidNumber(parts[i + 2], lowerBound: 0))
+                                return false;
+
+                            this[DICFlag.SkipSector] = true;
+                            SkipSectorValue[0] = Int32.Parse(parts[i + 1]);
+                            SkipSectorValue[1] = Int32.Parse(parts[i + 2]);
+                            i += 2;
+                            break;
+
                         case DICFlagStrings.SubchannelReadLevel:
                             if (parts[0] != DICCommandStrings.Audio
                                 && parts[0] != DICCommandStrings.CompactDisc
@@ -1174,6 +1260,27 @@ namespace DICUI.Utilities
                             i++;
                             break;
 
+                        case DICFlagStrings.VideoNow:
+                            if (parts[0] != DICCommandStrings.CompactDisc)
+                                return false;
+                            else if (!DoesExist(parts, i + 1))
+                            {
+                                this[DICFlag.VideoNow] = true;
+                                break;
+                            }
+                            else if (IsFlag(parts[i + 1]))
+                            {
+                                this[DICFlag.VideoNow] = true;
+                                break;
+                            }
+                            else if (!IsValidNumber(parts[i + 1], lowerBound: 0))
+                                return false;
+
+                            this[DICFlag.VideoNow] = true;
+                            VideoNowValue = Int32.Parse(parts[i + 1]);
+                            i++;
+                            break;
+
                         default:
                             return false;
                     }
@@ -1346,6 +1453,9 @@ namespace DICUI.Utilities
                                 SubchannelReadLevelValue = 2;
                             }
                             break;
+                        case KnownSystem.HasbroVideoNow:
+                            this[DICFlag.VideoNow] = true;
+                            break;
                         case KnownSystem.NECPCEngineTurboGrafxCD:
                             this[DICFlag.MCN] = true;
                             break;
@@ -1357,7 +1467,10 @@ namespace DICUI.Utilities
                     break;
                 case MediaType.DVD:
                     if (paranoid)
+                    {
                         this[DICFlag.CopyrightManagementInformation] = true;
+                        this[DICFlag.ScanFileProtect] = true;
+                    }
                     break;
                 case MediaType.GDROM:
                     this[DICFlag.C2Opcode] = true;

DICUI.Library/Utilities/Validators.cs

@@ -25,6 +25,9 @@ namespace DICUI.Utilities
             {
                 #region Consoles
 
+                case KnownSystem.AtariJaguarCD:
+                    types.Add(MediaType.CDROM);
+                    break;
                 case KnownSystem.BandaiPlaydiaQuickInteractiveSystem:
                     types.Add(MediaType.CDROM);
                     break;
@@ -94,7 +97,8 @@ namespace DICUI.Utilities
                     break;
                 case KnownSystem.SonyPlayStation3:
                     types.Add(MediaType.BluRay);
-                    types.Add(MediaType.CDROM); // TODO: Confirm this
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
                     break;
                 case KnownSystem.SonyPlayStation4:
                     types.Add(MediaType.BluRay);
@@ -267,6 +271,10 @@ namespace DICUI.Utilities
                 case KnownSystem.NichibutsuXRateSystem:
                     types.Add(MediaType.DVD);
                     break;
+                case KnownSystem.PanasonicM2:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
                 case KnownSystem.PhotoPlayVarious:
                     types.Add(MediaType.CDROM);
                     break;
@@ -342,6 +350,9 @@ namespace DICUI.Utilities
                 case KnownSystem.EnhancedBD:
                     types.Add(MediaType.BluRay);
                     break;
+                case KnownSystem.HasbroVideoNow:
+                    types.Add(MediaType.CDROM);
+                    break;
                 case KnownSystem.HDDVDVideo:
                     types.Add(MediaType.HDDVD);
                     break;
@@ -461,9 +472,7 @@ namespace DICUI.Utilities
 
                 var collection = searcher.Get();
                 foreach (ManagementObject queryObj in collection)
-                {
                     deviceId = (string)queryObj["DeviceID"];
-                }
             }
             catch
             {
@@ -473,9 +482,7 @@ namespace DICUI.Utilities
 
             // If we got no valid device, we don't care and just return
             if (deviceId == null)
-            {
                 return null;
-            }
 
             // Get all relevant disc information
             try
@@ -486,16 +493,12 @@ namespace DICUI.Utilities
                 foreach (var disc in discMaster)
                 {
                     if (disc.ToString().Contains(deviceId))
-                    {
                         id = disc.ToString();
-                    }
                 }
 
                 // If we couldn't find the drive, we don't care and return
                 if (id == null)
-                {
                     return null;
-                }
 
                 // Otherwise, we get the media type, if any
                 MsftDiscRecorder2 recorder = new MsftDiscRecorder2();
@@ -504,9 +507,7 @@ namespace DICUI.Utilities
                 dataWriter.Recorder = recorder;
                 var media = dataWriter.CurrentPhysicalMediaType;
                 if (media != IMAPI_MEDIA_PHYSICAL_TYPE.IMAPI_MEDIA_TYPE_UNKNOWN)
-                {
                     return Converters.IMAPIDiskTypeToMediaType(media);
-                }
             }
             catch
             {
@@ -529,10 +530,11 @@ namespace DICUI.Utilities
             switch (type)
             {
                 // Fully supported types
+                case MediaType.BluRay:
                 case MediaType.CDROM:
                 case MediaType.DVD:
+                case MediaType.FloppyDisk:
                 case MediaType.HDDVD:
-                case MediaType.BluRay:
                     return Result.Success("{0} ready to dump", type.Name());
 
                 // Partially supported types
@@ -545,18 +547,13 @@ namespace DICUI.Utilities
                 case MediaType.UMD:
                     return Result.Success("{0} supported for submission info parsing", type.Name());
 
-                // Undumpable but recognized types
-                case MediaType.LaserDisc:
-                case MediaType.NintendoWiiUOpticalDisc:
-                case MediaType.CED:
-                case MediaType.Cartridge:
-                case MediaType.Cassette:
-                    return Result.Failure("{0} discs are not supported for dumping", type.Name());
-
-                // Invalid or unknown types
+                // Specifically unknown type
                 case MediaType.NONE:
-                default:
                     return Result.Failure("Please select a valid disc type");
+
+                // Undumpable but recognized types
+                default:
+                    return Result.Failure("{0} discs are not supported for dumping", type.Name());
             }
         }
 

DICUI.Test/Utilities/ParametersTest.cs

@@ -28,7 +28,7 @@ namespace DICUI.Test.Utilities
         /* paranoid mode tests */
         [InlineData(KnownSystem.IBMPCCompatible, MediaType.CDROM, true, 1000, 2, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect, DICFlag.ScanSectorProtect, DICFlag.SubchannelReadLevel })]
         [InlineData(KnownSystem.AppleMacintosh, MediaType.CDROM, false, 20, null, new DICFlag[] { DICFlag.C2Opcode, DICFlag.NoFixSubQSecuROM, DICFlag.ScanFileProtect })]
-        [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation })]
+        [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation, DICFlag.ScanFileProtect })]
         [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, true, 500, null, new DICFlag[] { DICFlag.CopyrightManagementInformation })]
         [InlineData(KnownSystem.IBMPCCompatible, MediaType.DVD, false, 500, null, new DICFlag[] { })]
         [InlineData(KnownSystem.HDDVDVideo, MediaType.HDDVD, false, 500, null, new DICFlag[] { })]

DICUI.sln

@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Library", "DICUI.Libr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Forms", "DICUI.Forms\DICUI.Forms.csproj", "{A6719A99-BF0E-4637-9A8E-CB38B1E16971}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DICUI.Check", "DICUI.Check\DICUI.Check.csproj", "{8CFDE289-E171-4D49-A40D-5293265C1253}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +35,10 @@ Global
 		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6719A99-BF0E-4637-9A8E-CB38B1E16971}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CFDE289-E171-4D49-A40D-5293265C1253}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DICUI/DICUI.csproj

@@ -89,6 +89,7 @@
     </ApplicationDefinition>
     <Compile Include="Constants.cs" />
     <Compile Include="EnumDescriptionConverter.cs" />
+    <Compile Include="MediaTypeComboBoxItem.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="Windows\LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>

DICUI/MediaTypeComboBoxItem.cs

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

DICUI/Options.cs

@@ -11,9 +11,9 @@ namespace DICUI
         public string DICPath { get; private set; }
         public string SubDumpPath { get; private set; }
 
-        public int preferredDumpSpeedCD { get; set; }
-        public int preferredDumpSpeedDVD { get; set; }
-        public int preferredDumpSpeedBD { get; set; }
+        public int PreferredDumpSpeedCD { get; set; }
+        public int PreferredDumpSpeedDVD { get; set; }
+        public int PreferredDumpSpeedBD { get; set; }
 
         public bool QuietMode { get; set; }
         public bool ParanoidMode { get; set; }
@@ -49,9 +49,9 @@ namespace DICUI
             SubDumpPath = ConfigurationManager.AppSettings["SubDumpPath"] ?? "subdump.exe";
             DefaultOutputPath = ConfigurationManager.AppSettings["DefaultOutputPath"] ?? "ISO";
 
-            this.preferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
-            this.preferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
-            this.preferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
+            this.PreferredDumpSpeedCD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedCD"], out int maxDumpSpeedCD) ? maxDumpSpeedCD : 72;
+            this.PreferredDumpSpeedDVD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedDVD"], out int maxDumpSpeedDVD) ? maxDumpSpeedDVD : 24;
+            this.PreferredDumpSpeedBD = Int32.TryParse(ConfigurationManager.AppSettings["preferredDumpSpeedBD"], out int maxDumpSpeedBD) ? maxDumpSpeedBD : 16;
 
             this.QuietMode = Boolean.TryParse(ConfigurationManager.AppSettings["QuietMode"], out bool quietMode) ? quietMode : false;
             this.ParanoidMode = Boolean.TryParse(ConfigurationManager.AppSettings["ParanoidMode"], out bool paranoidMode) ? paranoidMode : false;
@@ -81,14 +81,14 @@ namespace DICUI
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    return preferredDumpSpeedCD;
+                    return PreferredDumpSpeedCD;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
                 case MediaType.NintendoGameCube:
                 case MediaType.NintendoWiiOpticalDisc:
-                    return preferredDumpSpeedDVD;
+                    return PreferredDumpSpeedDVD;
                 case MediaType.BluRay:
-                    return preferredDumpSpeedBD;
+                    return PreferredDumpSpeedBD;
                 default:
                     return 8;
             }

DICUI/Windows/MainWindow.xaml.cs

@@ -263,7 +263,7 @@ namespace DICUI.Windows
 
             if (currentSystem != null)
             {
-                _mediaTypes = Validators.GetValidMediaTypes(currentSystem).ToList();
+                _mediaTypes = Validators.GetValidMediaTypes(currentSystem);
                 MediaTypeComboBox.ItemsSource = _mediaTypes;
 
                 MediaTypeComboBox.IsEnabled = _mediaTypes.Count > 1;
@@ -388,7 +388,7 @@ namespace DICUI.Windows
                 RereadAmountC2 = _options.RereadAmountForC2,
 
                 System = SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem,
-                Type = MediaTypeComboBox.SelectedItem as MediaType?
+                Type = MediaTypeComboBox.SelectedItem as MediaType?,
             };
 
             // Fix the output paths
@@ -585,19 +585,19 @@ namespace DICUI.Windows
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    preferred = _options.preferredDumpSpeedCD;
+                    preferred = _options.PreferredDumpSpeedCD;
                     break;
                 case MediaType.DVD:
                 case MediaType.HDDVD:
                 case MediaType.NintendoGameCube:
                 case MediaType.NintendoWiiOpticalDisc:
-                    preferred = _options.preferredDumpSpeedDVD;
+                    preferred = _options.PreferredDumpSpeedDVD;
                     break;
                 case MediaType.BluRay:
-                    preferred = _options.preferredDumpSpeedBD;
+                    preferred = _options.PreferredDumpSpeedBD;
                     break;
                 default:
-                    preferred = _options.preferredDumpSpeedCD;
+                    preferred = _options.PreferredDumpSpeedCD;
                     break;
             }
 
@@ -628,7 +628,7 @@ namespace DICUI.Windows
             {
                 ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
                 _currentMediaType = Validators.GetDiscType(drive.Letter);
-                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType != null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
+                ViewModels.LoggerViewModel.VerboseLogLn(_currentMediaType == null ? "unable to detect." : ("detected " + _currentMediaType.Name() + "."));
             }
         }
 

DICUI/Windows/OptionsWindow.xaml

@@ -96,7 +96,7 @@
                 <CheckBox Grid.Column="1" VerticalAlignment="Center" Content="Paranoid Mode" 
                           DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
                           IsChecked="{Binding Path=ParanoidMode}"
-                          ToolTip="Enable pedandic and super-safe flags" 
+                          ToolTip="Enable pedantic and super-safe flags" 
                           />
                 <Grid Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0">
                     <Grid.ColumnDefinitions>

DICUI/Windows/OptionsWindow.xaml.cs

@@ -100,9 +100,9 @@ namespace DICUI.Windows
         {
             Array.ForEach(PathSettings(), setting => TextBoxForPathSetting(setting).Text = _options.Get(setting));
 
-            DumpSpeedCDSlider.Value = _options.preferredDumpSpeedCD;
-            DumpSpeedDVDSlider.Value = _options.preferredDumpSpeedDVD;
-            DumpSpeedBDSlider.Value = _options.preferredDumpSpeedBD;
+            DumpSpeedCDSlider.Value = _options.PreferredDumpSpeedCD;
+            DumpSpeedDVDSlider.Value = _options.PreferredDumpSpeedDVD;
+            DumpSpeedBDSlider.Value = _options.PreferredDumpSpeedBD;
         }
 
         #region Event Handlers
@@ -111,9 +111,9 @@ namespace DICUI.Windows
         {
             Array.ForEach(PathSettings(), setting => _options.Set(setting, TextBoxForPathSetting(setting).Text));
 
-            _options.preferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
-            _options.preferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
-            _options.preferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
+            _options.PreferredDumpSpeedCD = Convert.ToInt32(DumpSpeedCDSlider.Value);
+            _options.PreferredDumpSpeedDVD = Convert.ToInt32(DumpSpeedDVDSlider.Value);
+            _options.PreferredDumpSpeedBD = Convert.ToInt32(DumpSpeedBDSlider.Value);
 
             _options.Save();
             Hide();

README.md

@@ -24,18 +24,18 @@ Ensure that your operating system is as up-to-date as possible, since some featu
 ## Releases
 
 Download the latest release here:
-[https://github.com/reignstumble/DICUI/releases](https://github.com/reignstumble/DICUI/releases)
+[https://github.com/SabreTools/DICUI/releases](https://github.com/SabreTools/DICUI/releases)
 
 ## Changelist
 
-A list of all changes can now be found [here](https://github.com/reignstumble/DICUI/blob/master/CHANGELIST.md).
+A list of all changes can now be found [here](https://github.com/SabreTools/DICUI/blob/master/CHANGELIST.md).
 
 ## Contributors
 
 Here are the talented people who have contributed to the project so far:
 
-- **ReignStumble** - Project Lead / UI Design
-- **darksabre76** - Project Co-Lead / Backend Design
+- **darksabre76** - Project Lead / Backend Design
+- **ReignStumble** - Former Project Lead / UI Design
 - **Jakz** - Primary Feature Contributor
 - **NHellFire** - Feature Contributor
 

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 1.10-{build}
+version: 1.12-{build}
 
 # pull request template
 pull_requests:
@@ -32,20 +32,23 @@ build:
 
 # post-build step
 after_build:
-- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/2385718/DiscImageCreator_20180915.zip
+- ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/3008503/DiscImageCreator_20190326.zip
 - ps: appveyor DownloadFile http://www.rawdump.net/tools/subdump_fua_0x28.zip
-- 7z e DiscImageCreator_20180915.zip -oDICUI\bin\Debug\Programs Release_ANSI\*
-- 7z e DiscImageCreator_20180915.zip -oDICUI.Forms\bin\Debug\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20190326.zip -oDICUI\bin\Debug\Programs Release_ANSI\*
+- 7z e DiscImageCreator_20190326.zip -oDICUI.Forms\bin\Debug\Programs Release_ANSI\*
 - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug *
 - 7z e subdump_fua_0x28.zip -oDICUI.Forms\bin\Debug *
 - mv DICUI\bin\Debug\subdump_fua_0x28.exe DICUI\bin\Debug\subdump.exe
 - mv DICUI.Forms\bin\Debug\subdump_fua_0x28.exe DICUI.Forms\bin\Debug\subdump.exe
 - 7z a DICUI.zip DICUI\bin\Debug\*
 - 7z a DICUI-Winforms.zip DICUI.Forms\bin\Debug\*
+- 7z a DICUI-Check.zip DICUI.Check\bin\Debug\*
 
 # artifact linking
 artifacts:
 - path: DICUI.zip
   name: DICUI
 - path: DICUI-Winforms.zip
-  name: DICUI Winforms
+  name: DICUI Winforms
+- path: DICUI-Check.zip
+  name: DICUI Check