diff --git a/Constants.cs b/Constants.cs index ada1eb6d..73e38029 100644 --- a/Constants.cs +++ b/Constants.cs @@ -72,6 +72,8 @@ public const string TitleField = "Title"; public const string DiscNumberField = "Disc Number / Letter"; public const string DiscTitleField = "Disc Title"; + public const string SystemField = "System"; + public const string MediaTypeField = "Media Type"; public const string CategoryField = "Category"; public const string RegionField = "Region"; public const string LanguagesField = "Languages"; diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 4f9b8084..6784a91c 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Configuration; using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; @@ -117,8 +116,6 @@ namespace DICUI _optionsWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner; _optionsWindow.Refresh(); _optionsWindow.Show(); - - } private void txt_OutputFilename_TextChanged(object sender, TextChangedEventArgs e) diff --git a/Utilities/DumpInformation.cs b/Utilities/DumpInformation.cs index 823931a3..027c0cbd 100644 --- a/Utilities/DumpInformation.cs +++ b/Utilities/DumpInformation.cs @@ -137,6 +137,8 @@ namespace DICUI.Utilities { Template.TitleField, Template.RequiredValue }, { Template.DiscNumberField, Template.OptionalValue }, { Template.DiscTitleField, Template.OptionalValue }, + { Template.SystemField, Converters.KnownSystemToString(sys) }, + { Template.MediaTypeField, Converters.DiscTypeToString(type) }, { Template.CategoryField, "Games" }, { Template.RegionField, "World (CHANGE THIS)" }, { Template.LanguagesField, "Klingon (CHANGE THIS)" }, @@ -212,6 +214,15 @@ namespace DICUI.Utilities // If we have a single-layer disc if (layerbreak == null) { + switch (type) + { + case DiscType.DVD: + mappings[Template.MediaTypeField] += "-5"; + break; + case DiscType.BluRay: + mappings[Template.MediaTypeField] += "-25"; + break; + } mappings[Template.MasteringRingField] = Template.RequiredIfExistsValue; mappings[Template.MasteringSIDField] = Template.RequiredIfExistsValue; mappings[Template.MouldSIDField] = Template.RequiredIfExistsValue; @@ -222,6 +233,15 @@ namespace DICUI.Utilities // If we have a dual-layer disc else { + switch (type) + { + case DiscType.DVD: + mappings[Template.MediaTypeField] += "-9"; + break; + case DiscType.BluRay: + mappings[Template.MediaTypeField] += "-50"; + break; + } mappings["Outer " + Template.MasteringRingField] = Template.RequiredIfExistsValue; mappings["Inner " + Template.MasteringRingField] = Template.RequiredIfExistsValue; mappings["Outer " + Template.MasteringSIDField] = Template.RequiredIfExistsValue; @@ -770,6 +790,8 @@ namespace DICUI.Utilities output.Add(Template.TitleField + ": " + info[Template.TitleField]); output.Add(Template.DiscNumberField + ": " + info[Template.DiscNumberField]); output.Add(Template.DiscTitleField + ": " + info[Template.DiscTitleField]); + output.Add(Template.SystemField + ": " + info[Template.SystemField]); + output.Add(Template.MediaTypeField + ": " + info[Template.MediaTypeField]); output.Add(Template.CategoryField + ": " + info[Template.CategoryField]); output.Add(Template.RegionField + ": " + info[Template.RegionField]); output.Add(Template.LanguagesField + ": " + info[Template.LanguagesField]); @@ -940,4 +962,4 @@ namespace DICUI.Utilities return true; } } -} \ No newline at end of file +} diff --git a/Utilities/Validation.cs b/Utilities/Validation.cs index 5f9f8d52..6f436578 100644 --- a/Utilities/Validation.cs +++ b/Utilities/Validation.cs @@ -9,28 +9,28 @@ namespace DICUI.Utilities { public static class Validation { - /// - /// Get a list of valid DiscTypes for a given system matched to their respective names - /// - /// KnownSystem value to check - /// DiscTypes matched to enums, if possible - /// - /// This returns a List of Tuples whose structure is as follows: - /// Item 1: Printable name - /// Item 2: DiscType mapping - /// If something has a "string, null" value, it should be assumed that it is a separator - /// - public static List> GetValidDiscTypes(KnownSystem? sys) + /// + /// Get a list of valid DiscTypes for a given system matched to their respective names + /// + /// KnownSystem value to check + /// DiscTypes matched to enums, if possible + /// + /// This returns a List of Tuples whose structure is as follows: + /// Item 1: Printable name + /// Item 2: DiscType mapping + /// If something has a "string, null" value, it should be assumed that it is a separator + /// + public static List> GetValidDiscTypes(KnownSystem? sys) { - List types = new List(); + List types = new List(); switch (sys) { #region Consoles case KnownSystem.BandaiPlaydiaQuickInteractiveSystem: - types.Add(DiscType.CD); - break; + types.Add(DiscType.CD); + break; case KnownSystem.BandaiApplePippin: types.Add(DiscType.CD); break; @@ -383,6 +383,7 @@ namespace DICUI.Utilities /// Item 2: KnownSystem mapping /// If something has a "string, null" value, it should be assumed that it is a separator /// + /// TODO: Figure out a way that the sections can be generated more automatically public static List> CreateListOfSystems() { List> mapping = new List>();