diff --git a/SabreTools.Core/DictionaryBaseExtensions.cs b/SabreTools.Core/DictionaryBaseExtensions.cs index eac7738f..1ee375fb 100644 --- a/SabreTools.Core/DictionaryBaseExtensions.cs +++ b/SabreTools.Core/DictionaryBaseExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Core { diff --git a/SabreTools.Core/SabreTools.Core.csproj b/SabreTools.Core/SabreTools.Core.csproj index 2223d477..de43871d 100644 --- a/SabreTools.Core/SabreTools.Core.csproj +++ b/SabreTools.Core/SabreTools.Core.csproj @@ -10,11 +10,8 @@ - - - - - + + diff --git a/SabreTools.DatFiles/SabreTools.DatFiles.csproj b/SabreTools.DatFiles/SabreTools.DatFiles.csproj index 328b3431..e41961c9 100644 --- a/SabreTools.DatFiles/SabreTools.DatFiles.csproj +++ b/SabreTools.DatFiles/SabreTools.DatFiles.csproj @@ -11,13 +11,13 @@ - - + + diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs index 14f943df..27b2f948 100644 --- a/SabreTools.DatItems/DatItem.cs +++ b/SabreTools.DatItems/DatItem.cs @@ -72,8 +72,8 @@ namespace SabreTools.DatItems [XmlElement("itemtype")] public ItemType ItemType { - get => _internal.ReadString(Models.Internal.DatItem.TypeKey).AsItemType(); - set => _internal[Models.Internal.DatItem.TypeKey] = value.FromItemType(); + get => _internal.ReadString(Models.Metadata.DatItem.TypeKey).AsItemType(); + set => _internal[Models.Metadata.DatItem.TypeKey] = value.FromItemType(); } /// @@ -91,7 +91,7 @@ namespace SabreTools.DatItems /// Internal model wrapped by this DatItem /// [JsonIgnore, XmlIgnore] - protected Models.Internal.DatItem _internal; + protected Models.Metadata.DatItem _internal; #endregion @@ -179,7 +179,7 @@ namespace SabreTools.DatItems /// public DatItem() { - _internal = new Models.Internal.Blank(); + _internal = new Models.Metadata.Blank(); Machine = new Machine(); logger = new Logger(this); diff --git a/SabreTools.DatItems/Formats/Adjuster.cs b/SabreTools.DatItems/Formats/Adjuster.cs index 1d425e62..884c4bf3 100644 --- a/SabreTools.DatItems/Formats/Adjuster.cs +++ b/SabreTools.DatItems/Formats/Adjuster.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Adjuster.NameKey); - set => _internal[Models.Internal.Adjuster.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Adjuster.NameKey); + set => _internal[Models.Metadata.Adjuster.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.Adjuster.DefaultKey); - set => _internal[Models.Internal.Adjuster.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.Adjuster.DefaultKey); + set => _internal[Models.Metadata.Adjuster.DefaultKey] = value; } [JsonIgnore] @@ -43,8 +43,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")] public List? Conditions { - get => _internal.Read(Models.Internal.Adjuster.ConditionKey)?.ToList(); - set => _internal[Models.Internal.Adjuster.ConditionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Adjuster.ConditionKey)?.ToList(); + set => _internal[Models.Metadata.Adjuster.ConditionKey] = value?.ToArray(); } [JsonIgnore] @@ -69,7 +69,7 @@ namespace SabreTools.DatItems.Formats /// public Adjuster() { - _internal = new Models.Internal.Adjuster(); + _internal = new Models.Metadata.Adjuster(); Machine = new Machine(); Name = string.Empty; @@ -92,7 +92,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Adjuster ?? new Models.Internal.Adjuster(), + _internal = this._internal?.Clone() as Models.Metadata.Adjuster ?? new Models.Metadata.Adjuster(), }; } diff --git a/SabreTools.DatItems/Formats/Analog.cs b/SabreTools.DatItems/Formats/Analog.cs index 260d62c8..9ad739c1 100644 --- a/SabreTools.DatItems/Formats/Analog.cs +++ b/SabreTools.DatItems/Formats/Analog.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")] public string? Mask { - get => _internal.ReadString(Models.Internal.Analog.MaskKey); - set => _internal[Models.Internal.Analog.MaskKey] = value; + get => _internal.ReadString(Models.Metadata.Analog.MaskKey); + set => _internal[Models.Metadata.Analog.MaskKey] = value; } #endregion @@ -31,7 +31,7 @@ namespace SabreTools.DatItems.Formats /// public Analog() { - _internal = new Models.Internal.Analog(); + _internal = new Models.Metadata.Analog(); Machine = new Machine(); ItemType = ItemType.Analog; @@ -53,7 +53,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Analog ?? new Models.Internal.Analog(), + _internal = this._internal?.Clone() as Models.Metadata.Analog ?? new Models.Metadata.Analog(), }; } diff --git a/SabreTools.DatItems/Formats/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs index b9af7d2d..700d7e01 100644 --- a/SabreTools.DatItems/Formats/Archive.cs +++ b/SabreTools.DatItems/Formats/Archive.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Archive.NameKey); - set => _internal[Models.Internal.Archive.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Archive.NameKey); + set => _internal[Models.Metadata.Archive.NameKey] = value; } /// @@ -106,7 +106,7 @@ namespace SabreTools.DatItems.Formats /// public Archive() { - _internal = new Models.Internal.Archive(); + _internal = new Models.Metadata.Archive(); Machine = new Machine(); Name = string.Empty; @@ -129,7 +129,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Archive ?? new Models.Internal.Archive(), + _internal = this._internal?.Clone() as Models.Metadata.Archive ?? new Models.Metadata.Archive(), }; } diff --git a/SabreTools.DatItems/Formats/Auxiliary.cs b/SabreTools.DatItems/Formats/Auxiliary.cs index 120d2759..3e2deff6 100644 --- a/SabreTools.DatItems/Formats/Auxiliary.cs +++ b/SabreTools.DatItems/Formats/Auxiliary.cs @@ -19,22 +19,22 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value"), XmlElement("value")] public bool? Value { - get => _internal.ReadBool(Models.Internal.Original.ValueKey); - set => _internal[Models.Internal.Original.ValueKey] = value; + get => _internal.ReadBool(Models.Metadata.Original.ValueKey); + set => _internal[Models.Metadata.Original.ValueKey] = value; } [JsonProperty("content"), XmlElement("content")] public string? Content { - get => _internal.ReadString(Models.Internal.Original.ContentKey); - set => _internal[Models.Internal.Original.ContentKey] = value; + get => _internal.ReadString(Models.Metadata.Original.ContentKey); + set => _internal[Models.Metadata.Original.ContentKey] = value; } /// /// Internal Original model /// [JsonIgnore] - private readonly Models.Internal.Original _internal = new(); + private readonly Models.Metadata.Original _internal = new(); } #endregion diff --git a/SabreTools.DatItems/Formats/BiosSet.cs b/SabreTools.DatItems/Formats/BiosSet.cs index 43bf0604..bd55300d 100644 --- a/SabreTools.DatItems/Formats/BiosSet.cs +++ b/SabreTools.DatItems/Formats/BiosSet.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.BiosSet.NameKey); - set => _internal[Models.Internal.BiosSet.NameKey] = value; + get => _internal.ReadString(Models.Metadata.BiosSet.NameKey); + set => _internal[Models.Metadata.BiosSet.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("description", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("description")] public string? Description { - get => _internal.ReadString(Models.Internal.BiosSet.DescriptionKey); - set => _internal[Models.Internal.BiosSet.DescriptionKey] = value; + get => _internal.ReadString(Models.Metadata.BiosSet.DescriptionKey); + set => _internal[Models.Metadata.BiosSet.DescriptionKey] = value; } /// @@ -38,8 +38,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.BiosSet.DefaultKey); - set => _internal[Models.Internal.BiosSet.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.BiosSet.DefaultKey); + set => _internal[Models.Metadata.BiosSet.DefaultKey] = value; } [JsonIgnore] @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats /// public BiosSet() { - _internal = new Models.Internal.BiosSet(); + _internal = new Models.Metadata.BiosSet(); Machine = new Machine(); Name = string.Empty; @@ -87,7 +87,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.BiosSet ?? new Models.Internal.BiosSet(), + _internal = this._internal?.Clone() as Models.Metadata.BiosSet ?? new Models.Metadata.BiosSet(), }; } diff --git a/SabreTools.DatItems/Formats/Chip.cs b/SabreTools.DatItems/Formats/Chip.cs index 38ed0133..e8cd35e6 100644 --- a/SabreTools.DatItems/Formats/Chip.cs +++ b/SabreTools.DatItems/Formats/Chip.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Chip.NameKey); - set => _internal[Models.Internal.Chip.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Chip.NameKey); + set => _internal[Models.Metadata.Chip.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Chip.TagKey); - set => _internal[Models.Internal.Chip.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Chip.TagKey); + set => _internal[Models.Metadata.Chip.TagKey] = value; } /// @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public ChipType ChipType { - get => _internal.ReadString(Models.Internal.Chip.ChipTypeKey).AsChipType(); - set => _internal[Models.Internal.Chip.ChipTypeKey] = value.FromChipType(); + get => _internal.ReadString(Models.Metadata.Chip.ChipTypeKey).AsChipType(); + set => _internal[Models.Metadata.Chip.ChipTypeKey] = value.FromChipType(); } [JsonIgnore] @@ -54,8 +54,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("clock", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("clock")] public long? Clock { - get => _internal.ReadLong(Models.Internal.Chip.ClockKey); - set => _internal[Models.Internal.Chip.ClockKey] = value; + get => _internal.ReadLong(Models.Metadata.Chip.ClockKey); + set => _internal[Models.Metadata.Chip.ClockKey] = value; } [JsonIgnore] @@ -80,7 +80,7 @@ namespace SabreTools.DatItems.Formats /// public Chip() { - _internal = new Models.Internal.Chip(); + _internal = new Models.Metadata.Chip(); Machine = new Machine(); Name = string.Empty; @@ -103,7 +103,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Chip ?? new Models.Internal.Chip(), + _internal = this._internal?.Clone() as Models.Metadata.Chip ?? new Models.Metadata.Chip(), }; } diff --git a/SabreTools.DatItems/Formats/Condition.cs b/SabreTools.DatItems/Formats/Condition.cs index ce49a71a..c3b24167 100644 --- a/SabreTools.DatItems/Formats/Condition.cs +++ b/SabreTools.DatItems/Formats/Condition.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Condition.TagKey); - set => _internal[Models.Internal.Condition.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Condition.TagKey); + set => _internal[Models.Metadata.Condition.TagKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")] public string? Mask { - get => _internal.ReadString(Models.Internal.Condition.MaskKey); - set => _internal[Models.Internal.Condition.MaskKey] = value; + get => _internal.ReadString(Models.Metadata.Condition.MaskKey); + set => _internal[Models.Metadata.Condition.MaskKey] = value; } /// @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public Relation Relation { - get => _internal.ReadString(Models.Internal.Condition.RelationKey).AsRelation(); - set => _internal[Models.Internal.Condition.RelationKey] = value.FromRelation(); + get => _internal.ReadString(Models.Metadata.Condition.RelationKey).AsRelation(); + set => _internal[Models.Metadata.Condition.RelationKey] = value.FromRelation(); } [JsonIgnore] @@ -54,8 +54,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.Condition.ValueKey); - set => _internal[Models.Internal.Condition.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.Condition.ValueKey); + set => _internal[Models.Metadata.Condition.ValueKey] = value; } #endregion @@ -67,7 +67,7 @@ namespace SabreTools.DatItems.Formats /// public Condition() { - _internal = new Models.Internal.Condition(); + _internal = new Models.Metadata.Condition(); Machine = new Machine(); ItemType = ItemType.Condition; @@ -89,7 +89,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Condition ?? new Models.Internal.Condition(), + _internal = this._internal?.Clone() as Models.Metadata.Condition ?? new Models.Metadata.Condition(), }; } diff --git a/SabreTools.DatItems/Formats/ConfLocation.cs b/SabreTools.DatItems/Formats/ConfLocation.cs index aa81c744..1844bce6 100644 --- a/SabreTools.DatItems/Formats/ConfLocation.cs +++ b/SabreTools.DatItems/Formats/ConfLocation.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.ConfLocation.NameKey); - set => _internal[Models.Internal.ConfLocation.NameKey] = value; + get => _internal.ReadString(Models.Metadata.ConfLocation.NameKey); + set => _internal[Models.Metadata.ConfLocation.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("number", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("number")] public long? Number { - get => _internal.ReadLong(Models.Internal.ConfLocation.NumberKey); - set => _internal[Models.Internal.ConfLocation.NumberKey] = value; + get => _internal.ReadLong(Models.Metadata.ConfLocation.NumberKey); + set => _internal[Models.Metadata.ConfLocation.NumberKey] = value; } [JsonIgnore] @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("inverted")] public bool? Inverted { - get => _internal.ReadBool(Models.Internal.ConfLocation.InvertedKey); - set => _internal[Models.Internal.ConfLocation.InvertedKey] = value; + get => _internal.ReadBool(Models.Metadata.ConfLocation.InvertedKey); + set => _internal[Models.Metadata.ConfLocation.InvertedKey] = value; } [JsonIgnore] @@ -67,7 +67,7 @@ namespace SabreTools.DatItems.Formats /// public ConfLocation() { - _internal = new Models.Internal.ConfLocation(); + _internal = new Models.Metadata.ConfLocation(); Machine = new Machine(); Name = string.Empty; @@ -90,7 +90,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.ConfLocation ?? new Models.Internal.ConfLocation(), + _internal = this._internal?.Clone() as Models.Metadata.ConfLocation ?? new Models.Metadata.ConfLocation(), }; } diff --git a/SabreTools.DatItems/Formats/ConfSetting.cs b/SabreTools.DatItems/Formats/ConfSetting.cs index 1405d180..89d7fa36 100644 --- a/SabreTools.DatItems/Formats/ConfSetting.cs +++ b/SabreTools.DatItems/Formats/ConfSetting.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.ConfSetting.NameKey); - set => _internal[Models.Internal.ConfSetting.NameKey] = value; + get => _internal.ReadString(Models.Metadata.ConfSetting.NameKey); + set => _internal[Models.Metadata.ConfSetting.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.ConfSetting.ValueKey); - set => _internal[Models.Internal.ConfSetting.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.ConfSetting.ValueKey); + set => _internal[Models.Metadata.ConfSetting.ValueKey] = value; } /// @@ -40,8 +40,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.ConfSetting.DefaultKey); - set => _internal[Models.Internal.ConfSetting.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.ConfSetting.DefaultKey); + set => _internal[Models.Metadata.ConfSetting.DefaultKey] = value; } [JsonIgnore] @@ -53,8 +53,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")] public List? Conditions { - get => _internal.Read(Models.Internal.ConfSetting.ConditionKey)?.ToList(); - set => _internal[Models.Internal.ConfSetting.ConditionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.ConfSetting.ConditionKey)?.ToList(); + set => _internal[Models.Metadata.ConfSetting.ConditionKey] = value?.ToArray(); } [JsonIgnore] @@ -79,7 +79,7 @@ namespace SabreTools.DatItems.Formats /// public ConfSetting() { - _internal = new Models.Internal.ConfSetting(); + _internal = new Models.Metadata.ConfSetting(); Machine = new Machine(); Name = string.Empty; @@ -102,7 +102,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.ConfSetting ?? new Models.Internal.ConfSetting(), + _internal = this._internal?.Clone() as Models.Metadata.ConfSetting ?? new Models.Metadata.ConfSetting(), }; } diff --git a/SabreTools.DatItems/Formats/Configuration.cs b/SabreTools.DatItems/Formats/Configuration.cs index 5afb2361..1e0dfa60 100644 --- a/SabreTools.DatItems/Formats/Configuration.cs +++ b/SabreTools.DatItems/Formats/Configuration.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Configuration.NameKey); - set => _internal[Models.Internal.Configuration.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Configuration.NameKey); + set => _internal[Models.Metadata.Configuration.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Configuration.TagKey); - set => _internal[Models.Internal.Configuration.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Configuration.TagKey); + set => _internal[Models.Metadata.Configuration.TagKey] = value; } /// @@ -40,8 +40,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")] public string? Mask { - get => _internal.ReadString(Models.Internal.Configuration.MaskKey); - set => _internal[Models.Internal.Configuration.MaskKey] = value; + get => _internal.ReadString(Models.Metadata.Configuration.MaskKey); + set => _internal[Models.Metadata.Configuration.MaskKey] = value; } /// @@ -50,8 +50,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")] public List? Conditions { - get => _internal.Read(Models.Internal.Configuration.ConditionKey)?.ToList(); - set => _internal[Models.Internal.Configuration.ConditionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Configuration.ConditionKey)?.ToList(); + set => _internal[Models.Metadata.Configuration.ConditionKey] = value?.ToArray(); } [JsonIgnore] @@ -63,8 +63,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("locations")] public List? Locations { - get => _internal.Read(Models.Internal.Configuration.ConfLocationKey)?.ToList(); - set => _internal[Models.Internal.Configuration.ConfLocationKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Configuration.ConfLocationKey)?.ToList(); + set => _internal[Models.Metadata.Configuration.ConfLocationKey] = value?.ToArray(); } [JsonIgnore] @@ -76,8 +76,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("settings", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("settings")] public List? Settings { - get => _internal.Read>(Models.Internal.Configuration.ConfSettingKey); - set => _internal[Models.Internal.Configuration.ConfSettingKey] = value; + get => _internal.Read>(Models.Metadata.Configuration.ConfSettingKey); + set => _internal[Models.Metadata.Configuration.ConfSettingKey] = value; } [JsonIgnore] @@ -102,7 +102,7 @@ namespace SabreTools.DatItems.Formats /// public Configuration() { - _internal = new Models.Internal.Configuration(); + _internal = new Models.Metadata.Configuration(); Machine = new Machine(); Name = string.Empty; @@ -125,7 +125,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Configuration ?? new Models.Internal.Configuration(), + _internal = this._internal?.Clone() as Models.Metadata.Configuration ?? new Models.Metadata.Configuration(), }; } diff --git a/SabreTools.DatItems/Formats/Control.cs b/SabreTools.DatItems/Formats/Control.cs index ea301287..48f8047b 100644 --- a/SabreTools.DatItems/Formats/Control.cs +++ b/SabreTools.DatItems/Formats/Control.cs @@ -21,8 +21,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public ControlType ControlType { - get => _internal.ReadString(Models.Internal.Control.ControlTypeKey).AsControlType(); - set => _internal[Models.Internal.Control.ControlTypeKey] = value.FromControlType(); + get => _internal.ReadString(Models.Metadata.Control.ControlTypeKey).AsControlType(); + set => _internal[Models.Metadata.Control.ControlTypeKey] = value.FromControlType(); } [JsonIgnore] @@ -34,8 +34,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("player", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("player")] public long? Player { - get => _internal.ReadLong(Models.Internal.Control.PlayerKey); - set => _internal[Models.Internal.Control.PlayerKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.PlayerKey); + set => _internal[Models.Metadata.Control.PlayerKey] = value; } [JsonIgnore] @@ -47,8 +47,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("buttons", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("buttons")] public long? Buttons { - get => _internal.ReadLong(Models.Internal.Control.ButtonsKey); - set => _internal[Models.Internal.Control.ButtonsKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.ButtonsKey); + set => _internal[Models.Metadata.Control.ButtonsKey] = value; } [JsonIgnore] @@ -60,8 +60,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("reqbuttons", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("reqbuttons")] public long? RequiredButtons { - get => _internal.ReadLong(Models.Internal.Control.ReqButtonsKey); - set => _internal[Models.Internal.Control.ReqButtonsKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.ReqButtonsKey); + set => _internal[Models.Metadata.Control.ReqButtonsKey] = value; } [JsonIgnore] @@ -73,8 +73,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("minimum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("minimum")] public long? Minimum { - get => _internal.ReadLong(Models.Internal.Control.MinimumKey); - set => _internal[Models.Internal.Control.MinimumKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.MinimumKey); + set => _internal[Models.Metadata.Control.MinimumKey] = value; } [JsonIgnore] @@ -86,8 +86,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("maximum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("maximum")] public long? Maximum { - get => _internal.ReadLong(Models.Internal.Control.MaximumKey); - set => _internal[Models.Internal.Control.MaximumKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.MaximumKey); + set => _internal[Models.Metadata.Control.MaximumKey] = value; } [JsonIgnore] @@ -99,8 +99,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sensitivity", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sensitivity")] public long? Sensitivity { - get => _internal.ReadLong(Models.Internal.Control.SensitivityKey); - set => _internal[Models.Internal.Control.SensitivityKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.SensitivityKey); + set => _internal[Models.Metadata.Control.SensitivityKey] = value; } [JsonIgnore] @@ -112,8 +112,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("keydelta", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("keydelta")] public long? KeyDelta { - get => _internal.ReadLong(Models.Internal.Control.KeyDeltaKey); - set => _internal[Models.Internal.Control.KeyDeltaKey] = value; + get => _internal.ReadLong(Models.Metadata.Control.KeyDeltaKey); + set => _internal[Models.Metadata.Control.KeyDeltaKey] = value; } [JsonIgnore] @@ -125,8 +125,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("reverse", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("reverse")] public bool? Reverse { - get => _internal.ReadBool(Models.Internal.Control.ReverseKey); - set => _internal[Models.Internal.Control.ReverseKey] = value; + get => _internal.ReadBool(Models.Metadata.Control.ReverseKey); + set => _internal[Models.Metadata.Control.ReverseKey] = value; } [JsonIgnore] @@ -138,8 +138,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("ways", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways")] public string? Ways { - get => _internal.ReadString(Models.Internal.Control.WaysKey); - set => _internal[Models.Internal.Control.WaysKey] = value; + get => _internal.ReadString(Models.Metadata.Control.WaysKey); + set => _internal[Models.Metadata.Control.WaysKey] = value; } /// @@ -148,8 +148,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("ways2", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways2")] public string? Ways2 { - get => _internal.ReadString(Models.Internal.Control.Ways2Key); - set => _internal[Models.Internal.Control.Ways2Key] = value; + get => _internal.ReadString(Models.Metadata.Control.Ways2Key); + set => _internal[Models.Metadata.Control.Ways2Key] = value; } /// @@ -158,8 +158,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("ways3", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways3")] public string? Ways3 { - get => _internal.ReadString(Models.Internal.Control.Ways3Key); - set => _internal[Models.Internal.Control.Ways3Key] = value; + get => _internal.ReadString(Models.Metadata.Control.Ways3Key); + set => _internal[Models.Metadata.Control.Ways3Key] = value; } #endregion @@ -171,7 +171,7 @@ namespace SabreTools.DatItems.Formats /// public Control() { - _internal = new Models.Internal.Control(); + _internal = new Models.Metadata.Control(); Machine = new Machine(); ItemType = ItemType.Control; @@ -193,7 +193,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Control ?? new Models.Internal.Control(), + _internal = this._internal?.Clone() as Models.Metadata.Control ?? new Models.Metadata.Control(), }; } diff --git a/SabreTools.DatItems/Formats/DataArea.cs b/SabreTools.DatItems/Formats/DataArea.cs index ca2cfccc..9a8b4b1a 100644 --- a/SabreTools.DatItems/Formats/DataArea.cs +++ b/SabreTools.DatItems/Formats/DataArea.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DataArea.NameKey); - set => _internal[Models.Internal.DataArea.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DataArea.NameKey); + set => _internal[Models.Metadata.DataArea.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("size")] public long? Size { - get => _internal.ReadLong(Models.Internal.DataArea.SizeKey); - set => _internal[Models.Internal.DataArea.SizeKey] = value; + get => _internal.ReadLong(Models.Metadata.DataArea.SizeKey); + set => _internal[Models.Metadata.DataArea.SizeKey] = value; } [JsonIgnore] @@ -43,8 +43,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("width")] public long? Width { - get => _internal.ReadLong(Models.Internal.DataArea.WidthKey); - set => _internal[Models.Internal.DataArea.WidthKey] = value; + get => _internal.ReadLong(Models.Metadata.DataArea.WidthKey); + set => _internal[Models.Metadata.DataArea.WidthKey] = value; } [JsonIgnore] @@ -56,8 +56,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("endianness", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("endianness")] public Endianness Endianness { - get => _internal.ReadString(Models.Internal.DataArea.WidthKey).AsEndianness(); - set => _internal[Models.Internal.DataArea.WidthKey] = value.FromEndianness(); + get => _internal.ReadString(Models.Metadata.DataArea.WidthKey).AsEndianness(); + set => _internal[Models.Metadata.DataArea.WidthKey] = value.FromEndianness(); } [JsonIgnore] @@ -82,7 +82,7 @@ namespace SabreTools.DatItems.Formats /// public DataArea() { - _internal = new Models.Internal.DataArea(); + _internal = new Models.Metadata.DataArea(); Machine = new Machine(); Name = string.Empty; @@ -105,7 +105,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DataArea ?? new Models.Internal.DataArea(), + _internal = this._internal?.Clone() as Models.Metadata.DataArea ?? new Models.Metadata.DataArea(), }; } diff --git a/SabreTools.DatItems/Formats/Device.cs b/SabreTools.DatItems/Formats/Device.cs index d243a95b..344aeb3a 100644 --- a/SabreTools.DatItems/Formats/Device.cs +++ b/SabreTools.DatItems/Formats/Device.cs @@ -23,8 +23,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public DeviceType DeviceType { - get => _internal.ReadString(Models.Internal.Device.DeviceTypeKey).AsDeviceType(); - set => _internal[Models.Internal.Device.DeviceTypeKey] = value.FromDeviceType(); + get => _internal.ReadString(Models.Metadata.Device.DeviceTypeKey).AsDeviceType(); + set => _internal[Models.Metadata.Device.DeviceTypeKey] = value.FromDeviceType(); } [JsonIgnore] @@ -36,8 +36,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Device.TagKey); - set => _internal[Models.Internal.Device.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Device.TagKey); + set => _internal[Models.Metadata.Device.TagKey] = value; } /// @@ -46,8 +46,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("fixed_image", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("fixed_image")] public string? FixedImage { - get => _internal.ReadString(Models.Internal.Device.FixedImageKey); - set => _internal[Models.Internal.Device.FixedImageKey] = value; + get => _internal.ReadString(Models.Metadata.Device.FixedImageKey); + set => _internal[Models.Metadata.Device.FixedImageKey] = value; } /// @@ -57,8 +57,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mandatory", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mandatory")] public long? Mandatory { - get => _internal.ReadLong(Models.Internal.Device.MandatoryKey); - set => _internal[Models.Internal.Device.MandatoryKey] = value; + get => _internal.ReadLong(Models.Metadata.Device.MandatoryKey); + set => _internal[Models.Metadata.Device.MandatoryKey] = value; } [JsonIgnore] @@ -70,8 +70,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("interface", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("interface")] public string? Interface { - get => _internal.ReadString(Models.Internal.Device.InterfaceKey); - set => _internal[Models.Internal.Device.InterfaceKey] = value; + get => _internal.ReadString(Models.Metadata.Device.InterfaceKey); + set => _internal[Models.Metadata.Device.InterfaceKey] = value; } /// @@ -80,8 +80,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("instances", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("instances")] public List? Instances { - get => _internal.Read(Models.Internal.Device.InstanceKey)?.ToList(); - set => _internal[Models.Internal.Device.InstanceKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Device.InstanceKey)?.ToList(); + set => _internal[Models.Metadata.Device.InstanceKey] = value?.ToArray(); } [JsonIgnore] @@ -93,8 +93,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("extensions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("extensions")] public List? Extensions { - get => _internal.Read(Models.Internal.Device.ExtensionKey)?.ToList(); - set => _internal[Models.Internal.Device.ExtensionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Device.ExtensionKey)?.ToList(); + set => _internal[Models.Metadata.Device.ExtensionKey] = value?.ToArray(); } [JsonIgnore] @@ -109,7 +109,7 @@ namespace SabreTools.DatItems.Formats /// public Device() { - _internal = new Models.Internal.Device(); + _internal = new Models.Metadata.Device(); Machine = new Machine(); ItemType = ItemType.Device; @@ -131,7 +131,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Device ?? new Models.Internal.Device(), + _internal = this._internal?.Clone() as Models.Metadata.Device ?? new Models.Metadata.Device(), }; } diff --git a/SabreTools.DatItems/Formats/DeviceReference.cs b/SabreTools.DatItems/Formats/DeviceReference.cs index 098f69e6..dc67b8ed 100644 --- a/SabreTools.DatItems/Formats/DeviceReference.cs +++ b/SabreTools.DatItems/Formats/DeviceReference.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DeviceRef.NameKey); - set => _internal[Models.Internal.DeviceRef.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DeviceRef.NameKey); + set => _internal[Models.Metadata.DeviceRef.NameKey] = value; } #endregion @@ -41,7 +41,7 @@ namespace SabreTools.DatItems.Formats /// public DeviceReference() { - _internal = new Models.Internal.DeviceRef(); + _internal = new Models.Metadata.DeviceRef(); Machine = new Machine(); Name = string.Empty; @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DeviceRef ?? new Models.Internal.DeviceRef(), + _internal = this._internal?.Clone() as Models.Metadata.DeviceRef ?? new Models.Metadata.DeviceRef(), }; } diff --git a/SabreTools.DatItems/Formats/DipLocation.cs b/SabreTools.DatItems/Formats/DipLocation.cs index 44d2bf9c..f107da5e 100644 --- a/SabreTools.DatItems/Formats/DipLocation.cs +++ b/SabreTools.DatItems/Formats/DipLocation.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DipLocation.NameKey); - set => _internal[Models.Internal.DipLocation.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DipLocation.NameKey); + set => _internal[Models.Metadata.DipLocation.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("number", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("number")] public long? Number { - get => _internal.ReadLong(Models.Internal.DipLocation.NameKey); - set => _internal[Models.Internal.DipLocation.NameKey] = value; + get => _internal.ReadLong(Models.Metadata.DipLocation.NameKey); + set => _internal[Models.Metadata.DipLocation.NameKey] = value; } [JsonIgnore] @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("inverted")] public bool? Inverted { - get => _internal.ReadBool(Models.Internal.DipLocation.InvertedKey); - set => _internal[Models.Internal.DipLocation.InvertedKey] = value; + get => _internal.ReadBool(Models.Metadata.DipLocation.InvertedKey); + set => _internal[Models.Metadata.DipLocation.InvertedKey] = value; } [JsonIgnore] @@ -67,7 +67,7 @@ namespace SabreTools.DatItems.Formats /// public DipLocation() { - _internal = new Models.Internal.DipLocation(); + _internal = new Models.Metadata.DipLocation(); Machine = new Machine(); Name = string.Empty; @@ -90,7 +90,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DipLocation ?? new Models.Internal.DipLocation(), + _internal = this._internal?.Clone() as Models.Metadata.DipLocation ?? new Models.Metadata.DipLocation(), }; } diff --git a/SabreTools.DatItems/Formats/DipSwitch.cs b/SabreTools.DatItems/Formats/DipSwitch.cs index b8411d8e..f2738bdf 100644 --- a/SabreTools.DatItems/Formats/DipSwitch.cs +++ b/SabreTools.DatItems/Formats/DipSwitch.cs @@ -22,8 +22,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DipSwitch.NameKey); - set => _internal[Models.Internal.DipSwitch.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DipSwitch.NameKey); + set => _internal[Models.Metadata.DipSwitch.NameKey] = value; } /// @@ -32,8 +32,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.DipSwitch.TagKey); - set => _internal[Models.Internal.DipSwitch.TagKey] = value; + get => _internal.ReadString(Models.Metadata.DipSwitch.TagKey); + set => _internal[Models.Metadata.DipSwitch.TagKey] = value; } /// @@ -42,8 +42,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")] public string? Mask { - get => _internal.ReadString(Models.Internal.DipSwitch.MaskKey); - set => _internal[Models.Internal.DipSwitch.MaskKey] = value; + get => _internal.ReadString(Models.Metadata.DipSwitch.MaskKey); + set => _internal[Models.Metadata.DipSwitch.MaskKey] = value; } /// @@ -52,8 +52,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")] public List? Conditions { - get => _internal.Read(Models.Internal.DipSwitch.ConditionKey)?.ToList(); - set => _internal[Models.Internal.DipSwitch.ConditionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.DipSwitch.ConditionKey)?.ToList(); + set => _internal[Models.Metadata.DipSwitch.ConditionKey] = value?.ToArray(); } [JsonIgnore] @@ -65,8 +65,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("locations")] public List? Locations { - get => _internal.Read(Models.Internal.DipSwitch.DipLocationKey)?.ToList(); - set => _internal[Models.Internal.DipSwitch.DipLocationKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.DipSwitch.DipLocationKey)?.ToList(); + set => _internal[Models.Metadata.DipSwitch.DipLocationKey] = value?.ToArray(); } [JsonIgnore] @@ -78,8 +78,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("values", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("values")] public List? Values { - get => _internal.Read(Models.Internal.DipSwitch.DipValueKey)?.ToList(); - set => _internal[Models.Internal.DipSwitch.DipValueKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.DipSwitch.DipValueKey)?.ToList(); + set => _internal[Models.Metadata.DipSwitch.DipValueKey] = value?.ToArray(); } [JsonIgnore] @@ -128,7 +128,7 @@ namespace SabreTools.DatItems.Formats /// public DipSwitch() { - _internal = new Models.Internal.DipSwitch(); + _internal = new Models.Metadata.DipSwitch(); Machine = new Machine(); Name = string.Empty; @@ -151,7 +151,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DipSwitch ?? new Models.Internal.DipSwitch(), + _internal = this._internal?.Clone() as Models.Metadata.DipSwitch ?? new Models.Metadata.DipSwitch(), Part = this.Part, }; diff --git a/SabreTools.DatItems/Formats/DipValue.cs b/SabreTools.DatItems/Formats/DipValue.cs index f1e50886..b95200d5 100644 --- a/SabreTools.DatItems/Formats/DipValue.cs +++ b/SabreTools.DatItems/Formats/DipValue.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DipValue.NameKey); - set => _internal[Models.Internal.DipValue.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DipValue.NameKey); + set => _internal[Models.Metadata.DipValue.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.DipValue.ValueKey); - set => _internal[Models.Internal.DipValue.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.DipValue.ValueKey); + set => _internal[Models.Metadata.DipValue.ValueKey] = value; } /// @@ -40,8 +40,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.DipValue.DefaultKey); - set => _internal[Models.Internal.DipValue.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.DipValue.DefaultKey); + set => _internal[Models.Metadata.DipValue.DefaultKey] = value; } [JsonIgnore] @@ -53,8 +53,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")] public List? Conditions { - get => _internal.Read(Models.Internal.DipValue.ConditionKey)?.ToList(); - set => _internal[Models.Internal.DipValue.ConditionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.DipValue.ConditionKey)?.ToList(); + set => _internal[Models.Metadata.DipValue.ConditionKey] = value?.ToArray(); } [JsonIgnore] @@ -79,7 +79,7 @@ namespace SabreTools.DatItems.Formats /// public DipValue() { - _internal = new Models.Internal.DipValue(); + _internal = new Models.Metadata.DipValue(); Machine = new Machine(); Name = string.Empty; @@ -102,7 +102,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DipValue ?? new Models.Internal.DipValue(), + _internal = this._internal?.Clone() as Models.Metadata.DipValue ?? new Models.Metadata.DipValue(), }; } diff --git a/SabreTools.DatItems/Formats/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs index 93fcee5b..560630d0 100644 --- a/SabreTools.DatItems/Formats/Disk.cs +++ b/SabreTools.DatItems/Formats/Disk.cs @@ -23,8 +23,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Disk.NameKey); - set => _internal[Models.Internal.Disk.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Disk.NameKey); + set => _internal[Models.Metadata.Disk.NameKey] = value; } /// @@ -33,8 +33,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")] public string? MD5 { - get => _internal.ReadString(Models.Internal.Disk.MD5Key); - set => _internal[Models.Internal.Disk.MD5Key] = TextHelper.NormalizeMD5(value); + get => _internal.ReadString(Models.Metadata.Disk.MD5Key); + set => _internal[Models.Metadata.Disk.MD5Key] = TextHelper.NormalizeMD5(value); } /// @@ -43,8 +43,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")] public string? SHA1 { - get => _internal.ReadString(Models.Internal.Disk.SHA1Key); - set => _internal[Models.Internal.Disk.SHA1Key] = TextHelper.NormalizeSHA1(value); + get => _internal.ReadString(Models.Metadata.Disk.SHA1Key); + set => _internal[Models.Metadata.Disk.SHA1Key] = TextHelper.NormalizeSHA1(value); } /// @@ -53,8 +53,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("merge")] public string? MergeTag { - get => _internal.ReadString(Models.Internal.Disk.MergeKey); - set => _internal[Models.Internal.Disk.MergeKey] = value; + get => _internal.ReadString(Models.Metadata.Disk.MergeKey); + set => _internal[Models.Metadata.Disk.MergeKey] = value; } /// @@ -63,8 +63,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("region")] public string? Region { - get => _internal.ReadString(Models.Internal.Disk.RegionKey); - set => _internal[Models.Internal.Disk.RegionKey] = value; + get => _internal.ReadString(Models.Metadata.Disk.RegionKey); + set => _internal[Models.Metadata.Disk.RegionKey] = value; } /// @@ -73,8 +73,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("index", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("index")] public string? Index { - get => _internal.ReadString(Models.Internal.Disk.IndexKey); - set => _internal[Models.Internal.Disk.IndexKey] = value; + get => _internal.ReadString(Models.Metadata.Disk.IndexKey); + set => _internal[Models.Metadata.Disk.IndexKey] = value; } /// @@ -83,8 +83,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("writable", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("writable")] public bool? Writable { - get => _internal.ReadBool(Models.Internal.Disk.WritableKey); - set => _internal[Models.Internal.Disk.WritableKey] = value; + get => _internal.ReadBool(Models.Metadata.Disk.WritableKey); + set => _internal[Models.Metadata.Disk.WritableKey] = value; } [JsonIgnore] @@ -97,8 +97,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public ItemStatus ItemStatus { - get => _internal.ReadString(Models.Internal.Disk.StatusKey).AsItemStatus(); - set => _internal[Models.Internal.Disk.StatusKey] = value.FromItemStatus(yesno: false); + get => _internal.ReadString(Models.Metadata.Disk.StatusKey).AsItemStatus(); + set => _internal[Models.Metadata.Disk.StatusKey] = value.FromItemStatus(yesno: false); } [JsonIgnore] @@ -110,8 +110,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("optional")] public bool? Optional { - get => _internal.ReadBool(Models.Internal.Disk.OptionalKey); - set => _internal[Models.Internal.Disk.OptionalKey] = value; + get => _internal.ReadBool(Models.Metadata.Disk.OptionalKey); + set => _internal[Models.Metadata.Disk.OptionalKey] = value; } [JsonIgnore] @@ -185,7 +185,7 @@ namespace SabreTools.DatItems.Formats /// public Disk() { - _internal = new Models.Internal.Disk(); + _internal = new Models.Metadata.Disk(); Machine = new Machine(); Name = string.Empty; @@ -199,7 +199,7 @@ namespace SabreTools.DatItems.Formats /// public Disk(BaseFile baseFile) { - _internal = new Models.Internal.Disk(); + _internal = new Models.Metadata.Disk(); Machine = new Machine(); Name = baseFile.Filename; @@ -227,7 +227,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Disk ?? new Models.Internal.Disk(), + _internal = this._internal?.Clone() as Models.Metadata.Disk ?? new Models.Metadata.Disk(), }; } diff --git a/SabreTools.DatItems/Formats/DiskArea.cs b/SabreTools.DatItems/Formats/DiskArea.cs index ea9c2ee3..eb9dff0a 100644 --- a/SabreTools.DatItems/Formats/DiskArea.cs +++ b/SabreTools.DatItems/Formats/DiskArea.cs @@ -19,8 +19,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.DiskArea.NameKey); - set => _internal[Models.Internal.DiskArea.NameKey] = value; + get => _internal.ReadString(Models.Metadata.DiskArea.NameKey); + set => _internal[Models.Metadata.DiskArea.NameKey] = value; } #endregion @@ -42,7 +42,7 @@ namespace SabreTools.DatItems.Formats /// public DiskArea() { - _internal = new Models.Internal.DiskArea(); + _internal = new Models.Metadata.DiskArea(); Machine = new Machine(); Name = string.Empty; @@ -65,7 +65,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.DiskArea ?? new Models.Internal.DiskArea(), + _internal = this._internal?.Clone() as Models.Metadata.DiskArea ?? new Models.Metadata.DiskArea(), }; } diff --git a/SabreTools.DatItems/Formats/Display.cs b/SabreTools.DatItems/Formats/Display.cs index 3af82aff..1111f9fd 100644 --- a/SabreTools.DatItems/Formats/Display.cs +++ b/SabreTools.DatItems/Formats/Display.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Display.TagKey); - set => _internal[Models.Internal.Display.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Display.TagKey); + set => _internal[Models.Metadata.Display.TagKey] = value; } /// @@ -31,8 +31,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public DisplayType DisplayType { - get => _internal.ReadString(Models.Internal.Display.DisplayTypeKey).AsDisplayType(); - set => _internal[Models.Internal.Display.DisplayTypeKey] = value.FromDisplayType(); + get => _internal.ReadString(Models.Metadata.Display.DisplayTypeKey).AsDisplayType(); + set => _internal[Models.Metadata.Display.DisplayTypeKey] = value.FromDisplayType(); } [JsonIgnore] @@ -44,8 +44,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("rotate", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("rotate")] public long? Rotate { - get => _internal.ReadLong(Models.Internal.Display.RotateKey); - set => _internal[Models.Internal.Display.RotateKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.RotateKey); + set => _internal[Models.Metadata.Display.RotateKey] = value; } [JsonIgnore] @@ -57,8 +57,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("flipx", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("flipx")] public bool? FlipX { - get => _internal.ReadBool(Models.Internal.Display.FlipXKey); - set => _internal[Models.Internal.Display.FlipXKey] = value; + get => _internal.ReadBool(Models.Metadata.Display.FlipXKey); + set => _internal[Models.Metadata.Display.FlipXKey] = value; } [JsonIgnore] @@ -70,8 +70,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("width")] public long? Width { - get => _internal.ReadLong(Models.Internal.Display.WidthKey); - set => _internal[Models.Internal.Display.WidthKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.WidthKey); + set => _internal[Models.Metadata.Display.WidthKey] = value; } [JsonIgnore] @@ -83,8 +83,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("height", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("height")] public long? Height { - get => _internal.ReadLong(Models.Internal.Display.HeightKey); - set => _internal[Models.Internal.Display.HeightKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.HeightKey); + set => _internal[Models.Metadata.Display.HeightKey] = value; } [JsonIgnore] @@ -96,8 +96,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("refresh", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("refresh")] public double? Refresh { - get => _internal.ReadDouble(Models.Internal.Display.RefreshKey); - set => _internal[Models.Internal.Display.RefreshKey] = value; + get => _internal.ReadDouble(Models.Metadata.Display.RefreshKey); + set => _internal[Models.Metadata.Display.RefreshKey] = value; } [JsonIgnore] @@ -109,8 +109,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("pixclock", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("pixclock")] public long? PixClock { - get => _internal.ReadLong(Models.Internal.Display.PixClockKey); - set => _internal[Models.Internal.Display.PixClockKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.PixClockKey); + set => _internal[Models.Metadata.Display.PixClockKey] = value; } [JsonIgnore] @@ -122,8 +122,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("htotal", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("htotal")] public long? HTotal { - get => _internal.ReadLong(Models.Internal.Display.HTotalKey); - set => _internal[Models.Internal.Display.HTotalKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.HTotalKey); + set => _internal[Models.Metadata.Display.HTotalKey] = value; } [JsonIgnore] @@ -135,8 +135,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("hbend", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("hbend")] public long? HBEnd { - get => _internal.ReadLong(Models.Internal.Display.HBEndKey); - set => _internal[Models.Internal.Display.HBEndKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.HBEndKey); + set => _internal[Models.Metadata.Display.HBEndKey] = value; } [JsonIgnore] @@ -148,8 +148,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("hbstart", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("hbstart")] public long? HBStart { - get => _internal.ReadLong(Models.Internal.Display.HBStartKey); - set => _internal[Models.Internal.Display.HBStartKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.HBStartKey); + set => _internal[Models.Metadata.Display.HBStartKey] = value; } [JsonIgnore] @@ -161,8 +161,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("vtotal", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vtotal")] public long? VTotal { - get => _internal.ReadLong(Models.Internal.Display.VTotalKey); - set => _internal[Models.Internal.Display.VTotalKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.VTotalKey); + set => _internal[Models.Metadata.Display.VTotalKey] = value; } [JsonIgnore] @@ -174,8 +174,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("vbend", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vbend")] public long? VBEnd { - get => _internal.ReadLong(Models.Internal.Display.VBEndKey); - set => _internal[Models.Internal.Display.VBEndKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.VBEndKey); + set => _internal[Models.Metadata.Display.VBEndKey] = value; } [JsonIgnore] @@ -187,8 +187,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("vbstart", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vbstart")] public long? VBStart { - get => _internal.ReadLong(Models.Internal.Display.VBStartKey); - set => _internal[Models.Internal.Display.VBStartKey] = value; + get => _internal.ReadLong(Models.Metadata.Display.VBStartKey); + set => _internal[Models.Metadata.Display.VBStartKey] = value; } [JsonIgnore] @@ -203,7 +203,7 @@ namespace SabreTools.DatItems.Formats /// public Display() { - _internal = new Models.Internal.Display(); + _internal = new Models.Metadata.Display(); Machine = new Machine(); ItemType = ItemType.Display; @@ -225,7 +225,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Display ?? new Models.Internal.Display(), + _internal = this._internal?.Clone() as Models.Metadata.Display ?? new Models.Metadata.Display(), }; } diff --git a/SabreTools.DatItems/Formats/Driver.cs b/SabreTools.DatItems/Formats/Driver.cs index b140bcec..3b610b0a 100644 --- a/SabreTools.DatItems/Formats/Driver.cs +++ b/SabreTools.DatItems/Formats/Driver.cs @@ -24,8 +24,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public SupportStatus Status { - get => _internal.ReadString(Models.Internal.Driver.StatusKey).AsSupportStatus(); - set => _internal[Models.Internal.Driver.StatusKey] = value.FromSupportStatus(); + get => _internal.ReadString(Models.Metadata.Driver.StatusKey).AsSupportStatus(); + set => _internal[Models.Metadata.Driver.StatusKey] = value.FromSupportStatus(); } [JsonIgnore] @@ -38,8 +38,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public SupportStatus Emulation { - get => _internal.ReadString(Models.Internal.Driver.EmulationKey).AsSupportStatus(); - set => _internal[Models.Internal.Driver.EmulationKey] = value.FromSupportStatus(); + get => _internal.ReadString(Models.Metadata.Driver.EmulationKey).AsSupportStatus(); + set => _internal[Models.Metadata.Driver.EmulationKey] = value.FromSupportStatus(); } [JsonIgnore] @@ -52,8 +52,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public SupportStatus Cocktail { - get => _internal.ReadString(Models.Internal.Driver.CocktailKey).AsSupportStatus(); - set => _internal[Models.Internal.Driver.CocktailKey] = value.FromSupportStatus(); + get => _internal.ReadString(Models.Metadata.Driver.CocktailKey).AsSupportStatus(); + set => _internal[Models.Metadata.Driver.CocktailKey] = value.FromSupportStatus(); } [JsonIgnore] @@ -66,8 +66,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public Supported SaveState { - get => _internal.ReadString(Models.Internal.Driver.SaveStateKey).AsSupported(); - set => _internal[Models.Internal.Driver.SaveStateKey] = value.FromSupported(verbose: true); + get => _internal.ReadString(Models.Metadata.Driver.SaveStateKey).AsSupported(); + set => _internal[Models.Metadata.Driver.SaveStateKey] = value.FromSupported(verbose: true); } [JsonIgnore] @@ -79,8 +79,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("requiresartwork", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("requiresartwork")] public bool? RequiresArtwork { - get => _internal.ReadBool(Models.Internal.Driver.RequiresArtworkKey); - set => _internal[Models.Internal.Driver.RequiresArtworkKey] = value; + get => _internal.ReadBool(Models.Metadata.Driver.RequiresArtworkKey); + set => _internal[Models.Metadata.Driver.RequiresArtworkKey] = value; } [JsonIgnore] @@ -92,8 +92,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("unofficial", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("unofficial")] public bool? Unofficial { - get => _internal.ReadBool(Models.Internal.Driver.UnofficialKey); - set => _internal[Models.Internal.Driver.UnofficialKey] = value; + get => _internal.ReadBool(Models.Metadata.Driver.UnofficialKey); + set => _internal[Models.Metadata.Driver.UnofficialKey] = value; } [JsonIgnore] @@ -105,8 +105,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("nosoundhardware", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("nosoundhardware")] public bool? NoSoundHardware { - get => _internal.ReadBool(Models.Internal.Driver.NoSoundHardwareKey); - set => _internal[Models.Internal.Driver.NoSoundHardwareKey] = value; + get => _internal.ReadBool(Models.Metadata.Driver.NoSoundHardwareKey); + set => _internal[Models.Metadata.Driver.NoSoundHardwareKey] = value; } [JsonIgnore] @@ -118,8 +118,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("incomplete", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("incomplete")] public bool? Incomplete { - get => _internal.ReadBool(Models.Internal.Driver.IncompleteKey); - set => _internal[Models.Internal.Driver.IncompleteKey] = value; + get => _internal.ReadBool(Models.Metadata.Driver.IncompleteKey); + set => _internal[Models.Metadata.Driver.IncompleteKey] = value; } [JsonIgnore] @@ -134,7 +134,7 @@ namespace SabreTools.DatItems.Formats /// public Driver() { - _internal = new Models.Internal.Driver(); + _internal = new Models.Metadata.Driver(); Machine = new Machine(); ItemType = ItemType.Driver; @@ -156,7 +156,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Driver ?? new Models.Internal.Driver(), + _internal = this._internal?.Clone() as Models.Metadata.Driver ?? new Models.Metadata.Driver(), }; } diff --git a/SabreTools.DatItems/Formats/Extension.cs b/SabreTools.DatItems/Formats/Extension.cs index 80a67b61..9c1cd2ae 100644 --- a/SabreTools.DatItems/Formats/Extension.cs +++ b/SabreTools.DatItems/Formats/Extension.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Extension.NameKey); - set => _internal[Models.Internal.Extension.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Extension.NameKey); + set => _internal[Models.Metadata.Extension.NameKey] = value; } #endregion @@ -41,7 +41,7 @@ namespace SabreTools.DatItems.Formats /// public Extension() { - _internal = new Models.Internal.Extension(); + _internal = new Models.Metadata.Extension(); Machine = new Machine(); Name = string.Empty; @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Extension ?? new Models.Internal.Extension(), + _internal = this._internal?.Clone() as Models.Metadata.Extension ?? new Models.Metadata.Extension(), }; } diff --git a/SabreTools.DatItems/Formats/Feature.cs b/SabreTools.DatItems/Formats/Feature.cs index c02166c3..17b4eda7 100644 --- a/SabreTools.DatItems/Formats/Feature.cs +++ b/SabreTools.DatItems/Formats/Feature.cs @@ -21,8 +21,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public FeatureType Type { - get => _internal.ReadString(Models.Internal.Feature.FeatureTypeKey).AsFeatureType(); - set => _internal[Models.Internal.Feature.FeatureTypeKey] = value.FromFeatureType(); + get => _internal.ReadString(Models.Metadata.Feature.FeatureTypeKey).AsFeatureType(); + set => _internal[Models.Metadata.Feature.FeatureTypeKey] = value.FromFeatureType(); } [JsonIgnore] @@ -35,8 +35,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public FeatureStatus Status { - get => _internal.ReadString(Models.Internal.Feature.StatusKey).AsFeatureStatus(); - set => _internal[Models.Internal.Feature.StatusKey] = value.FromFeatureStatus(); + get => _internal.ReadString(Models.Metadata.Feature.StatusKey).AsFeatureStatus(); + set => _internal[Models.Metadata.Feature.StatusKey] = value.FromFeatureStatus(); } [JsonIgnore] @@ -49,8 +49,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public FeatureStatus Overall { - get => _internal.ReadString(Models.Internal.Feature.OverallKey).AsFeatureStatus(); - set => _internal[Models.Internal.Feature.OverallKey] = value.FromFeatureStatus(); + get => _internal.ReadString(Models.Metadata.Feature.OverallKey).AsFeatureStatus(); + set => _internal[Models.Metadata.Feature.OverallKey] = value.FromFeatureStatus(); } [JsonIgnore] @@ -65,7 +65,7 @@ namespace SabreTools.DatItems.Formats /// public Feature() { - _internal = new Models.Internal.Feature(); + _internal = new Models.Metadata.Feature(); Machine = new Machine(); ItemType = ItemType.Feature; @@ -87,7 +87,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Feature ?? new Models.Internal.Feature(), + _internal = this._internal?.Clone() as Models.Metadata.Feature ?? new Models.Metadata.Feature(), }; } diff --git a/SabreTools.DatItems/Formats/Info.cs b/SabreTools.DatItems/Formats/Info.cs index 59c421d8..33a929f2 100644 --- a/SabreTools.DatItems/Formats/Info.cs +++ b/SabreTools.DatItems/Formats/Info.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Info.NameKey); - set => _internal[Models.Internal.Info.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Info.NameKey); + set => _internal[Models.Metadata.Info.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value"), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.Info.ValueKey); - set => _internal[Models.Internal.Info.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.Info.ValueKey); + set => _internal[Models.Metadata.Info.ValueKey] = value; } #endregion @@ -51,7 +51,7 @@ namespace SabreTools.DatItems.Formats /// public Info() { - _internal = new Models.Internal.Info(); + _internal = new Models.Metadata.Info(); Machine = new Machine(); Name = string.Empty; @@ -74,7 +74,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Info ?? new Models.Internal.Info(), + _internal = this._internal?.Clone() as Models.Metadata.Info ?? new Models.Metadata.Info(), }; } diff --git a/SabreTools.DatItems/Formats/Input.cs b/SabreTools.DatItems/Formats/Input.cs index 8d094d17..b8d10022 100644 --- a/SabreTools.DatItems/Formats/Input.cs +++ b/SabreTools.DatItems/Formats/Input.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("service", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("service")] public bool? Service { - get => _internal.ReadBool(Models.Internal.Input.ServiceKey); - set => _internal[Models.Internal.Input.ServiceKey] = value; + get => _internal.ReadBool(Models.Metadata.Input.ServiceKey); + set => _internal[Models.Metadata.Input.ServiceKey] = value; } [JsonIgnore] @@ -33,8 +33,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tilt", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tilt")] public bool? Tilt { - get => _internal.ReadBool(Models.Internal.Input.TiltKey); - set => _internal[Models.Internal.Input.TiltKey] = value; + get => _internal.ReadBool(Models.Metadata.Input.TiltKey); + set => _internal[Models.Metadata.Input.TiltKey] = value; } [JsonIgnore] @@ -46,8 +46,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("players", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("players")] public long? Players { - get => _internal.ReadLong(Models.Internal.Input.PlayersKey); - set => _internal[Models.Internal.Input.PlayersKey] = value; + get => _internal.ReadLong(Models.Metadata.Input.PlayersKey); + set => _internal[Models.Metadata.Input.PlayersKey] = value; } [JsonIgnore] @@ -59,8 +59,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("coins", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("coins")] public long? Coins { - get => _internal.ReadLong(Models.Internal.Input.CoinsKey); - set => _internal[Models.Internal.Input.CoinsKey] = value; + get => _internal.ReadLong(Models.Metadata.Input.CoinsKey); + set => _internal[Models.Metadata.Input.CoinsKey] = value; } [JsonIgnore] @@ -72,8 +72,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("controls", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("controls")] public List? Controls { - get => _internal.Read(Models.Internal.Input.ControlKey)?.ToList(); - set => _internal[Models.Internal.Input.ControlKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Input.ControlKey)?.ToList(); + set => _internal[Models.Metadata.Input.ControlKey] = value?.ToArray(); } [JsonIgnore] @@ -88,7 +88,7 @@ namespace SabreTools.DatItems.Formats /// public Input() { - _internal = new Models.Internal.Input(); + _internal = new Models.Metadata.Input(); Machine = new Machine(); ItemType = ItemType.Input; @@ -110,7 +110,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Input ?? new Models.Internal.Input(), + _internal = this._internal?.Clone() as Models.Metadata.Input ?? new Models.Metadata.Input(), }; } diff --git a/SabreTools.DatItems/Formats/Instance.cs b/SabreTools.DatItems/Formats/Instance.cs index 96d73a5b..a19ed954 100644 --- a/SabreTools.DatItems/Formats/Instance.cs +++ b/SabreTools.DatItems/Formats/Instance.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Instance.NameKey); - set => _internal[Models.Internal.Instance.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Instance.NameKey); + set => _internal[Models.Metadata.Instance.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("briefname", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("briefname")] public string? BriefName { - get => _internal.ReadString(Models.Internal.Instance.BriefNameKey); - set => _internal[Models.Internal.Instance.BriefNameKey] = value; + get => _internal.ReadString(Models.Metadata.Instance.BriefNameKey); + set => _internal[Models.Metadata.Instance.BriefNameKey] = value; } #endregion @@ -51,7 +51,7 @@ namespace SabreTools.DatItems.Formats /// public Instance() { - _internal = new Models.Internal.Instance(); + _internal = new Models.Metadata.Instance(); Machine = new Machine(); Name = string.Empty; @@ -74,7 +74,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Instance ?? new Models.Internal.Instance(), + _internal = this._internal?.Clone() as Models.Metadata.Instance ?? new Models.Metadata.Instance(), }; } diff --git a/SabreTools.DatItems/Formats/Media.cs b/SabreTools.DatItems/Formats/Media.cs index fa74d5dd..b171da26 100644 --- a/SabreTools.DatItems/Formats/Media.cs +++ b/SabreTools.DatItems/Formats/Media.cs @@ -21,8 +21,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Media.NameKey); - set => _internal[Models.Internal.Media.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Media.NameKey); + set => _internal[Models.Metadata.Media.NameKey] = value; } /// @@ -31,8 +31,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")] public string? MD5 { - get => _internal.ReadString(Models.Internal.Media.MD5Key); - set => _internal[Models.Internal.Media.MD5Key] = TextHelper.NormalizeMD5(value); + get => _internal.ReadString(Models.Metadata.Media.MD5Key); + set => _internal[Models.Metadata.Media.MD5Key] = TextHelper.NormalizeMD5(value); } /// @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")] public string? SHA1 { - get => _internal.ReadString(Models.Internal.Media.SHA1Key); - set => _internal[Models.Internal.Media.SHA1Key] = TextHelper.NormalizeSHA1(value); + get => _internal.ReadString(Models.Metadata.Media.SHA1Key); + set => _internal[Models.Metadata.Media.SHA1Key] = TextHelper.NormalizeSHA1(value); } /// @@ -51,8 +51,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha256")] public string? SHA256 { - get => _internal.ReadString(Models.Internal.Media.SHA256Key); - set => _internal[Models.Internal.Media.SHA256Key] = TextHelper.NormalizeSHA256(value); + get => _internal.ReadString(Models.Metadata.Media.SHA256Key); + set => _internal[Models.Metadata.Media.SHA256Key] = TextHelper.NormalizeSHA256(value); } /// @@ -61,8 +61,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("spamsum")] public string? SpamSum { - get => _internal.ReadString(Models.Internal.Media.SpamSumKey); - set => _internal[Models.Internal.Media.SpamSumKey] = value; + get => _internal.ReadString(Models.Metadata.Media.SpamSumKey); + set => _internal[Models.Metadata.Media.SpamSumKey] = value; } #endregion @@ -84,7 +84,7 @@ namespace SabreTools.DatItems.Formats /// public Media() { - _internal = new Models.Internal.Media(); + _internal = new Models.Metadata.Media(); Machine = new Machine(); Name = string.Empty; @@ -98,7 +98,7 @@ namespace SabreTools.DatItems.Formats /// public Media(BaseFile baseFile) { - _internal = new Models.Internal.Media(); + _internal = new Models.Metadata.Media(); Machine = new Machine(); Name = baseFile.Filename; @@ -127,7 +127,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Media ?? new Models.Internal.Media(), + _internal = this._internal?.Clone() as Models.Metadata.Media ?? new Models.Metadata.Media(), }; } diff --git a/SabreTools.DatItems/Formats/Part.cs b/SabreTools.DatItems/Formats/Part.cs index 93072fe4..5bfe874c 100644 --- a/SabreTools.DatItems/Formats/Part.cs +++ b/SabreTools.DatItems/Formats/Part.cs @@ -18,22 +18,22 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Part.NameKey); - set => _internal[Models.Internal.Part.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Part.NameKey); + set => _internal[Models.Metadata.Part.NameKey] = value; } [JsonProperty("interface"), XmlElement("interface")] public string? Interface { - get => _internal.ReadString(Models.Internal.Part.InterfaceKey); - set => _internal[Models.Internal.Part.InterfaceKey] = value; + get => _internal.ReadString(Models.Metadata.Part.InterfaceKey); + set => _internal[Models.Metadata.Part.InterfaceKey] = value; } [JsonProperty("features", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("features")] public List? Features { - get => _internal.Read(Models.Internal.Part.FeatureKey)?.ToList(); - set => _internal[Models.Internal.Part.FeatureKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Part.FeatureKey)?.ToList(); + set => _internal[Models.Metadata.Part.FeatureKey] = value?.ToArray(); } [JsonIgnore] @@ -58,7 +58,7 @@ namespace SabreTools.DatItems.Formats /// public Part() { - _internal = new Models.Internal.Part(); + _internal = new Models.Metadata.Part(); Machine = new Machine(); Name = string.Empty; @@ -81,7 +81,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Part ?? new Models.Internal.Part(), + _internal = this._internal?.Clone() as Models.Metadata.Part ?? new Models.Metadata.Part(), }; } diff --git a/SabreTools.DatItems/Formats/PartFeature.cs b/SabreTools.DatItems/Formats/PartFeature.cs index 959c1dc6..d0150e3d 100644 --- a/SabreTools.DatItems/Formats/PartFeature.cs +++ b/SabreTools.DatItems/Formats/PartFeature.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Feature.NameKey); - set => _internal[Models.Internal.Feature.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Feature.NameKey); + set => _internal[Models.Metadata.Feature.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value"), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.Feature.ValueKey); - set => _internal[Models.Internal.Feature.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.Feature.ValueKey); + set => _internal[Models.Metadata.Feature.ValueKey] = value; } #endregion @@ -51,7 +51,7 @@ namespace SabreTools.DatItems.Formats /// public PartFeature() { - _internal = new Models.Internal.Feature(); + _internal = new Models.Metadata.Feature(); Machine = new Machine(); Name = string.Empty; @@ -74,7 +74,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Feature ?? new Models.Internal.Feature(), + _internal = this._internal?.Clone() as Models.Metadata.Feature ?? new Models.Metadata.Feature(), }; } diff --git a/SabreTools.DatItems/Formats/Port.cs b/SabreTools.DatItems/Formats/Port.cs index a8474cd9..3dc9c660 100644 --- a/SabreTools.DatItems/Formats/Port.cs +++ b/SabreTools.DatItems/Formats/Port.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.Port.TagKey); - set => _internal[Models.Internal.Port.TagKey] = value; + get => _internal.ReadString(Models.Metadata.Port.TagKey); + set => _internal[Models.Metadata.Port.TagKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("analogs", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("analogs")] public List? Analogs { - get => _internal.Read(Models.Internal.Port.AnalogKey)?.ToList(); - set => _internal[Models.Internal.Port.AnalogKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Port.AnalogKey)?.ToList(); + set => _internal[Models.Metadata.Port.AnalogKey] = value?.ToArray(); } [JsonIgnore] @@ -46,7 +46,7 @@ namespace SabreTools.DatItems.Formats /// public Port() { - _internal = new Models.Internal.Port(); + _internal = new Models.Metadata.Port(); Machine = new Machine(); ItemType = ItemType.Port; @@ -68,7 +68,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Port ?? new Models.Internal.Port(), + _internal = this._internal?.Clone() as Models.Metadata.Port ?? new Models.Metadata.Port(), }; } diff --git a/SabreTools.DatItems/Formats/RamOption.cs b/SabreTools.DatItems/Formats/RamOption.cs index e0922eec..e9e1b3ad 100644 --- a/SabreTools.DatItems/Formats/RamOption.cs +++ b/SabreTools.DatItems/Formats/RamOption.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.RamOption.NameKey); - set => _internal[Models.Internal.RamOption.NameKey] = value; + get => _internal.ReadString(Models.Metadata.RamOption.NameKey); + set => _internal[Models.Metadata.RamOption.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.RamOption.DefaultKey); - set => _internal[Models.Internal.RamOption.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.RamOption.DefaultKey); + set => _internal[Models.Metadata.RamOption.DefaultKey] = value; } [JsonIgnore] @@ -41,8 +41,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("content", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("content")] public string? Content { - get => _internal.ReadString(Models.Internal.RamOption.ContentKey); - set => _internal[Models.Internal.RamOption.ContentKey] = value; + get => _internal.ReadString(Models.Metadata.RamOption.ContentKey); + set => _internal[Models.Metadata.RamOption.ContentKey] = value; } #endregion @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats /// public RamOption() { - _internal = new Models.Internal.RamOption(); + _internal = new Models.Metadata.RamOption(); Machine = new Machine(); Name = string.Empty; @@ -87,7 +87,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.RamOption ?? new Models.Internal.RamOption(), + _internal = this._internal?.Clone() as Models.Metadata.RamOption ?? new Models.Metadata.RamOption(), }; } diff --git a/SabreTools.DatItems/Formats/Release.cs b/SabreTools.DatItems/Formats/Release.cs index 00115a0c..07516f13 100644 --- a/SabreTools.DatItems/Formats/Release.cs +++ b/SabreTools.DatItems/Formats/Release.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Release.NameKey); - set => _internal[Models.Internal.Release.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Release.NameKey); + set => _internal[Models.Metadata.Release.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("region")] public string? Region { - get => _internal.ReadString(Models.Internal.Release.RegionKey); - set => _internal[Models.Internal.Release.RegionKey] = value; + get => _internal.ReadString(Models.Metadata.Release.RegionKey); + set => _internal[Models.Metadata.Release.RegionKey] = value; } /// @@ -38,8 +38,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("language", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("language")] public string? Language { - get => _internal.ReadString(Models.Internal.Release.LanguageKey); - set => _internal[Models.Internal.Release.LanguageKey] = value; + get => _internal.ReadString(Models.Metadata.Release.LanguageKey); + set => _internal[Models.Metadata.Release.LanguageKey] = value; } /// @@ -48,8 +48,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("date")] public string? Date { - get => _internal.ReadString(Models.Internal.Release.DateKey); - set => _internal[Models.Internal.Release.DateKey] = value; + get => _internal.ReadString(Models.Metadata.Release.DateKey); + set => _internal[Models.Metadata.Release.DateKey] = value; } /// @@ -58,8 +58,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.Release.DefaultKey); - set => _internal[Models.Internal.Release.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.Release.DefaultKey); + set => _internal[Models.Metadata.Release.DefaultKey] = value; } [JsonIgnore] @@ -84,7 +84,7 @@ namespace SabreTools.DatItems.Formats /// public Release() { - _internal = new Models.Internal.Release(); + _internal = new Models.Metadata.Release(); Machine = new Machine(); Name = string.Empty; @@ -111,7 +111,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Release ?? new Models.Internal.Release(), + _internal = this._internal?.Clone() as Models.Metadata.Release ?? new Models.Metadata.Release(), }; } diff --git a/SabreTools.DatItems/Formats/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs index 265eb5ef..2ebfef95 100644 --- a/SabreTools.DatItems/Formats/Rom.cs +++ b/SabreTools.DatItems/Formats/Rom.cs @@ -24,8 +24,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Rom.NameKey); - set => _internal[Models.Internal.Rom.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.NameKey); + set => _internal[Models.Metadata.Rom.NameKey] = value; } /// @@ -34,8 +34,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("bios", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("bios")] public string? Bios { - get => _internal.ReadString(Models.Internal.Rom.BiosKey); - set => _internal[Models.Internal.Rom.BiosKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.BiosKey); + set => _internal[Models.Metadata.Rom.BiosKey] = value; } /// @@ -44,8 +44,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("size")] public long? Size { - get => _internal.ReadLong(Models.Internal.Rom.SizeKey); - set => _internal[Models.Internal.Rom.SizeKey] = value; + get => _internal.ReadLong(Models.Metadata.Rom.SizeKey); + set => _internal[Models.Metadata.Rom.SizeKey] = value; } [JsonIgnore] @@ -57,8 +57,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("crc", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("crc")] public string? CRC { - get => _internal.ReadString(Models.Internal.Rom.CRCKey); - set => _internal[Models.Internal.Rom.CRCKey] = TextHelper.NormalizeCRC32(value); + get => _internal.ReadString(Models.Metadata.Rom.CRCKey); + set => _internal[Models.Metadata.Rom.CRCKey] = TextHelper.NormalizeCRC32(value); } /// @@ -67,8 +67,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")] public string? MD5 { - get => _internal.ReadString(Models.Internal.Rom.MD5Key); - set => _internal[Models.Internal.Rom.MD5Key] = TextHelper.NormalizeMD5(value); + get => _internal.ReadString(Models.Metadata.Rom.MD5Key); + set => _internal[Models.Metadata.Rom.MD5Key] = TextHelper.NormalizeMD5(value); } /// @@ -77,8 +77,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")] public string? SHA1 { - get => _internal.ReadString(Models.Internal.Rom.SHA1Key); - set => _internal[Models.Internal.Rom.SHA1Key] = TextHelper.NormalizeSHA1(value); + get => _internal.ReadString(Models.Metadata.Rom.SHA1Key); + set => _internal[Models.Metadata.Rom.SHA1Key] = TextHelper.NormalizeSHA1(value); } /// @@ -87,8 +87,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha256")] public string? SHA256 { - get => _internal.ReadString(Models.Internal.Rom.SHA256Key); - set => _internal[Models.Internal.Rom.SHA256Key] = TextHelper.NormalizeSHA256(value); + get => _internal.ReadString(Models.Metadata.Rom.SHA256Key); + set => _internal[Models.Metadata.Rom.SHA256Key] = TextHelper.NormalizeSHA256(value); } /// @@ -97,8 +97,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha384", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha384")] public string? SHA384 { - get => _internal.ReadString(Models.Internal.Rom.SHA384Key); - set => _internal[Models.Internal.Rom.SHA384Key] = TextHelper.NormalizeSHA384(value); + get => _internal.ReadString(Models.Metadata.Rom.SHA384Key); + set => _internal[Models.Metadata.Rom.SHA384Key] = TextHelper.NormalizeSHA384(value); } /// @@ -107,8 +107,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("sha512", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha512")] public string? SHA512 { - get => _internal.ReadString(Models.Internal.Rom.SHA512Key); - set => _internal[Models.Internal.Rom.SHA512Key] = TextHelper.NormalizeSHA512(value); + get => _internal.ReadString(Models.Metadata.Rom.SHA512Key); + set => _internal[Models.Metadata.Rom.SHA512Key] = TextHelper.NormalizeSHA512(value); } /// @@ -117,8 +117,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("spamsum")] public string? SpamSum { - get => _internal.ReadString(Models.Internal.Rom.SpamSumKey); - set => _internal[Models.Internal.Rom.SpamSumKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.SpamSumKey); + set => _internal[Models.Metadata.Rom.SpamSumKey] = value; } /// @@ -127,8 +127,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("merge")] public string? MergeTag { - get => _internal.ReadString(Models.Internal.Rom.MergeKey); - set => _internal[Models.Internal.Rom.MergeKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.MergeKey); + set => _internal[Models.Metadata.Rom.MergeKey] = value; } /// @@ -137,8 +137,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("biregionos")] public string? Region { - get => _internal.ReadString(Models.Internal.Rom.RegionKey); - set => _internal[Models.Internal.Rom.RegionKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.RegionKey); + set => _internal[Models.Metadata.Rom.RegionKey] = value; } /// @@ -147,8 +147,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("offset", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("offset")] public string? Offset { - get => _internal.ReadString(Models.Internal.Rom.OffsetKey); - set => _internal[Models.Internal.Rom.OffsetKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.OffsetKey); + set => _internal[Models.Metadata.Rom.OffsetKey] = value; } /// @@ -157,8 +157,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("date")] public string? Date { - get => _internal.ReadString(Models.Internal.Rom.DateKey); - set => _internal[Models.Internal.Rom.DateKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.DateKey); + set => _internal[Models.Metadata.Rom.DateKey] = value; } /// @@ -168,8 +168,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public ItemStatus ItemStatus { - get => _internal.ReadString(Models.Internal.Rom.StatusKey).AsItemStatus(); - set => _internal[Models.Internal.Rom.StatusKey] = value.FromItemStatus(yesno: false); + get => _internal.ReadString(Models.Metadata.Rom.StatusKey).AsItemStatus(); + set => _internal[Models.Metadata.Rom.StatusKey] = value.FromItemStatus(yesno: false); } [JsonIgnore] @@ -181,8 +181,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("optional")] public bool? Optional { - get => _internal.ReadBool(Models.Internal.Rom.OptionalKey); - set => _internal[Models.Internal.Rom.OptionalKey] = value; + get => _internal.ReadBool(Models.Metadata.Rom.OptionalKey); + set => _internal[Models.Metadata.Rom.OptionalKey] = value; } [JsonIgnore] @@ -194,8 +194,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("inverted")] public bool? Inverted { - get => _internal.ReadBool(Models.Internal.Rom.InvertedKey); - set => _internal[Models.Internal.Rom.InvertedKey] = value; + get => _internal.ReadBool(Models.Metadata.Rom.InvertedKey); + set => _internal[Models.Metadata.Rom.InvertedKey] = value; } [JsonIgnore] @@ -211,8 +211,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("ado_source", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ado_source")] public string? ArchiveDotOrgSource { - get => _internal.ReadString(Models.Internal.Rom.SourceKey); - set => _internal[Models.Internal.Rom.SourceKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.SourceKey); + set => _internal[Models.Metadata.Rom.SourceKey] = value; } /// @@ -221,8 +221,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("ado_format", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ado_format")] public string? ArchiveDotOrgFormat { - get => _internal.ReadString(Models.Internal.Rom.FormatKey); - set => _internal[Models.Internal.Rom.FormatKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.FormatKey); + set => _internal[Models.Metadata.Rom.FormatKey] = value; } /// @@ -231,8 +231,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("original_filename", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("original_filename")] public string? OriginalFilename { - get => _internal.ReadString(Models.Internal.Rom.OriginalKey); - set => _internal[Models.Internal.Rom.OriginalKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.OriginalKey); + set => _internal[Models.Metadata.Rom.OriginalKey] = value; } /// @@ -244,8 +244,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("rotation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("rotation")] public string? Rotation { - get => _internal.ReadString(Models.Internal.Rom.RotationKey); - set => _internal[Models.Internal.Rom.RotationKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.RotationKey); + set => _internal[Models.Metadata.Rom.RotationKey] = value; } /// @@ -254,8 +254,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("summation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("summation")] public string? Summation { - get => _internal.ReadString(Models.Internal.Rom.SummationKey); - set => _internal[Models.Internal.Rom.SummationKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.SummationKey); + set => _internal[Models.Metadata.Rom.SummationKey] = value; } #endregion @@ -268,8 +268,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("alt_internalname", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("alt_internalname")] public string? AltName { - get => _internal.ReadString(Models.Internal.Rom.AltRomnameKey); - set => _internal[Models.Internal.Rom.AltRomnameKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.AltRomnameKey); + set => _internal[Models.Metadata.Rom.AltRomnameKey] = value; } /// @@ -278,8 +278,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("alt_title", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("alt_title")] public string? AltTitle { - get => _internal.ReadString(Models.Internal.Rom.AltTitleKey); - set => _internal[Models.Internal.Rom.AltTitleKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.AltTitleKey); + set => _internal[Models.Metadata.Rom.AltTitleKey] = value; } #endregion @@ -292,8 +292,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("mia", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mia")] public bool? MIA { - get => _internal.ReadBool(Models.Internal.Rom.MIAKey); - set => _internal[Models.Internal.Rom.MIAKey] = value; + get => _internal.ReadBool(Models.Metadata.Rom.MIAKey); + set => _internal[Models.Metadata.Rom.MIAKey] = value; } [JsonIgnore] @@ -324,8 +324,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public OpenMSXSubType OpenMSXSubType { - get => _internal.ReadString(Models.Internal.Rom.OpenMSXMediaType).AsOpenMSXSubType(); - set => _internal[Models.Internal.Rom.OpenMSXMediaType] = value.FromOpenMSXSubType(); + get => _internal.ReadString(Models.Metadata.Rom.OpenMSXMediaType).AsOpenMSXSubType(); + set => _internal[Models.Metadata.Rom.OpenMSXMediaType] = value.FromOpenMSXSubType(); } [JsonIgnore] @@ -338,8 +338,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("openmsx_type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("openmsx_type")] public string? OpenMSXType { - get => _internal.ReadString(Models.Internal.Rom.OpenMSXType); - set => _internal[Models.Internal.Rom.OpenMSXType] = value; + get => _internal.ReadString(Models.Metadata.Rom.OpenMSXType); + set => _internal[Models.Metadata.Rom.OpenMSXType] = value; } /// @@ -348,8 +348,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("remark", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("remark")] public string? Remark { - get => _internal.ReadString(Models.Internal.Rom.RemarkKey); - set => _internal[Models.Internal.Rom.RemarkKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.RemarkKey); + set => _internal[Models.Metadata.Rom.RemarkKey] = value; } /// @@ -398,8 +398,8 @@ namespace SabreTools.DatItems.Formats [JsonConverter(typeof(StringEnumConverter))] public LoadFlag LoadFlag { - get => _internal.ReadString(Models.Internal.Rom.LoadFlagKey).AsLoadFlag(); - set => _internal[Models.Internal.Rom.LoadFlagKey] = value.FromLoadFlag(); + get => _internal.ReadString(Models.Metadata.Rom.LoadFlagKey).AsLoadFlag(); + set => _internal[Models.Metadata.Rom.LoadFlagKey] = value.FromLoadFlag(); } [JsonIgnore] @@ -433,8 +433,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.Rom.ValueKey); - set => _internal[Models.Internal.Rom.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.Rom.ValueKey); + set => _internal[Models.Metadata.Rom.ValueKey] = value; } #endregion @@ -458,7 +458,7 @@ namespace SabreTools.DatItems.Formats /// public Rom() { - _internal = new Models.Internal.Rom(); + _internal = new Models.Metadata.Rom(); Machine = new Machine(); Name = null; @@ -475,7 +475,7 @@ namespace SabreTools.DatItems.Formats /// public Rom(string name, string machineName) { - _internal = new Models.Internal.Rom(); + _internal = new Models.Metadata.Rom(); Name = name; ItemType = ItemType.Rom; Size = null; @@ -494,7 +494,7 @@ namespace SabreTools.DatItems.Formats /// public Rom(BaseFile baseFile) { - _internal = new Models.Internal.Rom(); + _internal = new Models.Metadata.Rom(); Machine = new Machine(); Name = baseFile.Filename; @@ -516,9 +516,9 @@ namespace SabreTools.DatItems.Formats /// /// Create a Rom object from the internal model /// - public Rom(Models.Internal.Rom? rom) + public Rom(Models.Metadata.Rom? rom) { - _internal = rom ?? new Models.Internal.Rom(); + _internal = rom ?? new Models.Metadata.Rom(); ItemType = ItemType.Rom; DupeType = 0x00; @@ -542,7 +542,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Rom ?? new Models.Internal.Rom(), + _internal = this._internal?.Clone() as Models.Metadata.Rom ?? new Models.Metadata.Rom(), }; } diff --git a/SabreTools.DatItems/Formats/Sample.cs b/SabreTools.DatItems/Formats/Sample.cs index 2fd22cee..87cfb118 100644 --- a/SabreTools.DatItems/Formats/Sample.cs +++ b/SabreTools.DatItems/Formats/Sample.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Sample.NameKey); - set => _internal[Models.Internal.Sample.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Sample.NameKey); + set => _internal[Models.Metadata.Sample.NameKey] = value; } #endregion @@ -41,7 +41,7 @@ namespace SabreTools.DatItems.Formats /// public Sample() { - _internal = new Models.Internal.Sample(); + _internal = new Models.Metadata.Sample(); Machine = new Machine(); Name = string.Empty; @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Sample ?? new Models.Internal.Sample(), + _internal = this._internal?.Clone() as Models.Metadata.Sample ?? new Models.Metadata.Sample(), }; } diff --git a/SabreTools.DatItems/Formats/SharedFeature.cs b/SabreTools.DatItems/Formats/SharedFeature.cs index 30bc07e1..9468bb8d 100644 --- a/SabreTools.DatItems/Formats/SharedFeature.cs +++ b/SabreTools.DatItems/Formats/SharedFeature.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.SharedFeat.NameKey); - set => _internal[Models.Internal.SharedFeat.NameKey] = value; + get => _internal.ReadString(Models.Metadata.SharedFeat.NameKey); + set => _internal[Models.Metadata.SharedFeat.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("value"), XmlElement("value")] public string? Value { - get => _internal.ReadString(Models.Internal.SharedFeat.ValueKey); - set => _internal[Models.Internal.SharedFeat.ValueKey] = value; + get => _internal.ReadString(Models.Metadata.SharedFeat.ValueKey); + set => _internal[Models.Metadata.SharedFeat.ValueKey] = value; } #endregion @@ -51,7 +51,7 @@ namespace SabreTools.DatItems.Formats /// public SharedFeature() { - _internal = new Models.Internal.SharedFeat(); + _internal = new Models.Metadata.SharedFeat(); Machine = new Machine(); Name = string.Empty; @@ -74,7 +74,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.SharedFeat ?? new Models.Internal.SharedFeat(), + _internal = this._internal?.Clone() as Models.Metadata.SharedFeat ?? new Models.Metadata.SharedFeat(), }; } diff --git a/SabreTools.DatItems/Formats/Slot.cs b/SabreTools.DatItems/Formats/Slot.cs index 296c67a7..679b5418 100644 --- a/SabreTools.DatItems/Formats/Slot.cs +++ b/SabreTools.DatItems/Formats/Slot.cs @@ -20,8 +20,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.Slot.NameKey); - set => _internal[Models.Internal.Slot.NameKey] = value; + get => _internal.ReadString(Models.Metadata.Slot.NameKey); + set => _internal[Models.Metadata.Slot.NameKey] = value; } /// @@ -30,8 +30,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("slotoptions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("slotoptions")] public List? SlotOptions { - get => _internal.Read(Models.Internal.Slot.SlotOptionKey)?.ToList(); - set => _internal[Models.Internal.Slot.SlotOptionKey] = value?.ToArray(); + get => _internal.Read(Models.Metadata.Slot.SlotOptionKey)?.ToList(); + set => _internal[Models.Metadata.Slot.SlotOptionKey] = value?.ToArray(); } [JsonIgnore] @@ -56,7 +56,7 @@ namespace SabreTools.DatItems.Formats /// public Slot() { - _internal = new Models.Internal.Slot(); + _internal = new Models.Metadata.Slot(); Machine = new Machine(); Name = string.Empty; @@ -79,7 +79,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Slot ?? new Models.Internal.Slot(), + _internal = this._internal?.Clone() as Models.Metadata.Slot ?? new Models.Metadata.Slot(), }; } diff --git a/SabreTools.DatItems/Formats/SlotOption.cs b/SabreTools.DatItems/Formats/SlotOption.cs index 1bfcf5c8..f7cdabf3 100644 --- a/SabreTools.DatItems/Formats/SlotOption.cs +++ b/SabreTools.DatItems/Formats/SlotOption.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("name"), XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.SlotOption.NameKey); - set => _internal[Models.Internal.SlotOption.NameKey] = value; + get => _internal.ReadString(Models.Metadata.SlotOption.NameKey); + set => _internal[Models.Metadata.SlotOption.NameKey] = value; } /// @@ -28,8 +28,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("devname"), XmlElement("devname")] public string? DeviceName { - get => _internal.ReadString(Models.Internal.SlotOption.DevNameKey); - set => _internal[Models.Internal.SlotOption.DevNameKey] = value; + get => _internal.ReadString(Models.Metadata.SlotOption.DevNameKey); + set => _internal[Models.Metadata.SlotOption.DevNameKey] = value; } /// @@ -38,8 +38,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")] public bool? Default { - get => _internal.ReadBool(Models.Internal.SlotOption.DefaultKey); - set => _internal[Models.Internal.SlotOption.DefaultKey] = value; + get => _internal.ReadBool(Models.Metadata.SlotOption.DefaultKey); + set => _internal[Models.Metadata.SlotOption.DefaultKey] = value; } [JsonIgnore] @@ -64,7 +64,7 @@ namespace SabreTools.DatItems.Formats /// public SlotOption() { - _internal = new Models.Internal.SlotOption(); + _internal = new Models.Metadata.SlotOption(); Machine = new Machine(); Name = string.Empty; @@ -87,7 +87,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.SlotOption ?? new Models.Internal.SlotOption(), + _internal = this._internal?.Clone() as Models.Metadata.SlotOption ?? new Models.Metadata.SlotOption(), }; } diff --git a/SabreTools.DatItems/Formats/SoftwareList.cs b/SabreTools.DatItems/Formats/SoftwareList.cs index d6305a43..03192b84 100644 --- a/SabreTools.DatItems/Formats/SoftwareList.cs +++ b/SabreTools.DatItems/Formats/SoftwareList.cs @@ -24,8 +24,8 @@ namespace SabreTools.DatItems.Formats [XmlElement("tag")] public string? Tag { - get => _internal.ReadString(Models.Internal.SoftwareList.TagKey); - set => _internal[Models.Internal.SoftwareList.TagKey] = value; + get => _internal.ReadString(Models.Metadata.SoftwareList.TagKey); + set => _internal[Models.Metadata.SoftwareList.TagKey] = value; } /// @@ -35,8 +35,8 @@ namespace SabreTools.DatItems.Formats [XmlElement("name")] public string? Name { - get => _internal.ReadString(Models.Internal.SoftwareList.NameKey); - set => _internal[Models.Internal.SoftwareList.NameKey] = value; + get => _internal.ReadString(Models.Metadata.SoftwareList.NameKey); + set => _internal[Models.Metadata.SoftwareList.NameKey] = value; } /// @@ -47,8 +47,8 @@ namespace SabreTools.DatItems.Formats [XmlElement("status")] public SoftwareListStatus Status { - get => _internal.ReadString(Models.Internal.SoftwareList.StatusKey).AsSoftwareListStatus(); - set => _internal[Models.Internal.SoftwareList.StatusKey] = value.FromSoftwareListStatus(); + get => _internal.ReadString(Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus(); + set => _internal[Models.Metadata.SoftwareList.StatusKey] = value.FromSoftwareListStatus(); } [JsonIgnore] @@ -61,8 +61,8 @@ namespace SabreTools.DatItems.Formats [XmlElement("filter")] public string? Filter { - get => _internal.ReadString(Models.Internal.SoftwareList.FilterKey); - set => _internal[Models.Internal.SoftwareList.FilterKey] = value; + get => _internal.ReadString(Models.Metadata.SoftwareList.FilterKey); + set => _internal[Models.Metadata.SoftwareList.FilterKey] = value; } #endregion @@ -84,7 +84,7 @@ namespace SabreTools.DatItems.Formats /// public SoftwareList() { - _internal = new Models.Internal.SoftwareList(); + _internal = new Models.Metadata.SoftwareList(); Machine = new Machine(); Name = string.Empty; @@ -106,7 +106,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.SoftwareList ?? new Models.Internal.SoftwareList(), + _internal = this._internal?.Clone() as Models.Metadata.SoftwareList ?? new Models.Metadata.SoftwareList(), }; } diff --git a/SabreTools.DatItems/Formats/Sound.cs b/SabreTools.DatItems/Formats/Sound.cs index c020a192..f741ffbd 100644 --- a/SabreTools.DatItems/Formats/Sound.cs +++ b/SabreTools.DatItems/Formats/Sound.cs @@ -18,8 +18,8 @@ namespace SabreTools.DatItems.Formats [JsonProperty("channels", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("channels")] public long? Channels { - get => _internal.ReadLong(Models.Internal.Sound.ChannelsKey); - set => _internal[Models.Internal.Sound.ChannelsKey] = value; + get => _internal.ReadLong(Models.Metadata.Sound.ChannelsKey); + set => _internal[Models.Metadata.Sound.ChannelsKey] = value; } [JsonIgnore] @@ -34,7 +34,7 @@ namespace SabreTools.DatItems.Formats /// public Sound() { - _internal = new Models.Internal.Sound(); + _internal = new Models.Metadata.Sound(); Machine = new Machine(); ItemType = ItemType.Sound; @@ -56,7 +56,7 @@ namespace SabreTools.DatItems.Formats Source = this.Source?.Clone() as Source, Remove = this.Remove, - _internal = this._internal?.Clone() as Models.Internal.Sound ?? new Models.Internal.Sound(), + _internal = this._internal?.Clone() as Models.Metadata.Sound ?? new Models.Metadata.Sound(), }; } diff --git a/SabreTools.DatItems/Machine.cs b/SabreTools.DatItems/Machine.cs index 8c92817e..6ddeb40f 100644 --- a/SabreTools.DatItems/Machine.cs +++ b/SabreTools.DatItems/Machine.cs @@ -24,8 +24,8 @@ namespace SabreTools.DatItems [XmlElement("name")] public string? Name { - get => _machine.ReadString(Models.Internal.Machine.NameKey); - set => _machine[Models.Internal.Machine.NameKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.NameKey); + set => _machine[Models.Metadata.Machine.NameKey] = value; } /// @@ -36,8 +36,8 @@ namespace SabreTools.DatItems [XmlElement("comment")] public string? Comment { - get => _machine.ReadString(Models.Internal.Machine.CommentKey); - set => _machine[Models.Internal.Machine.CommentKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.CommentKey); + set => _machine[Models.Metadata.Machine.CommentKey] = value; } /// @@ -47,8 +47,8 @@ namespace SabreTools.DatItems [XmlElement("description")] public string? Description { - get => _machine.ReadString(Models.Internal.Machine.DescriptionKey); - set => _machine[Models.Internal.Machine.DescriptionKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.DescriptionKey); + set => _machine[Models.Metadata.Machine.DescriptionKey] = value; } /// @@ -58,8 +58,8 @@ namespace SabreTools.DatItems [XmlElement("year")] public string? Year { - get => _machine.ReadString(Models.Internal.Machine.YearKey); - set => _machine[Models.Internal.Machine.YearKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.YearKey); + set => _machine[Models.Metadata.Machine.YearKey] = value; } /// @@ -69,8 +69,8 @@ namespace SabreTools.DatItems [XmlElement("manufacturer")] public string? Manufacturer { - get => _machine.ReadString(Models.Internal.Machine.ManufacturerKey); - set => _machine[Models.Internal.Machine.ManufacturerKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.ManufacturerKey); + set => _machine[Models.Metadata.Machine.ManufacturerKey] = value; } /// @@ -80,8 +80,8 @@ namespace SabreTools.DatItems [XmlElement("publisher")] public string? Publisher { - get => _machine.ReadString(Models.Internal.Machine.PublisherKey); - set => _machine[Models.Internal.Machine.PublisherKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.PublisherKey); + set => _machine[Models.Metadata.Machine.PublisherKey] = value; } /// @@ -91,8 +91,8 @@ namespace SabreTools.DatItems [XmlElement("category")] public string? Category { - get => _machine.ReadString(Models.Internal.Machine.CategoryKey); - set => _machine[Models.Internal.Machine.CategoryKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.CategoryKey); + set => _machine[Models.Metadata.Machine.CategoryKey] = value; } /// @@ -102,8 +102,8 @@ namespace SabreTools.DatItems [XmlElement("romof")] public string? RomOf { - get => _machine.ReadString(Models.Internal.Machine.RomOfKey); - set => _machine[Models.Internal.Machine.RomOfKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.RomOfKey); + set => _machine[Models.Metadata.Machine.RomOfKey] = value; } /// @@ -113,8 +113,8 @@ namespace SabreTools.DatItems [XmlElement("cloneof")] public string? CloneOf { - get => _machine.ReadString(Models.Internal.Machine.CloneOfKey); - set => _machine[Models.Internal.Machine.CloneOfKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.CloneOfKey); + set => _machine[Models.Metadata.Machine.CloneOfKey] = value; } /// @@ -124,8 +124,8 @@ namespace SabreTools.DatItems [XmlElement("sampleof")] public string? SampleOf { - get => _machine.ReadString(Models.Internal.Machine.SampleOfKey); - set => _machine[Models.Internal.Machine.SampleOfKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.SampleOfKey); + set => _machine[Models.Metadata.Machine.SampleOfKey] = value; } /// @@ -138,9 +138,9 @@ namespace SabreTools.DatItems { get { - bool? isBios = _machine.ReadBool(Models.Internal.Machine.IsBiosKey); - bool? isDevice = _machine.ReadBool(Models.Internal.Machine.IsDeviceKey); - bool? isMechanical = _machine.ReadBool(Models.Internal.Machine.IsMechanicalKey); + bool? isBios = _machine.ReadBool(Models.Metadata.Machine.IsBiosKey); + bool? isDevice = _machine.ReadBool(Models.Metadata.Machine.IsDeviceKey); + bool? isMechanical = _machine.ReadBool(Models.Metadata.Machine.IsMechanicalKey); MachineType machineType = MachineType.None; if (isBios == true) @@ -155,11 +155,11 @@ namespace SabreTools.DatItems set { if (value.HasFlag(MachineType.Bios)) - _machine[Models.Internal.Machine.IsBiosKey] = "yes"; + _machine[Models.Metadata.Machine.IsBiosKey] = "yes"; if (value.HasFlag(MachineType.Device)) - _machine[Models.Internal.Machine.IsDeviceKey] = "yes"; + _machine[Models.Metadata.Machine.IsDeviceKey] = "yes"; if (value.HasFlag(MachineType.Mechanical)) - _machine[Models.Internal.Machine.IsMechanicalKey] = "yes"; + _machine[Models.Metadata.Machine.IsMechanicalKey] = "yes"; } } @@ -178,8 +178,8 @@ namespace SabreTools.DatItems [XmlElement("players")] public string? Players { - get => _machine.ReadString(Models.Internal.Machine.PlayersKey); - set => _machine[Models.Internal.Machine.PlayersKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.PlayersKey); + set => _machine[Models.Metadata.Machine.PlayersKey] = value; } /// @@ -189,8 +189,8 @@ namespace SabreTools.DatItems [XmlElement("rotation")] public string? Rotation { - get => _machine.ReadString(Models.Internal.Machine.RotationKey); - set => _machine[Models.Internal.Machine.RotationKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.RotationKey); + set => _machine[Models.Metadata.Machine.RotationKey] = value; } /// @@ -200,8 +200,8 @@ namespace SabreTools.DatItems [XmlElement("control")] public string? Control { - get => _machine.ReadString(Models.Internal.Machine.ControlKey); - set => _machine[Models.Internal.Machine.ControlKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.ControlKey); + set => _machine[Models.Metadata.Machine.ControlKey] = value; } /// @@ -211,8 +211,8 @@ namespace SabreTools.DatItems [XmlElement("status")] public string? Status { - get => _machine.ReadString(Models.Internal.Machine.StatusKey); - set => _machine[Models.Internal.Machine.StatusKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.StatusKey); + set => _machine[Models.Metadata.Machine.StatusKey] = value; } /// @@ -222,8 +222,8 @@ namespace SabreTools.DatItems [XmlElement("displaycount")] public string? DisplayCount { - get => _machine.ReadString(Models.Internal.Machine.DisplayCountKey); - set => _machine[Models.Internal.Machine.DisplayCountKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.DisplayCountKey); + set => _machine[Models.Metadata.Machine.DisplayCountKey] = value; } /// @@ -233,8 +233,8 @@ namespace SabreTools.DatItems [XmlElement("displaytype")] public string? DisplayType { - get => _machine.ReadString(Models.Internal.Machine.DisplayTypeKey); - set => _machine[Models.Internal.Machine.DisplayTypeKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.DisplayTypeKey); + set => _machine[Models.Metadata.Machine.DisplayTypeKey] = value; } /// @@ -244,8 +244,8 @@ namespace SabreTools.DatItems [XmlElement("buttons")] public string? Buttons { - get => _machine.ReadString(Models.Internal.Machine.ButtonsKey); - set => _machine[Models.Internal.Machine.ButtonsKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.ButtonsKey); + set => _machine[Models.Metadata.Machine.ButtonsKey] = value; } #endregion @@ -259,8 +259,8 @@ namespace SabreTools.DatItems [XmlElement("history")] public string? History { - get => _machine.ReadString(Models.Internal.Machine.HistoryKey); - set => _machine[Models.Internal.Machine.HistoryKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.HistoryKey); + set => _machine[Models.Metadata.Machine.HistoryKey] = value; } /// @@ -271,8 +271,8 @@ namespace SabreTools.DatItems [XmlElement("sourcefile")] public string? SourceFile { - get => _machine.ReadString(Models.Internal.Machine.SourceFileKey); - set => _machine[Models.Internal.Machine.SourceFileKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.SourceFileKey); + set => _machine[Models.Metadata.Machine.SourceFileKey] = value; } /// @@ -283,8 +283,8 @@ namespace SabreTools.DatItems [XmlElement("runnable")] public Runnable Runnable { - get => _machine.ReadString(Models.Internal.Machine.RunnableKey).AsRunnable(); - set => _machine[Models.Internal.Machine.RunnableKey] = value.FromRunnable(); + get => _machine.ReadString(Models.Metadata.Machine.RunnableKey).AsRunnable(); + set => _machine[Models.Metadata.Machine.RunnableKey] = value.FromRunnable(); } [JsonIgnore] @@ -301,8 +301,8 @@ namespace SabreTools.DatItems [XmlElement("board")] public string? Board { - get => _machine.ReadString(Models.Internal.Machine.BoardKey); - set => _machine[Models.Internal.Machine.BoardKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.BoardKey); + set => _machine[Models.Metadata.Machine.BoardKey] = value; } /// @@ -312,8 +312,8 @@ namespace SabreTools.DatItems [XmlElement("rebuildto")] public string? RebuildTo { - get => _machine.ReadString(Models.Internal.Machine.RebuildToKey); - set => _machine[Models.Internal.Machine.RebuildToKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.RebuildToKey); + set => _machine[Models.Metadata.Machine.RebuildToKey] = value; } /// @@ -323,8 +323,8 @@ namespace SabreTools.DatItems [XmlElement("nointroid")] public string? NoIntroId { - get => _machine.ReadString(Models.Internal.Machine.IdKey); - set => _machine[Models.Internal.Machine.IdKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.IdKey); + set => _machine[Models.Metadata.Machine.IdKey] = value; } /// @@ -334,8 +334,8 @@ namespace SabreTools.DatItems [XmlElement("nointrocloneofid")] public string? NoIntroCloneOfId { - get => _machine.ReadString(Models.Internal.Machine.CloneOfIdKey); - set => _machine[Models.Internal.Machine.CloneOfIdKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.CloneOfIdKey); + set => _machine[Models.Metadata.Machine.CloneOfIdKey] = value; } #endregion @@ -420,8 +420,8 @@ namespace SabreTools.DatItems [XmlElement("genmsxid")] public string? GenMSXID { - get => _machine.ReadString(Models.Internal.Machine.GenMSXIDKey); - set => _machine[Models.Internal.Machine.GenMSXIDKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.GenMSXIDKey); + set => _machine[Models.Metadata.Machine.GenMSXIDKey] = value; } /// @@ -431,8 +431,8 @@ namespace SabreTools.DatItems [XmlElement("system")] public string? System { - get => _machine.ReadString(Models.Internal.Machine.SystemKey); - set => _machine[Models.Internal.Machine.SystemKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.SystemKey); + set => _machine[Models.Metadata.Machine.SystemKey] = value; } /// @@ -442,8 +442,8 @@ namespace SabreTools.DatItems [XmlElement("country")] public string? Country { - get => _machine.ReadString(Models.Internal.Machine.CountryKey); - set => _machine[Models.Internal.Machine.CountryKey] = value; + get => _machine.ReadString(Models.Metadata.Machine.CountryKey); + set => _machine[Models.Metadata.Machine.CountryKey] = value; } #endregion @@ -457,8 +457,8 @@ namespace SabreTools.DatItems [XmlElement("supported")] public Supported Supported { - get => _machine.ReadString(Models.Internal.Machine.SupportedKey).AsSupported(); - set => _machine[Models.Internal.Machine.SupportedKey] = value.FromSupported(verbose: true); + get => _machine.ReadString(Models.Metadata.Machine.SupportedKey).AsSupported(); + set => _machine[Models.Metadata.Machine.SupportedKey] = value.FromSupported(verbose: true); } [JsonIgnore] @@ -470,7 +470,7 @@ namespace SabreTools.DatItems /// Internal Machine model /// [JsonIgnore] - private Models.Internal.Machine _machine = new(); + private Models.Metadata.Machine _machine = new(); #endregion // Fields @@ -508,7 +508,7 @@ namespace SabreTools.DatItems { #region Common - _machine = this._machine.Clone() as Models.Internal.Machine ?? new Models.Internal.Machine(), + _machine = this._machine.Clone() as Models.Metadata.Machine ?? new Models.Metadata.Machine(), #endregion diff --git a/SabreTools.DatItems/SabreTools.DatItems.csproj b/SabreTools.DatItems/SabreTools.DatItems.csproj index 63c32082..11173e5e 100644 --- a/SabreTools.DatItems/SabreTools.DatItems.csproj +++ b/SabreTools.DatItems/SabreTools.DatItems.csproj @@ -10,11 +10,11 @@ - - + + diff --git a/SabreTools.Filter/FieldManipulator.cs b/SabreTools.Filter/FieldManipulator.cs index 585e81e2..c02f2ab7 100644 --- a/SabreTools.Filter/FieldManipulator.cs +++ b/SabreTools.Filter/FieldManipulator.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Text.RegularExpressions; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Filter { diff --git a/SabreTools.Filter/FilterObject.cs b/SabreTools.Filter/FilterObject.cs index 1679937f..d3faa905 100644 --- a/SabreTools.Filter/FilterObject.cs +++ b/SabreTools.Filter/FilterObject.cs @@ -1,7 +1,7 @@ using System; using System.Text.RegularExpressions; using SabreTools.Core.Tools; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Filter { diff --git a/SabreTools.Filter/FilterParser.cs b/SabreTools.Filter/FilterParser.cs index 0f8c2c5f..9c94562a 100644 --- a/SabreTools.Filter/FilterParser.cs +++ b/SabreTools.Filter/FilterParser.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Filter { diff --git a/SabreTools.Filter/FilterRunner.cs b/SabreTools.Filter/FilterRunner.cs index 5a62aef1..06997ce6 100644 --- a/SabreTools.Filter/FilterRunner.cs +++ b/SabreTools.Filter/FilterRunner.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Filter { diff --git a/SabreTools.Filter/SabreTools.Filter.csproj b/SabreTools.Filter/SabreTools.Filter.csproj index a2a55b9d..b302ca4d 100644 --- a/SabreTools.Filter/SabreTools.Filter.csproj +++ b/SabreTools.Filter/SabreTools.Filter.csproj @@ -7,7 +7,10 @@ - + + + + diff --git a/SabreTools.Filter/TypeHelper.cs b/SabreTools.Filter/TypeHelper.cs index 6f0ce016..6b608d03 100644 --- a/SabreTools.Filter/TypeHelper.cs +++ b/SabreTools.Filter/TypeHelper.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using System.Xml.Serialization; using SabreTools.Models; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Filter { diff --git a/SabreTools.Filtering/SabreTools.Filtering.csproj b/SabreTools.Filtering/SabreTools.Filtering.csproj index c80acf89..cea362c1 100644 --- a/SabreTools.Filtering/SabreTools.Filtering.csproj +++ b/SabreTools.Filtering/SabreTools.Filtering.csproj @@ -8,6 +8,7 @@ + diff --git a/SabreTools.Models/ArchiveDotOrg/File.cs b/SabreTools.Models/ArchiveDotOrg/File.cs deleted file mode 100644 index 465dd9c6..00000000 --- a/SabreTools.Models/ArchiveDotOrg/File.cs +++ /dev/null @@ -1,217 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.ArchiveDotOrg -{ - [XmlRoot("file")] - public class File - { - [XmlAttribute("name")] - public string? Name { get; set; } - - /// Is this a set of defined values? - [XmlAttribute("source")] - public string? Source { get; set; } - - [XmlElement("btih")] - public string? BitTorrentMagnetHash { get; set; } - - [XmlElement("mtime")] - public string? LastModifiedTime { get; set; } - - [XmlElement("size")] - public string? Size { get; set; } - - [XmlElement("md5")] - public string? MD5 { get; set; } - - [XmlElement("crc32")] - public string? CRC32 { get; set; } - - [XmlElement("sha1")] - public string? SHA1 { get; set; } - - [XmlElement("filecount")] - public string? FileCount { get; set; } - - /// Is this a set of defined values? - [XmlElement("format")] - public string? Format { get; set; } - - [XmlElement("original")] - public string? Original { get; set; } - - /// Is this a set of defined values? - [XmlElement("summation")] - public string? Summation { get; set; } - - [XmlElement("matrix_number")] - public string? MatrixNumber { get; set; } - - [XmlElement("collection-catalog-number")] - public string? CollectionCatalogNumber { get; set; } - - [XmlElement("publisher")] - public string? Publisher { get; set; } - - [XmlElement("comment")] - public string? Comment { get; set; } - - #region ASR-Related - - [XmlElement("asr_detected_lang")] - public string? ASRDetectedLang { get; set; } - - [XmlElement("asr_detected_lang_conf")] - public string? ASRDetectedLangConf { get; set; } - - [XmlElement("asr_transcribed_lang")] - public string? ASRTranscribedLang { get; set; } - - [XmlElement("whisper_asr_module_version")] - public string? WhisperASRModuleVersion { get; set; } - - [XmlElement("whisper_model_hash")] - public string? WhisperModelHash { get; set; } - - [XmlElement("whisper_model_name")] - public string? WhisperModelName { get; set; } - - [XmlElement("whisper_version")] - public string? WhisperVersion { get; set; } - - #endregion - - #region OCR-Related - - [XmlElement("cloth_cover_detection_module_version")] - public string? ClothCoverDetectionModuleVersion { get; set; } - - [XmlElement("hocr_char_to_word_hocr_version")] - public string? hOCRCharToWordhOCRVersion { get; set; } - - [XmlElement("hocr_char_to_word_module_version")] - public string? hOCRCharToWordModuleVersion { get; set; } - - [XmlElement("hocr_fts_text_hocr_version")] - public string? hOCRFtsTexthOCRVersion { get; set; } - - [XmlElement("hocr_fts_text_module_version")] - public string? hOCRFtsTextModuleVersion { get; set; } - - [XmlElement("hocr_pageindex_hocr_version")] - public string? hOCRPageIndexhOCRVersion { get; set; } - - [XmlElement("hocr_pageindex_module_version")] - public string? hOCRPageIndexModuleVersion { get; set; } - - [XmlElement("ocr")] - public string? TesseractOCR { get; set; } - - [XmlElement("ocr_converted")] - public string? TesseractOCRConverted { get; set; } - - [XmlElement("ocr_detected_lang")] - public string? TesseractOCRDetectedLang { get; set; } - - [XmlElement("ocr_detected_lang_conf")] - public string? TesseractOCRDetectedLangConf { get; set; } - - [XmlElement("ocr_detected_script")] - public string? TesseractOCRDetectedScript { get; set; } - - [XmlElement("ocr_detected_script_conf")] - public string? TesseractOCRDetectedScriptConf { get; set; } - - [XmlElement("ocr_module_version")] - public string? TesseractOCRModuleVersion { get; set; } - - [XmlElement("ocr_parameters")] - public string? TesseractOCRParameters { get; set; } - - [XmlElement("pdf_module_version")] - public string? PDFModuleVersion { get; set; } - - [XmlElement("word_conf_0_10")] - public string? WordConfidenceInterval0To10 { get; set; } - - [XmlElement("word_conf_11_20")] - public string? WordConfidenceInterval11To20 { get; set; } - - [XmlElement("word_conf_21_30")] - public string? WordConfidenceInterval21To30 { get; set; } - - [XmlElement("word_conf_31_40")] - public string? WordConfidenceInterval31To40 { get; set; } - - [XmlElement("word_conf_41_50")] - public string? WordConfidenceInterval41To50 { get; set; } - - [XmlElement("word_conf_51_60")] - public string? WordConfidenceInterval51To60 { get; set; } - - [XmlElement("word_conf_61_70")] - public string? WordConfidenceInterval61To70 { get; set; } - - [XmlElement("word_conf_71_80")] - public string? WordConfidenceInterval71To80 { get; set; } - - [XmlElement("word_conf_81_90")] - public string? WordConfidenceInterval81To90 { get; set; } - - [XmlElement("word_conf_91_100")] - public string? WordConfidenceInterval91To100 { get; set; } - - #endregion - - #region Media-Related - - [XmlElement("album")] - public string? Album { get; set; } - - [XmlElement("artist")] - public string? Artist { get; set; } - - [XmlElement("bitrate")] - public string? Bitrate { get; set; } - - [XmlElement("creator")] - public string? Creator { get; set; } - - [XmlElement("height")] - public string? Height { get; set; } - - [XmlElement("length")] - public string? Length { get; set; } - - [XmlElement("preview-image")] - public string? PreviewImage { get; set; } - - /// Is this a set of defined values? - [XmlElement("rotation")] - public string? Rotation { get; set; } - - [XmlElement("title")] - public string? Title { get; set; } - - [XmlElement("track")] - public string? Track { get; set; } - - [XmlElement("width")] - public string? Width { get; set; } - - #endregion - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ArchiveDotOrg/Files.cs b/SabreTools.Models/ArchiveDotOrg/Files.cs deleted file mode 100644 index 0e4201d4..00000000 --- a/SabreTools.Models/ArchiveDotOrg/Files.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.ArchiveDotOrg -{ - [XmlRoot("files")] - public class Files - { - [XmlElement("file")] - public File[]? File { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/AttractMode/MetadataFile.cs b/SabreTools.Models/AttractMode/MetadataFile.cs deleted file mode 100644 index b1b78a0d..00000000 --- a/SabreTools.Models/AttractMode/MetadataFile.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace SabreTools.Models.AttractMode -{ - /// - /// #Name;Title;Emulator;CloneOf;Year;Manufacturer;Category;Players;Rotation;Control;Status;DisplayCount;DisplayType;AltRomname;AltTitle;Extra;Buttons /// - /// - public class MetadataFile - { - [Required] - public string[]? Header { get; set; } - - public Row[]? Row { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/AttractMode/Row.cs b/SabreTools.Models/AttractMode/Row.cs deleted file mode 100644 index 17fc57f3..00000000 --- a/SabreTools.Models/AttractMode/Row.cs +++ /dev/null @@ -1,58 +0,0 @@ -namespace SabreTools.Models.AttractMode -{ - public class Row - { - /// Also called Romname - [Required] - public string? Name { get; set; } - - public string? Title { get; set; } - - public string? Emulator { get; set; } - - public string? CloneOf { get; set; } - - public string? Year { get; set; } - - public string? Manufacturer { get; set; } - - public string? Category { get; set; } - - public string? Players { get; set; } - - public string? Rotation { get; set; } - - public string? Control { get; set; } - - public string? Status { get; set; } - - public string? DisplayCount { get; set; } - - public string? DisplayType { get; set; } - - public string? AltRomname { get; set; } - - public string? AltTitle { get; set; } - - public string? Extra { get; set; } - - public string? Buttons { get; set; } - - public string? Favorite { get; set; } - - public string? Tags { get; set; } - - public string? PlayedCount { get; set; } - - public string? PlayedTime { get; set; } - - public string? FileIsAvailable { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Archive.cs b/SabreTools.Models/ClrMamePro/Archive.cs deleted file mode 100644 index 2cd03795..00000000 --- a/SabreTools.Models/ClrMamePro/Archive.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// archive - public class Archive - { - /// name - [Required] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/BiosSet.cs b/SabreTools.Models/ClrMamePro/BiosSet.cs deleted file mode 100644 index 54326691..00000000 --- a/SabreTools.Models/ClrMamePro/BiosSet.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// biosset - public class BiosSet - { - /// name - [Required] - public string? Name { get; set; } - - /// description - [Required] - public string? Description { get; set; } - - /// default - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Chip.cs b/SabreTools.Models/ClrMamePro/Chip.cs deleted file mode 100644 index d542d568..00000000 --- a/SabreTools.Models/ClrMamePro/Chip.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// chip - public class Chip - { - /// type, (cpu|audio) - [Required] - public string? Type { get; set; } - - /// name - [Required] - public string? Name { get; set; } - - /// flags - public string? Flags { get; set; } - - /// clock, Numeric? - public string? Clock { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/ClrMamePro.cs b/SabreTools.Models/ClrMamePro/ClrMamePro.cs deleted file mode 100644 index 54800a50..00000000 --- a/SabreTools.Models/ClrMamePro/ClrMamePro.cs +++ /dev/null @@ -1,58 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// clrmamepro - public class ClrMamePro - { - /// name - public string? Name { get; set; } - - /// description - public string? Description { get; set; } - - /// rootdir - public string? RootDir { get; set; } - - /// category - public string? Category { get; set; } - - /// version - public string? Version { get; set; } - - /// date - public string? Date { get; set; } - - /// author - public string? Author { get; set; } - - /// homepage - public string? Homepage { get; set; } - - /// url - public string? Url { get; set; } - - /// comment - public string? Comment { get; set; } - - /// header - public string? Header { get; set; } - - /// type - public string? Type { get; set; } - - /// forcemerging - public string? ForceMerging { get; set; } - - /// forcezipping - public string? ForceZipping { get; set; } - - /// forcepacking - public string? ForcePacking { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/DipSwitch.cs b/SabreTools.Models/ClrMamePro/DipSwitch.cs deleted file mode 100644 index 38708414..00000000 --- a/SabreTools.Models/ClrMamePro/DipSwitch.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// dipswitch - public class DipSwitch - { - /// name - [Required] - public string? Name { get; set; } - - /// entry - public string[]? Entry { get; set; } - - /// default, (yes|no) "no" - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Disk.cs b/SabreTools.Models/ClrMamePro/Disk.cs deleted file mode 100644 index 0a84fa3f..00000000 --- a/SabreTools.Models/ClrMamePro/Disk.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// disk - public class Disk - { - /// name - [Required] - public string? Name { get; set; } - - /// md5 - public string? MD5 { get; set; } - - /// sha1 - public string? SHA1 { get; set; } - - /// merge - public string? Merge { get; set; } - - /// status - public string? Status { get; set; } - - /// flags - public string? Flags { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Driver.cs b/SabreTools.Models/ClrMamePro/Driver.cs deleted file mode 100644 index f1656e57..00000000 --- a/SabreTools.Models/ClrMamePro/Driver.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// driver - public class Driver - { - /// status, (good|imperfect|preliminary) - [Required] - public string? Status { get; set; } - - /// color, (good|imperfect|preliminary) - public string? Color { get; set; } - - /// sound, (good|imperfect|preliminary) - public string? Sound { get; set; } - - /// palettesize, Numeric? - public string? PaletteSize { get; set; } - - /// blit, (plain|dirty) - public string? Blit { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Game.cs b/SabreTools.Models/ClrMamePro/Game.cs deleted file mode 100644 index c00eed65..00000000 --- a/SabreTools.Models/ClrMamePro/Game.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// game - public class Game : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/GameBase.cs b/SabreTools.Models/ClrMamePro/GameBase.cs deleted file mode 100644 index ca234095..00000000 --- a/SabreTools.Models/ClrMamePro/GameBase.cs +++ /dev/null @@ -1,87 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// - /// Base class to unify the various game-like types - /// - public abstract class GameBase - { - /// name - [Required] - public string? Name { get; set; } - - /// description - public string? Description { get; set; } - - /// year - public string? Year { get; set; } - - /// manufacturer - public string? Manufacturer { get; set; } - - /// category - public string? Category { get; set; } - - /// cloneof - public string? CloneOf { get; set; } - - /// romof - public string? RomOf { get; set; } - - /// sampleof - public string? SampleOf { get; set; } - - /// release - public Release[]? Release { get; set; } - - /// biosset - public BiosSet[]? BiosSet { get; set; } - - /// rom - public Rom[]? Rom { get; set; } - - /// disk - public Disk[]? Disk { get; set; } - - /// sample - public Sample[]? Sample { get; set; } - - /// archive - public Archive[]? Archive { get; set; } - - #region Aaru Extensions - - /// media, Appears after Disk - public Media[]? Media { get; set; } - - #endregion - - #region MAME Extensions - - /// chip, Appears after Archive - public Chip[]? Chip { get; set; } - - /// video, Appears after Chip - public Video[]? Video { get; set; } - - /// sound, Appears after Video - public Sound? Sound { get; set; } - - /// input, Appears after Sound - public Input? Input { get; set; } - - /// dipswitch, Appears after Input - public DipSwitch[]? DipSwitch { get; set; } - - /// driver, Appears after DipSwitch - public Driver? Driver { get; set; } - - #endregion - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Input.cs b/SabreTools.Models/ClrMamePro/Input.cs deleted file mode 100644 index 06da37b2..00000000 --- a/SabreTools.Models/ClrMamePro/Input.cs +++ /dev/null @@ -1,33 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// input - public class Input - { - /// players, Numeric/remarks> - [Required] - public string? Players { get; set; } - - /// control - public string? Control { get; set; } - - /// buttons, Numeric - [Required] - public string? Buttons { get; set; } - - /// coins, Numeric - public string? Coins { get; set; } - - /// tilt, (yes|no) "no" - public string? Tilt { get; set; } - - /// service, (yes|no) "no" - public string? Service { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Machine.cs b/SabreTools.Models/ClrMamePro/Machine.cs deleted file mode 100644 index 2084e41d..00000000 --- a/SabreTools.Models/ClrMamePro/Machine.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// machine - public class Machine : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Media.cs b/SabreTools.Models/ClrMamePro/Media.cs deleted file mode 100644 index 25f678aa..00000000 --- a/SabreTools.Models/ClrMamePro/Media.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// media - public class Media - { - /// name - [Required] - public string? Name { get; set; } - - /// md5 - public string? MD5 { get; set; } - - /// sha1 - public string? SHA1 { get; set; } - - /// sha256 - public string? SHA256 { get; set; } - - /// spamsum - public string? SpamSum { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/MetadataFile.cs b/SabreTools.Models/ClrMamePro/MetadataFile.cs deleted file mode 100644 index 22499527..00000000 --- a/SabreTools.Models/ClrMamePro/MetadataFile.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - public class MetadataFile - { - /// clrmamepro - public ClrMamePro? ClrMamePro { get; set; } - - /// game, machine, resource, set - public GameBase[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Release.cs b/SabreTools.Models/ClrMamePro/Release.cs deleted file mode 100644 index 1da26ca3..00000000 --- a/SabreTools.Models/ClrMamePro/Release.cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// release - public class Release - { - /// name - [Required] - public string? Name { get; set; } - - /// region - [Required] - public string? Region { get; set; } - - /// language - public string? Language { get; set; } - - /// date - public string? Date { get; set; } - - /// default - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Resource.cs b/SabreTools.Models/ClrMamePro/Resource.cs deleted file mode 100644 index 558d04b8..00000000 --- a/SabreTools.Models/ClrMamePro/Resource.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// resource - public class Resource : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Rom.cs b/SabreTools.Models/ClrMamePro/Rom.cs deleted file mode 100644 index a98677ed..00000000 --- a/SabreTools.Models/ClrMamePro/Rom.cs +++ /dev/null @@ -1,98 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// rom - public class Rom - { - /// name - [Required] - public string? Name { get; set; } - - /// size, Numeric - [Required] - public string? Size { get; set; } - - /// crc - public string? CRC { get; set; } - - /// md5 - public string? MD5 { get; set; } - - /// sha1 - public string? SHA1 { get; set; } - - /// merge - public string? Merge { get; set; } - - /// status - public string? Status { get; set; } - - /// flags - public string? Flags { get; set; } - - /// date - public string? Date { get; set; } - - #region Hash Extensions - - /// sha256; Also in No-Intro spec; Appears after SHA1 - public string? SHA256 { get; set; } - - /// sha384; Appears after SHA256 - public string? SHA384 { get; set; } - - /// sha512; Appears after SHA384 - public string? SHA512 { get; set; } - - /// spamsum; Appears after SHA512 - public string? SpamSum { get; set; } - - #endregion - - #region DiscImgeCreator Extensions - - /// xxh3_64; Appears after SpamSum - public string? xxHash364 { get; set; } - - /// xxh3_128; Appears after xxHash364 - public string? xxHash3128 { get; set; } - - #endregion - - #region MAME Extensions - - /// region; Appears after Status - public string? Region { get; set; } - - /// offs; Appears after Flags - public string? Offs { get; set; } - - #endregion - - #region No-Intro Extensions - - /// serial; Appears after Offs - public string? Serial { get; set; } - - /// header; Appears after Serial - public string? Header { get; set; } - - #endregion - - #region RomVault Extensions - - /// inverted; Boolean; Appears after Date - public string? Inverted { get; set; } - - /// mia; Boolean; Appears after Inverted - public string? MIA { get; set; } - - #endregion - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/RomVault.cs b/SabreTools.Models/ClrMamePro/RomVault.cs deleted file mode 100644 index 7975ff40..00000000 --- a/SabreTools.Models/ClrMamePro/RomVault.cs +++ /dev/null @@ -1,51 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// romvault - public class RomVault - { - /// name - public string? Name { get; set; } - - /// description - public string? Description { get; set; } - - /// rootdir - public string? RootDir { get; set; } - - /// category - public string? Category { get; set; } - - /// version - public string? Version { get; set; } - - /// date - public string? Date { get; set; } - - /// author - public string? Author { get; set; } - - /// homepage - public string? Homepage { get; set; } - - /// url - public string? Url { get; set; } - - /// comment - public string? Comment { get; set; } - - /// header - public string? Header { get; set; } - - /// type - public string? Type { get; set; } - - /// forcemerging - public string? ForceMerging { get; set; } - - /// forcezipping - public string? ForceZipping { get; set; } - - /// forcepacking - public string? ForcePacking { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Sample.cs b/SabreTools.Models/ClrMamePro/Sample.cs deleted file mode 100644 index ab0b11c1..00000000 --- a/SabreTools.Models/ClrMamePro/Sample.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// sample - public class Sample - { - /// name - [Required] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Set.cs b/SabreTools.Models/ClrMamePro/Set.cs deleted file mode 100644 index cd88b2a9..00000000 --- a/SabreTools.Models/ClrMamePro/Set.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// set - public class Set : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Sound.cs b/SabreTools.Models/ClrMamePro/Sound.cs deleted file mode 100644 index bfddee8b..00000000 --- a/SabreTools.Models/ClrMamePro/Sound.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// sound - public class Sound - { - /// channels, Numeric? - [Required] - public string? Channels { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/ClrMamePro/Video.cs b/SabreTools.Models/ClrMamePro/Video.cs deleted file mode 100644 index c7448aa8..00000000 --- a/SabreTools.Models/ClrMamePro/Video.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace SabreTools.Models.ClrMamePro -{ - /// video - public class Video - { - /// screen, (raster|vector) - [Required] - public string? Screen { get; set; } - - /// orientation, (vertical|horizontal) - [Required] - public string? Orientation { get; set; } - - /// x, Numeric? - public string? X { get; set; } - - /// y, Numeric? - public string? Y { get; set; } - - /// aspectx, Numeric? - public string? AspectX { get; set; } - - /// aspecty, Numeric? - public string? AspectY { get; set; } - - /// freq, Numeric? - public string? Freq { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/DosCenter/DosCenter.cs b/SabreTools.Models/DosCenter/DosCenter.cs deleted file mode 100644 index 8368d8a7..00000000 --- a/SabreTools.Models/DosCenter/DosCenter.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace SabreTools.Models.DosCenter -{ - /// doscenter - public class DosCenter - { - /// name - public string? Name { get; set; } - - /// description - public string? Description { get; set; } - - /// version - public string? Version { get; set; } - - /// date - public string? Date { get; set; } - - /// author - public string? Author { get; set; } - - /// homepage - public string? Homepage { get; set; } - - /// comment - public string? Comment { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/DosCenter/File.cs b/SabreTools.Models/DosCenter/File.cs deleted file mode 100644 index eb663f45..00000000 --- a/SabreTools.Models/DosCenter/File.cs +++ /dev/null @@ -1,28 +0,0 @@ -namespace SabreTools.Models.DosCenter -{ - /// file - public class File - { - /// name, attribute - [Required] - public string? Name { get; set; } - - /// size, attribute, numeric - [Required] - public string? Size { get; set; } - - /// crc, attribute - [Required] - public string? CRC { get; set; } - - /// date, attribute - public string? Date { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/DosCenter/Game.cs b/SabreTools.Models/DosCenter/Game.cs deleted file mode 100644 index 8413155c..00000000 --- a/SabreTools.Models/DosCenter/Game.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace SabreTools.Models.DosCenter -{ - /// game - public class Game - { - /// name - [Required] - public string? Name { get; set; } - - /// file - public File[]? File { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/DosCenter/MetadataFile.cs b/SabreTools.Models/DosCenter/MetadataFile.cs deleted file mode 100644 index 48f2a6e9..00000000 --- a/SabreTools.Models/DosCenter/MetadataFile.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace SabreTools.Models.DosCenter -{ - public class MetadataFile - { - /// doscenter - public DosCenter? DosCenter { get; set; } - - /// game - public Game[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/EverdriveSMDB/MetadataFile.cs b/SabreTools.Models/EverdriveSMDB/MetadataFile.cs deleted file mode 100644 index 1813cafb..00000000 --- a/SabreTools.Models/EverdriveSMDB/MetadataFile.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace SabreTools.Models.EverdriveSMDB -{ - public class MetadataFile - { - public Row[]? Row { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/EverdriveSMDB/Row.cs b/SabreTools.Models/EverdriveSMDB/Row.cs deleted file mode 100644 index 648dbe4d..00000000 --- a/SabreTools.Models/EverdriveSMDB/Row.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace SabreTools.Models.EverdriveSMDB -{ - /// - /// SHA-256 \t Machine Name/Filename \t SHA-1 \t MD5 \t CRC32 \t Size (Optional) - /// - public class Row - { - [Required] - public string? SHA256 { get; set; } - - [Required] - public string? Name { get; set; } - - [Required] - public string? SHA1 { get; set; } - - [Required] - public string? MD5 { get; set; } - - [Required] - public string? CRC32 { get; set; } - - public string? Size { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/Hashfile.cs b/SabreTools.Models/Hashfile/Hashfile.cs deleted file mode 100644 index ad694120..00000000 --- a/SabreTools.Models/Hashfile/Hashfile.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// Hashfiles can only contain one type of hash at a time - public class Hashfile - { - public SFV[]? SFV { get; set; } - - public MD5[]? MD5 { get; set; } - - public SHA1[]? SHA1 { get; set; } - - public SHA256[]? SHA256 { get; set; } - - public SHA384[]? SHA384 { get; set; } - - public SHA512[]? SHA512 { get; set; } - - public SpamSum[]? SpamSum { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/MD5.cs b/SabreTools.Models/Hashfile/MD5.cs deleted file mode 100644 index 1156d18a..00000000 --- a/SabreTools.Models/Hashfile/MD5.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// MD5 File - /// - public class MD5 - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SFV.cs b/SabreTools.Models/Hashfile/SFV.cs deleted file mode 100644 index 8d4be7f2..00000000 --- a/SabreTools.Models/Hashfile/SFV.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// File CRC - /// - public class SFV - { - [Required] - public string? File { get; set; } - - [Required] - public string? Hash { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SHA1.cs b/SabreTools.Models/Hashfile/SHA1.cs deleted file mode 100644 index 153afb3e..00000000 --- a/SabreTools.Models/Hashfile/SHA1.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// SHA-1 File - /// - public class SHA1 - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SHA256.cs b/SabreTools.Models/Hashfile/SHA256.cs deleted file mode 100644 index 9b2c6d2a..00000000 --- a/SabreTools.Models/Hashfile/SHA256.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// SHA-256 File - /// - public class SHA256 - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SHA384.cs b/SabreTools.Models/Hashfile/SHA384.cs deleted file mode 100644 index 916aa710..00000000 --- a/SabreTools.Models/Hashfile/SHA384.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// SHA-384 File - /// - public class SHA384 - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SHA512.cs b/SabreTools.Models/Hashfile/SHA512.cs deleted file mode 100644 index dec6abb7..00000000 --- a/SabreTools.Models/Hashfile/SHA512.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// SHA-512 File - /// - public class SHA512 - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Hashfile/SpamSum.cs b/SabreTools.Models/Hashfile/SpamSum.cs deleted file mode 100644 index 82bb61ea..00000000 --- a/SabreTools.Models/Hashfile/SpamSum.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Hashfile -{ - /// - /// SpamSum File - /// - public class SpamSum - { - [Required] - public string? Hash { get; set; } - - [Required] - public string? File { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/Adjuster.cs b/SabreTools.Models/Internal/Adjuster.cs deleted file mode 100644 index 77014dcb..00000000 --- a/SabreTools.Models/Internal/Adjuster.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("adjuster"), XmlRoot("adjuster")] - public class Adjuster : DatItem - { - #region Keys - - // Condition - [NoFilter] - public const string ConditionKey = "condition"; - - /// bool - public const string DefaultKey = "default"; - - /// string - public const string NameKey = "name"; - - #endregion - - public Adjuster() => Type = ItemType.Adjuster; - } -} diff --git a/SabreTools.Models/Internal/Analog.cs b/SabreTools.Models/Internal/Analog.cs deleted file mode 100644 index 5aa36d53..00000000 --- a/SabreTools.Models/Internal/Analog.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("analog"), XmlRoot("analog")] - public class Analog : DatItem - { - #region Keys - - /// string - public const string MaskKey = "mask"; - - #endregion - - public Analog() => Type = ItemType.Analog; - } -} diff --git a/SabreTools.Models/Internal/Archive.cs b/SabreTools.Models/Internal/Archive.cs deleted file mode 100644 index 4fee4514..00000000 --- a/SabreTools.Models/Internal/Archive.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("archive"), XmlRoot("archive")] - public class Archive : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - #endregion - - public Archive() => Type = ItemType.Archive; - } -} diff --git a/SabreTools.Models/Internal/BiosSet.cs b/SabreTools.Models/Internal/BiosSet.cs deleted file mode 100644 index f5a4d47f..00000000 --- a/SabreTools.Models/Internal/BiosSet.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("biosset"), XmlRoot("biosset")] - public class BiosSet : DatItem - { - #region Keys - - /// bool - public const string DefaultKey = "default"; - - /// string - public const string DescriptionKey = "description"; - - /// string - public const string NameKey = "name"; - - #endregion - - public BiosSet() => Type = ItemType.BiosSet; - } -} diff --git a/SabreTools.Models/Internal/Blank.cs b/SabreTools.Models/Internal/Blank.cs deleted file mode 100644 index f7af0f02..00000000 --- a/SabreTools.Models/Internal/Blank.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("blank"), XmlRoot("blank")] - public class Blank : DatItem - { - public Blank() => Type = ItemType.Blank; - } -} diff --git a/SabreTools.Models/Internal/Chip.cs b/SabreTools.Models/Internal/Chip.cs deleted file mode 100644 index 519e5f04..00000000 --- a/SabreTools.Models/Internal/Chip.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("chip"), XmlRoot("chip")] - public class Chip : DatItem - { - #region Keys - - /// long - public const string ClockKey = "clock"; - - /// string - public const string FlagsKey = "flags"; - - /// string - public const string NameKey = "name"; - - /// (yes|no) "no" - public const string SoundOnlyKey = "soundonly"; - - /// string - public const string TagKey = "tag"; - - /// (cpu|audio) - public const string ChipTypeKey = "type"; - - #endregion - - public Chip() => Type = ItemType.Chip; - } -} diff --git a/SabreTools.Models/Internal/Condition.cs b/SabreTools.Models/Internal/Condition.cs deleted file mode 100644 index 17210c01..00000000 --- a/SabreTools.Models/Internal/Condition.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("condition"), XmlRoot("condition")] - public class Condition : DatItem - { - #region Keys - - /// string - public const string ValueKey = "clock"; - - /// string - public const string MaskKey = "mask"; - - /// (eq|ne|gt|le|lt|ge) - public const string RelationKey = "relation"; - - /// string - public const string TagKey = "tag"; - - #endregion - - public Condition() => Type = ItemType.Condition; - } -} diff --git a/SabreTools.Models/Internal/ConfLocation.cs b/SabreTools.Models/Internal/ConfLocation.cs deleted file mode 100644 index d38a19ad..00000000 --- a/SabreTools.Models/Internal/ConfLocation.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("conflocation"), XmlRoot("conflocation")] - public class ConfLocation : DatItem - { - #region Keys - - /// (yes|no) "no" - public const string InvertedKey = "inverted"; - - /// string - public const string NameKey = "name"; - - /// string, possibly long - public const string NumberKey = "number"; - - #endregion - - public ConfLocation() => Type = ItemType.ConfLocation; - } -} diff --git a/SabreTools.Models/Internal/ConfSetting.cs b/SabreTools.Models/Internal/ConfSetting.cs deleted file mode 100644 index 756e3743..00000000 --- a/SabreTools.Models/Internal/ConfSetting.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("confsetting"), XmlRoot("confsetting")] - public class ConfSetting : DatItem - { - #region Keys - - /// Condition - [NoFilter] - public const string ConditionKey = "condition"; - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// string - public const string NameKey = "name"; - - /// string - public const string ValueKey = "value"; - - #endregion - - public ConfSetting() => Type = ItemType.ConfSetting; - } -} diff --git a/SabreTools.Models/Internal/Configuration.cs b/SabreTools.Models/Internal/Configuration.cs deleted file mode 100644 index ab6da749..00000000 --- a/SabreTools.Models/Internal/Configuration.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("configuration"), XmlRoot("configuration")] - public class Configuration : DatItem - { - #region Keys - - /// Condition - [NoFilter] - public const string ConditionKey = "condition"; - - /// ConfLocation[] - [NoFilter] - public const string ConfLocationKey = "conflocation"; - - /// ConfSetting[] - [NoFilter] - public const string ConfSettingKey = "confsetting"; - - /// string - public const string MaskKey = "mask"; - - /// string - public const string NameKey = "name"; - - /// string - public const string TagKey = "tag"; - - #endregion - - public Configuration() => Type = ItemType.Configuration; - } -} diff --git a/SabreTools.Models/Internal/Control.cs b/SabreTools.Models/Internal/Control.cs deleted file mode 100644 index cfaa990f..00000000 --- a/SabreTools.Models/Internal/Control.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("control"), XmlRoot("control")] - public class Control : DatItem - { - #region Keys - - /// long - public const string ButtonsKey = "buttons"; - - /// long - public const string KeyDeltaKey = "keydelta"; - - /// long - public const string MaximumKey = "maximum"; - - /// long - public const string MinimumKey = "minimum"; - - /// long - public const string PlayerKey = "player"; - - /// long - public const string ReqButtonsKey = "reqbuttons"; - - /// (yes|no) "no" - public const string ReverseKey = "reverse"; - - /// long - public const string SensitivityKey = "sensitivity"; - - /// (joy|stick|paddle|pedal|lightgun|positional|dial|trackball|mouse|only_buttons|keypad|keyboard|mahjong|hanafuda|gambling) - public const string ControlTypeKey = "type"; - - /// string, possibly long - public const string WaysKey = "ways"; - - /// string, possibly long - public const string Ways2Key = "ways2"; - - /// string, possibly long - public const string Ways3Key = "ways3"; - - #endregion - - public Control() => Type = ItemType.Control; - } -} diff --git a/SabreTools.Models/Internal/DatItem.cs b/SabreTools.Models/Internal/DatItem.cs deleted file mode 100644 index 8fc6ca2b..00000000 --- a/SabreTools.Models/Internal/DatItem.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - /// - /// Format-agnostic representation of item data - /// - public class DatItem : DictionaryBase - { - #region Common Keys - - public const string TypeKey = "_type"; - - #endregion - - /// - /// Quick accessor to item type, if it exists - /// - [JsonProperty("itemtype", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("itemtype")] - public ItemType? Type - { - get => ContainsKey(TypeKey) ? this[TypeKey] as ItemType? : null; - set => this[TypeKey] = value; - } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/DataArea.cs b/SabreTools.Models/Internal/DataArea.cs deleted file mode 100644 index 49325ce8..00000000 --- a/SabreTools.Models/Internal/DataArea.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("dataarea"), XmlRoot("dataarea")] - public class DataArea : DatItem - { - #region Keys - - /// (big|little) "little" - public const string EndiannessKey = "endianness"; - - /// string - public const string NameKey = "name"; - - /// Rom[] - [NoFilter] - public const string RomKey = "rom"; - - /// long - public const string SizeKey = "size"; - - /// (8|16|32|64) "8" - public const string WidthKey = "width"; - - #endregion - - public DataArea() => Type = ItemType.DataArea; - } -} diff --git a/SabreTools.Models/Internal/Device.cs b/SabreTools.Models/Internal/Device.cs deleted file mode 100644 index e1732eba..00000000 --- a/SabreTools.Models/Internal/Device.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("device"), XmlRoot("device")] - public class Device : DatItem - { - #region Keys - - /// Extension[] - [NoFilter] - public const string ExtensionKey = "extension"; - - /// string - public const string FixedImageKey = "fixed_image"; - - /// Instance - [NoFilter] - public const string InstanceKey = "instance"; - - /// string - public const string InterfaceKey = "interface"; - - /// (0|1) "0" - public const string MandatoryKey = "mandatory"; - - /// string - public const string TagKey = "tag"; - - /// (unknown|cartridge|floppydisk|harddisk|cylinder|cassette|punchcard|punchtape|printout|serial|parallel|snapshot|quickload|memcard|cdrom|magtape|romimage|midiin|midiout|picture|vidfile) - public const string DeviceTypeKey = "type"; - - #endregion - - public Device() => Type = ItemType.Device; - } -} diff --git a/SabreTools.Models/Internal/DeviceRef.cs b/SabreTools.Models/Internal/DeviceRef.cs deleted file mode 100644 index 22a1c281..00000000 --- a/SabreTools.Models/Internal/DeviceRef.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("device_ref"), XmlRoot("device_ref")] - public class DeviceRef : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - #endregion - - public DeviceRef() => Type = ItemType.DeviceRef; - } -} diff --git a/SabreTools.Models/Internal/DictionaryBase.cs b/SabreTools.Models/Internal/DictionaryBase.cs deleted file mode 100644 index c62bb2bc..00000000 --- a/SabreTools.Models/Internal/DictionaryBase.cs +++ /dev/null @@ -1,149 +0,0 @@ -using System.Collections.Generic; - -namespace SabreTools.Models.Internal -{ - /// - /// Specialized dictionary base for item types - /// - public abstract class DictionaryBase : Dictionary - { - /// - /// Read a key as the specified type, returning null on error - /// - public T? Read(string key) - { - try - { - if (!ValidateKey(key)) - return default; - if (this[key] is not T) - return default; - return (T?)this[key]; - } - catch - { - return default; - } - } - - /// - /// Read a key as a bool, returning null on error - /// - public bool? ReadBool(string key) - { - if (!ValidateKey(key)) - return null; - - bool? asBool = Read(key); - if (asBool != null) - return asBool; - - string? asString = Read(key); - return asString?.ToLowerInvariant() switch - { - "true" or "yes" => true, - "false" or "no" => false, - _ => null, - }; - } - - /// - /// Read a key as a double, returning null on error - /// - public double? ReadDouble(string key) - { - if (!ValidateKey(key)) - return null; - - double? asDouble = Read(key); - if (asDouble != null) - return asDouble; - - string? asString = Read(key); - if (asString != null && double.TryParse(asString, out double asStringDouble)) - return asStringDouble; - - return null; - } - - /// - /// Read a key as a long, returning null on error - /// - /// TODO: Add logic to convert SI suffixes and hex - public long? ReadLong(string key) - { - if (!ValidateKey(key)) - return null; - - long? asLong = Read(key); - if (asLong != null) - return asLong; - - string? asString = Read(key); - if (asString != null && long.TryParse(asString, out long asStringLong)) - return asStringLong; - - return null; - } - - /// - /// Read a key as a string, returning null on error - /// - public string? ReadString(string key) - { - if (!ValidateKey(key)) - return null; - - string? asString = Read(key); - if (asString != null) - return asString; - - string[]? asArray = Read(key); - if (asArray != null) - return string.Join(',', asArray); - - // TODO: Add byte array conversion here - // TODO: Add byte array read helper - - return this[key]!.ToString(); - } - - /// - /// Read a key as a string[], returning null on error - /// - public string[]? ReadStringArray(string key) - { - if (!ValidateKey(key)) - return null; - - string[]? asArray = Read(key); - if (asArray != null) - return asArray; - - string? asString = Read(key); - if (asString != null) - return new string[] { asString }; - - asString = this[key]!.ToString(); - if (asString != null) - return new string[] { asString }; - - return null; - } - - /// - /// Check if a key is valid - /// - private bool ValidateKey(string key) - { - if (string.IsNullOrWhiteSpace(key)) - return false; - else if (!ContainsKey(key)) - return false; - else if (this[key] == null) - return false; - - return true; - } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/DipLocation.cs b/SabreTools.Models/Internal/DipLocation.cs deleted file mode 100644 index f1f5bb73..00000000 --- a/SabreTools.Models/Internal/DipLocation.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("diplocation"), XmlRoot("diplocation")] - public class DipLocation : DatItem - { - #region Keys - - /// (yes|no) "no" - public const string InvertedKey = "inverted"; - - /// string - public const string NameKey = "name"; - - /// string, possibly long - public const string NumberKey = "number"; - - #endregion - - public DipLocation() => Type = ItemType.DipLocation; - } -} diff --git a/SabreTools.Models/Internal/DipSwitch.cs b/SabreTools.Models/Internal/DipSwitch.cs deleted file mode 100644 index 41b8f1f5..00000000 --- a/SabreTools.Models/Internal/DipSwitch.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("dipswitch"), XmlRoot("dipswitch")] - public class DipSwitch : DatItem - { - #region Keys - - /// Condition - [NoFilter] - public const string ConditionKey = "condition"; - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// DipLocation[] - [NoFilter] - public const string DipLocationKey = "diplocation"; - - /// DipValue[] - [NoFilter] - public const string DipValueKey = "dipvalue"; - - /// string[] - public const string EntryKey = "entry"; - - /// string - public const string MaskKey = "mask"; - - /// string - public const string NameKey = "name"; - - /// string - public const string TagKey = "tag"; - - #endregion - - public DipSwitch() => Type = ItemType.DipSwitch; - } -} diff --git a/SabreTools.Models/Internal/DipValue.cs b/SabreTools.Models/Internal/DipValue.cs deleted file mode 100644 index 7bf27357..00000000 --- a/SabreTools.Models/Internal/DipValue.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("dipvalue"), XmlRoot("dipvalue")] - public class DipValue : DatItem - { - #region Keys - - /// Condition - [NoFilter] - public const string ConditionKey = "condition"; - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// string - public const string NameKey = "name"; - - /// string - public const string ValueKey = "value"; - - #endregion - - public DipValue() => Type = ItemType.DipValue; - } -} diff --git a/SabreTools.Models/Internal/Disk.cs b/SabreTools.Models/Internal/Disk.cs deleted file mode 100644 index bd758b9b..00000000 --- a/SabreTools.Models/Internal/Disk.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("disk"), XmlRoot(elementName: "disk")] - public class Disk : DatItem - { - #region Keys - - /// string - public const string FlagsKey = "flags"; - - /// string, possibly long - public const string IndexKey = "index"; - - /// string - public const string MD5Key = "md5"; - - /// string - public const string MergeKey = "merge"; - - /// string - public const string NameKey = "name"; - - /// (yes|no) "no" - public const string OptionalKey = "optional"; - - /// string - public const string RegionKey = "region"; - - /// string - public const string SHA1Key = "sha1"; - - /// (baddump|nodump|good|verified) "good" - public const string StatusKey = "status"; - - /// (yes|no) "no" - public const string WritableKey = "writable"; - - #endregion - - public Disk() => Type = ItemType.Disk; - } -} diff --git a/SabreTools.Models/Internal/DiskArea.cs b/SabreTools.Models/Internal/DiskArea.cs deleted file mode 100644 index 5f4420ef..00000000 --- a/SabreTools.Models/Internal/DiskArea.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("diskarea"), XmlRoot("diskarea")] - public class DiskArea : DatItem - { - #region Keys - - /// Disk[] - [NoFilter] - public const string DiskKey = "disk"; - - /// string - public const string NameKey = "name"; - - #endregion - - public DiskArea() => Type = ItemType.DiskArea; - } -} diff --git a/SabreTools.Models/Internal/Display.cs b/SabreTools.Models/Internal/Display.cs deleted file mode 100644 index 3eaea96f..00000000 --- a/SabreTools.Models/Internal/Display.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("display"), XmlRoot("display")] - public class Display : DatItem - { - #region Keys - - /// (yes|no) "no" - public const string FlipXKey = "flipx"; - - /// long - public const string HBEndKey = "hbend"; - - /// long - public const string HBStartKey = "hbstart"; - - /// long - public const string HeightKey = "height"; - - /// long - public const string HTotalKey = "htotal"; - - /// long - public const string PixClockKey = "pixclock"; - - /// double - public const string RefreshKey = "refresh"; - - /// (0|90|180|270) - public const string RotateKey = "rotate"; - - /// string - public const string TagKey = "tag"; - - /// (raster|vector|lcd|svg|unknown) - public const string DisplayTypeKey = "type"; - - /// long - public const string VBEndKey = "vbend"; - - /// long - public const string VBStartKey = "vbstart"; - - /// long - public const string VTotalKey = "vtotal"; - - /// long - public const string WidthKey = "width"; - - #endregion - - public Display() => Type = ItemType.Display; - } -} diff --git a/SabreTools.Models/Internal/Driver.cs b/SabreTools.Models/Internal/Driver.cs deleted file mode 100644 index 9916b930..00000000 --- a/SabreTools.Models/Internal/Driver.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("driver"), XmlRoot("driver")] - public class Driver : DatItem - { - #region Keys - - /// (plain|dirty) - public const string BlitKey = "blit"; - - /// (good|imperfect|preliminary) - public const string CocktailKey = "cocktail"; - - /// (good|imperfect|preliminary) - public const string ColorKey = "color"; - - /// (good|imperfect|preliminary) - public const string EmulationKey = "emulation"; - - /// (yes|no) "no" - public const string IncompleteKey = "incomplete"; - - /// (yes|no) "no" - public const string NoSoundHardwareKey = "nosoundhardware"; - - /// string, possibly long - public const string PaletteSizeKey = "palettesize"; - - /// (yes|no) "no" - public const string RequiresArtworkKey = "requiresartwork"; - - /// (supported|unsupported) - public const string SaveStateKey = "savestate"; - - /// (good|imperfect|preliminary) - public const string SoundKey = "sound"; - - /// (good|imperfect|preliminary|test) - public const string StatusKey = "status"; - - /// (yes|no) "no" - public const string UnofficialKey = "unofficial"; - - #endregion - - public Driver() => Type = ItemType.Driver; - } -} diff --git a/SabreTools.Models/Internal/Dump.cs b/SabreTools.Models/Internal/Dump.cs deleted file mode 100644 index d3d52e29..00000000 --- a/SabreTools.Models/Internal/Dump.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("dump"), XmlRoot("dump")] - public class Dump : DatItem - { - #region Keys - - /// Rom - [NoFilter] - public const string MegaRomKey = "megarom"; - - /// Original - [NoFilter] - public const string OriginalKey = "original"; - - /// Rom - [NoFilter] - public const string RomKey = "rom"; - - /// Rom - [NoFilter] - public const string SCCPlusCartKey = "sccpluscart"; - - #endregion - - public Dump() => Type = ItemType.Dump; - } -} diff --git a/SabreTools.Models/Internal/Extension.cs b/SabreTools.Models/Internal/Extension.cs deleted file mode 100644 index 1d84ca6e..00000000 --- a/SabreTools.Models/Internal/Extension.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("extension"), XmlRoot("extension")] - public class Extension : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - #endregion - - public Extension() => Type = ItemType.Extension; - } -} diff --git a/SabreTools.Models/Internal/Feature.cs b/SabreTools.Models/Internal/Feature.cs deleted file mode 100644 index 9bcf9799..00000000 --- a/SabreTools.Models/Internal/Feature.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("feature"), XmlRoot("feature")] - public class Feature : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - /// (unemulated|imperfect) - public const string OverallKey = "overall"; - - /// (unemulated|imperfect) - public const string StatusKey = "status"; - - /// (protection|timing|graphics|palette|sound|capture|camera|microphone|controls|keyboard|mouse|media|disk|printer|tape|punch|drum|rom|comms|lan|wan) - public const string FeatureTypeKey = "type"; - - /// string - public const string ValueKey = "value"; - - #endregion - - public Feature() => Type = ItemType.Feature; - } -} diff --git a/SabreTools.Models/Internal/Header.cs b/SabreTools.Models/Internal/Header.cs deleted file mode 100644 index a5bdb76f..00000000 --- a/SabreTools.Models/Internal/Header.cs +++ /dev/null @@ -1,154 +0,0 @@ -namespace SabreTools.Models.Internal -{ - /// - /// Format-agnostic representation of metadata header data - /// - public class Header : DictionaryBase - { - #region Keys - - /// string - public const string AuthorKey = "author"; - - /// (none|split|merged|nonmerged|fullmerged|device|full) "split" - public const string BiosModeKey = "biosmode"; - - /// string - public const string BuildKey = "build"; - - /// TODO: This needs an internal model OR mapping to fields - /// CanOpen - [NoFilter] - public const string CanOpenKey = "canOpen"; - - /// string - public const string CategoryKey = "category"; - - /// string - public const string CommentKey = "comment"; - - /// string - public const string DateKey = "date"; - - /// string - public const string DatVersionKey = "datversion"; - - /// (yes|no) "no" - public const string DebugKey = "debug"; - - /// string - public const string DescriptionKey = "description"; - - /// string - public const string EmailKey = "email"; - - /// string - public const string EmulatorVersionKey = "emulatorversion"; - - /// (none|split|merged|nonmerged|fullmerged|device|full) "split" - public const string ForceMergingKey = "forcemerging"; - - /// (obsolete|required|ignore) "obsolete" - public const string ForceNodumpKey = "forcenodump"; - - /// (zip|unzip) "zip" - public const string ForcePackingKey = "forcepacking"; - - /// (yes|no) "yes" - public const string ForceZippingKey = "forcezipping"; - - /// string, string[] - public const string HeaderKey = "header"; - - /// string - public const string HomepageKey = "homepage"; - - /// string - public const string IdKey = "id"; - - /// TODO: This needs an internal model OR mapping to fields - /// Search - [NoFilter] - public const string ImagesKey = "images"; - - /// string - public const string ImFolderKey = "imFolder"; - - /// TODO: This needs an internal model OR mapping to fields - /// Infos - [NoFilter] - public const string InfosKey = "infos"; - - /// (yes|no) "no" - public const string LockBiosModeKey = "lockbiosmode"; - - /// (yes|no) "no" - public const string LockRomModeKey = "lockrommode"; - - /// (yes|no) "no" - public const string LockSampleModeKey = "locksamplemode"; - - /// string - public const string MameConfigKey = "mameconfig"; - - /// string - public const string NameKey = "name"; - - /// TODO: This needs an internal model OR mapping to fields - /// NewDat - [NoFilter] - public const string NewDatKey = "newDat"; - - /// string - public const string NotesKey = "notes"; - - /// string - public const string PluginKey = "plugin"; - - /// string - public const string RefNameKey = "refname"; - - /// (none|split|merged|nonmerged|fullmerged|device|full) "split" - public const string RomModeKey = "rommode"; - - /// string - public const string RomTitleKey = "romTitle"; - - /// string - public const string RootDirKey = "rootdir"; - - /// (none|split|merged|nonmerged|fullmerged|device|full) "split" - public const string SampleModeKey = "samplemode"; - - /// string - public const string SchemaLocationKey = "schemaLocation"; - - /// string - public const string ScreenshotsHeightKey = "screenshotsHeight"; - - /// string - public const string ScreenshotsWidthKey = "screenshotsWidth"; - - /// TODO: This needs an internal model OR mapping to fields - /// Search - [NoFilter] - public const string SearchKey = "search"; - - /// string - public const string SystemKey = "system"; - - /// string - public const string TimestampKey = "timestamp"; - - /// string - public const string TypeKey = "type"; - - /// string - public const string UrlKey = "url"; - - /// string - public const string VersionKey = "version"; - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/Info.cs b/SabreTools.Models/Internal/Info.cs deleted file mode 100644 index ae99dd1d..00000000 --- a/SabreTools.Models/Internal/Info.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("info"), XmlRoot("info")] - public class Info : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - /// string - public const string ValueKey = "value"; - - #endregion - - public Info() => Type = ItemType.Info; - } -} diff --git a/SabreTools.Models/Internal/Input.cs b/SabreTools.Models/Internal/Input.cs deleted file mode 100644 index 3fef021e..00000000 --- a/SabreTools.Models/Internal/Input.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("input"), XmlRoot("input")] - public class Input : DatItem - { - #region Keys - - /// long - public const string ButtonsKey = "buttons"; - - /// long - public const string CoinsKey = "coins"; - - /// string / Control[] - public const string ControlKey = "control"; - - /// long - public const string PlayersKey = "players"; - - /// (yes|no) "no" - public const string ServiceKey = "service"; - - /// (yes|no) "no" - public const string TiltKey = "tilt"; - - #endregion - - public Input() => Type = ItemType.Input; - } -} diff --git a/SabreTools.Models/Internal/Instance.cs b/SabreTools.Models/Internal/Instance.cs deleted file mode 100644 index 73433a80..00000000 --- a/SabreTools.Models/Internal/Instance.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("instance"), XmlRoot("instance")] - public class Instance : DatItem - { - #region Keys - - /// string - public const string BriefNameKey = "briefname"; - - /// string - public const string NameKey = "name"; - - #endregion - - public Instance() => Type = ItemType.Instance; - } -} diff --git a/SabreTools.Models/Internal/ItemType.cs b/SabreTools.Models/Internal/ItemType.cs deleted file mode 100644 index 581594ae..00000000 --- a/SabreTools.Models/Internal/ItemType.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace SabreTools.Models.Internal -{ - /// - /// Determine what type of file an item is - /// - public enum ItemType - { - /// - /// This is a fake flag that is used for filter only - /// - NULL = 0, - - Adjuster, - Analog, - Archive, - BiosSet, - Chip, - Condition, - Configuration, - ConfLocation, - ConfSetting, - Control, - DataArea, - Device, - DeviceRef, - DipLocation, - DipSwitch, - DipValue, - Disk, - DiskArea, - Display, - Driver, - Dump, - Extension, - Feature, - Info, - Input, - Instance, - Media, - Original, - Part, - Port, - RamOption, - Release, - Rom, - Sample, - SharedFeat, - Slot, - SlotOption, - Software, - SoftwareList, - Sound, - Video, - - /// - /// This is not a real type, only used internally - /// - Blank = int.MaxValue, - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/Machine.cs b/SabreTools.Models/Internal/Machine.cs deleted file mode 100644 index 35f23d1e..00000000 --- a/SabreTools.Models/Internal/Machine.cs +++ /dev/null @@ -1,272 +0,0 @@ -namespace SabreTools.Models.Internal -{ - /// - /// Format-agnostic representation of game, machine, and set data - /// - public class Machine : DictionaryBase - { - #region Keys - - /// Adjuster[] - [NoFilter] - public const string AdjusterKey = "adjuster"; - - /// Archive[] - [NoFilter] - public const string ArchiveKey = "archive"; - - /// BiosSet[] - [NoFilter] - public const string BiosSetKey = "biosset"; - - /// string - public const string BoardKey = "board"; - - /// string - public const string ButtonsKey = "buttons"; - - /// string, string[] - public const string CategoryKey = "category"; - - /// Chip[] - [NoFilter] - public const string ChipKey = "chip"; - - /// string - public const string CloneOfKey = "cloneof"; - - /// string - public const string CloneOfIdKey = "cloneofid"; - - /// string, string[] - public const string CommentKey = "comment"; - - /// string - public const string CompanyKey = "company"; - - /// Configuration[] - [NoFilter] - public const string ConfigurationKey = "configuration"; - - /// string - public const string ControlKey = "control"; - - /// string - public const string CountryKey = "country"; - - /// string - public const string DescriptionKey = "description"; - - /// Device[] - [NoFilter] - public const string DeviceKey = "device"; - - /// DeviceRef[] - [NoFilter] - public const string DeviceRefKey = "device_ref"; - - /// DipSwitch[] - [NoFilter] - public const string DipSwitchKey = "dipswitch"; - - /// string - public const string DirNameKey = "dirName"; - - /// Disk[] - [NoFilter] - public const string DiskKey = "disk"; - - /// string - public const string DisplayCountKey = "displaycount"; - - /// Display[] - [NoFilter] - public const string DisplayKey = "display"; - - /// string - public const string DisplayTypeKey = "displaytype"; - - /// Driver - [NoFilter] - public const string DriverKey = "driver"; - - /// Dump[] - [NoFilter] - public const string DumpKey = "dump"; - - /// string - public const string DuplicateIDKey = "duplicateID"; - - /// string - public const string EmulatorKey = "emulator"; - - /// string - public const string ExtraKey = "extra"; - - /// string - public const string FavoriteKey = "favorite"; - - /// Feature[] - [NoFilter] - public const string FeatureKey = "feature"; - - /// string - public const string GenMSXIDKey = "genmsxid"; - - /// string - public const string HistoryKey = "history"; - - /// string - public const string IdKey = "id"; - - /// string - public const string Im1CRCKey = "im1CRC"; - - /// string - public const string Im2CRCKey = "im2CRC"; - - /// string - public const string ImageNumberKey = "imageNumber"; - - /// Info[] - [NoFilter] - public const string InfoKey = "info"; - - /// Input - [NoFilter] - public const string InputKey = "input"; - - /// (yes|no) "no" - public const string IsBiosKey = "isbios"; - - /// (yes|no) "no" - public const string IsDeviceKey = "isdevice"; - - /// (yes|no) "no" - public const string IsMechanicalKey = "ismechanical"; - - /// string - public const string LanguageKey = "language"; - - /// string - public const string LocationKey = "location"; - - /// string - public const string ManufacturerKey = "manufacturer"; - - /// Media[] - [NoFilter] - public const string MediaKey = "media"; - - /// string - public const string NameKey = "name"; - - /// string - public const string NotesKey = "notes"; - - /// Part[] - [NoFilter] - public const string PartKey = "part"; - - /// string - public const string PlayedCountKey = "playedcount"; - - /// string - public const string PlayedTimeKey = "playedtime"; - - /// string - public const string PlayersKey = "players"; - - /// Port[] - [NoFilter] - public const string PortKey = "port"; - - /// string - public const string PublisherKey = "publisher"; - - /// RamOption[] - [NoFilter] - public const string RamOptionKey = "ramoption"; - - /// string - public const string RebuildToKey = "rebuildto"; - - /// Release[] - [NoFilter] - public const string ReleaseKey = "release"; - - /// string - public const string ReleaseNumberKey = "releaseNumber"; - - /// Rom[] - [NoFilter] - public const string RomKey = "rom"; - - /// string - public const string RomOfKey = "romof"; - - /// string - public const string RotationKey = "rotation"; - - /// (yes|no) "no" - public const string RunnableKey = "runnable"; - - /// Sample[] - [NoFilter] - public const string SampleKey = "sample"; - - /// string - public const string SampleOfKey = "sampleof"; - - /// string - public const string SaveTypeKey = "saveType"; - - /// SharedFeat[] - [NoFilter] - public const string SharedFeatKey = "sharedfeat"; - - /// Slot[] - [NoFilter] - public const string SlotKey = "slot"; - - /// SoftwareList[] - [NoFilter] - public const string SoftwareListKey = "softwarelist"; - - /// Sound - [NoFilter] - public const string SoundKey = "sound"; - - /// string - public const string SourceFileKey = "sourcefile"; - - /// string - public const string SourceRomKey = "sourceRom"; - - /// string - public const string StatusKey = "status"; - - /// (yes|partial|no) "yes" - public const string SupportedKey = "supported"; - - /// string - public const string SystemKey = "system"; - - /// string - public const string TagsKey = "tags"; - - /// TODO: This needs an internal model OR mapping to fields - /// Trurip - [NoFilter] - public const string TruripKey = "trurip"; - - /// Video[] - [NoFilter] - public const string VideoKey = "video"; - - /// string - public const string YearKey = "year"; - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/Media.cs b/SabreTools.Models/Internal/Media.cs deleted file mode 100644 index e05d01c6..00000000 --- a/SabreTools.Models/Internal/Media.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("media"), XmlRoot("media")] - public class Media : DatItem - { - #region Keys - - /// string - public const string MD5Key = "md5"; - - /// string - public const string NameKey = "name"; - - /// string - public const string SHA1Key = "sha1"; - - /// string - public const string SHA256Key = "sha256"; - - /// string - public const string SpamSumKey = "spamsum"; - - #endregion - - public Media() => Type = ItemType.Media; - } -} diff --git a/SabreTools.Models/Internal/MetadataFile.cs b/SabreTools.Models/Internal/MetadataFile.cs deleted file mode 100644 index 0b1f5fc0..00000000 --- a/SabreTools.Models/Internal/MetadataFile.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace SabreTools.Models.Internal -{ - /// - /// Format-agnostic representation of a full metadata file - /// - public class MetadataFile : DictionaryBase - { - #region Keys - - /// Machine[] - [NoFilter] - public const string MachineKey = "machine"; - - /// Header - [NoFilter] - public const string HeaderKey = "header"; - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Internal/Original.cs b/SabreTools.Models/Internal/Original.cs deleted file mode 100644 index 37146565..00000000 --- a/SabreTools.Models/Internal/Original.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("original"), XmlRoot("original")] - public class Original : DatItem - { - #region Keys - - /// string - public const string ContentKey = "content"; - - /// bool - public const string ValueKey = "value"; - - #endregion - - public Original() => Type = ItemType.Original; - } -} diff --git a/SabreTools.Models/Internal/Part.cs b/SabreTools.Models/Internal/Part.cs deleted file mode 100644 index 461623d3..00000000 --- a/SabreTools.Models/Internal/Part.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("part"), XmlRoot("part")] - public class Part : DatItem - { - #region Keys - - /// DataArea[] - [NoFilter] - public const string DataAreaKey = "dataarea"; - - /// DiskArea[] - [NoFilter] - public const string DiskAreaKey = "diskarea"; - - /// DipSwitch[] - [NoFilter] - public const string DipSwitchKey = "dipswitch"; - - /// Feature[] - [NoFilter] - public const string FeatureKey = "feature"; - - /// string - public const string InterfaceKey = "interface"; - - /// string - public const string NameKey = "name"; - - #endregion - - public Part() => Type = ItemType.Part; - } -} diff --git a/SabreTools.Models/Internal/Port.cs b/SabreTools.Models/Internal/Port.cs deleted file mode 100644 index 231168c6..00000000 --- a/SabreTools.Models/Internal/Port.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("port"), XmlRoot("port")] - public class Port : DatItem - { - #region Keys - - /// Analog[] - [NoFilter] - public const string AnalogKey = "analog"; - - /// string - public const string TagKey = "tag"; - - #endregion - - public Port() => Type = ItemType.Port; - } -} diff --git a/SabreTools.Models/Internal/RamOption.cs b/SabreTools.Models/Internal/RamOption.cs deleted file mode 100644 index de59581c..00000000 --- a/SabreTools.Models/Internal/RamOption.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("ramoption"), XmlRoot("ramoption")] - public class RamOption : DatItem - { - #region Keys - - /// string - public const string ContentKey = "content"; - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// string - public const string NameKey = "name"; - - #endregion - - public RamOption() => Type = ItemType.RamOption; - } -} diff --git a/SabreTools.Models/Internal/Release.cs b/SabreTools.Models/Internal/Release.cs deleted file mode 100644 index b2ae41b9..00000000 --- a/SabreTools.Models/Internal/Release.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("release"), XmlRoot("release")] - public class Release : DatItem - { - #region Keys - - /// string - public const string DateKey = "date"; - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// string - public const string LanguageKey = "language"; - - /// string - public const string NameKey = "name"; - - /// string - public const string RegionKey = "region"; - - #endregion - - public Release() => Type = ItemType.Release; - } -} diff --git a/SabreTools.Models/Internal/Rom.cs b/SabreTools.Models/Internal/Rom.cs deleted file mode 100644 index 9dfd05e5..00000000 --- a/SabreTools.Models/Internal/Rom.cs +++ /dev/null @@ -1,285 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("rom"), XmlRoot("rom")] - public class Rom : DatItem - { - #region Keys - - /// string; ArchiveDotOrg.File - public const string AlbumKey = "album"; - - /// string; AttractMode.Row - public const string AltRomnameKey = "alt_romname"; - - /// string; AttractMode.Row - public const string AltTitleKey = "alt_title"; - - /// string; ArchiveDotOrg.File - public const string ArtistKey = "artist"; - - /// string; ArchiveDotOrg.File - public const string ASRDetectedLangKey = "asr_detected_lang"; - - /// string; ArchiveDotOrg.File - public const string ASRDetectedLangConfKey = "asr_detected_lang_conf"; - - /// string; ArchiveDotOrg.File - public const string ASRTranscribedLangKey = "asr_transcribed_lang"; - - /// string - public const string BiosKey = "bios"; - - /// string; ArchiveDotOrg.File - public const string BitrateKey = "bitrate"; - - /// string; ArchiveDotOrg.File - public const string BitTorrentMagnetHashKey = "btih"; - - /// string; ArchiveDotOrg.File - public const string ClothCoverDetectionModuleVersionKey = "cloth_cover_detection_module_version"; - - /// string; ArchiveDotOrg.File - public const string CollectionCatalogNumberKey = "collection-catalog-number"; - - /// string; ArchiveDotOrg.File - public const string CommentKey = "comment"; - - /// string; Also "crc32" in ArchiveDotOrg.File - public const string CRCKey = "crc"; - - /// string; ArchiveDotOrg.File - public const string CreatorKey = "creator"; - - /// string - public const string DateKey = "date"; - - /// (yes|no) "no" - public const string DisposeKey = "dispose"; - - /// string; OfflineList.FileRomCRC - public const string ExtensionKey = "extension"; - - /// long; ArchiveDotOrg.File - public const string FileCountKey = "filecount"; - - /// bool; AttractMode.Row - public const string FileIsAvailableKey = "file_is_available"; - - /// string - public const string FlagsKey = "flags"; - - /// string; ArchiveDotOrg.File - public const string FormatKey = "format"; - - /// string - public const string HeaderKey = "header"; - - /// string, possibly long; ArchiveDotOrg.File - public const string HeightKey = "height"; - - /// string; ArchiveDotOrg.File - public const string hOCRCharToWordhOCRVersionKey = "hocr_char_to_word_hocr_version"; - - /// string; ArchiveDotOrg.File - public const string hOCRCharToWordModuleVersionKey = "hocr_char_to_word_module_version"; - - /// string; ArchiveDotOrg.File - public const string hOCRFtsTexthOCRVersionKey = "hocr_fts_text_hocr_version"; - - /// string; ArchiveDotOrg.File - public const string hOCRFtsTextModuleVersionKey = "hocr_fts_text_module_version"; - - /// string; ArchiveDotOrg.File - public const string hOCRPageIndexhOCRVersionKey = "hocr_pageindex_hocr_version"; - - /// string; ArchiveDotOrg.File - public const string hOCRPageIndexModuleVersionKey = "hocr_pageindex_module_version"; - - /// (yes|no) "no" - public const string InvertedKey = "inverted"; - - /// long; ArchiveDotOrg.File - public const string LastModifiedTimeKey = "mtime"; - - /// string, possibly long; Also in ArchiveDotOrg.File - public const string LengthKey = "length"; - - /// (load16_byte|load16_word|load16_word_swap|load32_byte|load32_word|load32_word_swap|load32_dword|load64_word|load64_word_swap|reload|fill|continue|reload_plain|ignore) - public const string LoadFlagKey = "loadflag"; - - /// string; ArchiveDotOrg.File - public const string MatrixNumberKey = "matrix_number"; - - /// string - public const string MD5Key = "md5"; - - /// string; OpenMSX.RomBase - public const string OpenMSXMediaType = "mediatype"; - - /// string - public const string MergeKey = "merge"; - - /// (yes|no) "no" - public const string MIAKey = "mia"; - - /// string - public const string NameKey = "name"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRKey = "ocr"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRConvertedKey = "ocr_converted"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRDetectedLangKey = "ocr_detected_lang"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRDetectedLangConfKey = "ocr_detected_lang_conf"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRDetectedScriptKey = "ocr_detected_script"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRDetectedScriptConfKey = "ocr_detected_script_conf"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRModuleVersionKey = "ocr_module_version"; - - /// string; ArchiveDotOrg.File - public const string TesseractOCRParametersKey = "ocr_parameters"; - - /// string, possibly long; Originally "offs" - public const string OffsetKey = "offset"; - - /// (yes|no) "no" - public const string OptionalKey = "optional"; - - /// string; ArchiveDotOrg.File - public const string OriginalKey = "original"; - - /// string; ArchiveDotOrg.File - public const string PDFModuleVersionKey = "pdf_module_version"; - - /// string; ArchiveDotOrg.File - public const string PreviewImageKey = "preview-image"; - - /// string; ArchiveDotOrg.File - public const string PublisherKey = "publisher"; - - /// string - public const string RegionKey = "region"; - - /// string; OpenMSX.RomBase - public const string RemarkKey = "remark"; - - /// string, possibly long; ArchiveDotOrg.File - public const string RotationKey = "rotation"; - - /// string - public const string SerialKey = "serial"; - - /// string - public const string SHA1Key = "sha1"; - - /// string - public const string SHA256Key = "sha256"; - - /// string - public const string SHA384Key = "sha384"; - - /// string - public const string SHA512Key = "sha512"; - - /// long - public const string SizeKey = "size"; - - /// (yes|no) "no" - public const string SoundOnlyKey = "soundonly"; - - /// string; ArchiveDotOrg.File - public const string SourceKey = "source"; - - /// string - public const string SpamSumKey = "spamsum"; - - /// string, possibly long; OpenMSX.RomBase - public const string StartKey = "start"; - - /// (baddump|nodump|good|verified) "good" - public const string StatusKey = "status"; - - /// string; ArchiveDotOrg.File - public const string SummationKey = "summation"; - - /// string; ArchiveDotOrg.File - public const string TitleKey = "title"; - - /// string, possibly long; ArchiveDotOrg.File - public const string TrackKey = "track"; - - /// string; OpenMSX.RomBase - public const string OpenMSXType = "type"; - - /// string - public const string ValueKey = "value"; - - /// string; ArchiveDotOrg.File - public const string WhisperASRModuleVersionKey = "whisper_asr_module_version"; - - /// string; ArchiveDotOrg.File - public const string WhisperModelHashKey = "whisper_model_hash"; - - /// string; ArchiveDotOrg.File - public const string WhisperModelNameKey = "whisper_model_name"; - - /// string; ArchiveDotOrg.File - public const string WhisperVersionKey = "whisper_version"; - - /// string, possibly long; ArchiveDotOrg.File - public const string WidthKey = "width"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval0To10Key = "word_conf_0_10"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval11To20Key = "word_conf_11_20"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval21To30Key = "word_conf_21_30"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval31To40Key = "word_conf_31_40"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval41To50Key = "word_conf_41_50"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval51To60Key = "word_conf_51_60"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval61To70Key = "word_conf_61_70"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval71To80Key = "word_conf_71_80"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval81To90Key = "word_conf_81_90"; - - /// string; ArchiveDotOrg.File - public const string WordConfidenceInterval91To100Key = "word_conf_91_100"; - - /// string - public const string xxHash364Key = "xxh3_64"; - - /// string - public const string xxHash3128Key = "xxh3_128"; - - #endregion - - public Rom() => Type = ItemType.Rom; - } -} diff --git a/SabreTools.Models/Internal/Sample.cs b/SabreTools.Models/Internal/Sample.cs deleted file mode 100644 index 0274546c..00000000 --- a/SabreTools.Models/Internal/Sample.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("sample"), XmlRoot("sample")] - public class Sample : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - #endregion - - public Sample() => Type = ItemType.Sample; - } -} diff --git a/SabreTools.Models/Internal/SharedFeat.cs b/SabreTools.Models/Internal/SharedFeat.cs deleted file mode 100644 index bccaa275..00000000 --- a/SabreTools.Models/Internal/SharedFeat.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("sharedfeat"), XmlRoot("sharedfeat")] - public class SharedFeat : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - /// string - public const string ValueKey = "value"; - - #endregion - - public SharedFeat() => Type = ItemType.SharedFeat; - } -} diff --git a/SabreTools.Models/Internal/Slot.cs b/SabreTools.Models/Internal/Slot.cs deleted file mode 100644 index b40abc74..00000000 --- a/SabreTools.Models/Internal/Slot.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("slot"), XmlRoot("slot")] - public class Slot : DatItem - { - #region Keys - - /// string - public const string NameKey = "name"; - - /// SlotOption[] - [NoFilter] - public const string SlotOptionKey = "slotoption"; - - #endregion - - public Slot() => Type = ItemType.Slot; - } -} diff --git a/SabreTools.Models/Internal/SlotOption.cs b/SabreTools.Models/Internal/SlotOption.cs deleted file mode 100644 index daafd2f2..00000000 --- a/SabreTools.Models/Internal/SlotOption.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("slotoption"), XmlRoot("slotoption")] - public class SlotOption : DatItem - { - #region Keys - - /// (yes|no) "no" - public const string DefaultKey = "default"; - - /// string - public const string DevNameKey = "devname"; - - /// string - public const string NameKey = "name"; - - #endregion - - public SlotOption() => Type = ItemType.SlotOption; - } -} diff --git a/SabreTools.Models/Internal/Software.cs b/SabreTools.Models/Internal/Software.cs deleted file mode 100644 index 45e712e9..00000000 --- a/SabreTools.Models/Internal/Software.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("software"), XmlRoot("software")] - public class Software : DatItem - { - #region Keys - - /// string - public const string CloneOfKey = "cloneof"; - - /// string - public const string DescriptionKey = "description"; - - /// Info[] - [NoFilter] - public const string InfoKey = "info"; - - /// string - public const string NameKey = "name"; - - /// string - public const string NotesKey = "notes"; - - /// Part[] - [NoFilter] - public const string PartKey = "part"; - - /// string - public const string PublisherKey = "publisher"; - - /// SharedFeat[] - [NoFilter] - public const string SharedFeatKey = "sharedfeat"; - - /// (yes|partial|no) "yes" - public const string SupportedKey = "supported"; - - /// string - public const string YearKey = "year"; - - #endregion - - public Software() => Type = ItemType.Software; - } -} diff --git a/SabreTools.Models/Internal/SoftwareList.cs b/SabreTools.Models/Internal/SoftwareList.cs deleted file mode 100644 index d7666659..00000000 --- a/SabreTools.Models/Internal/SoftwareList.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("softwarelist"), XmlRoot("softwarelist")] - public class SoftwareList : DatItem - { - #region Keys - - /// string - public const string DescriptionKey = "description"; - - /// string - public const string FilterKey = "filter"; - - /// string - public const string NameKey = "name"; - - /// string - public const string NotesKey = "notes"; - - /// Software[] - [NoFilter] - public const string SoftwareKey = "software"; - - /// (original|compatible) - public const string StatusKey = "status"; - - /// string - public const string TagKey = "tag"; - - #endregion - - public SoftwareList() => Type = ItemType.SoftwareList; - } -} diff --git a/SabreTools.Models/Internal/Sound.cs b/SabreTools.Models/Internal/Sound.cs deleted file mode 100644 index 9251ecf8..00000000 --- a/SabreTools.Models/Internal/Sound.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("sound"), XmlRoot("sound")] - public class Sound : DatItem - { - #region Keys - - /// long - public const string ChannelsKey = "channels"; - - #endregion - - public Sound() => Type = ItemType.Sound; - } -} diff --git a/SabreTools.Models/Internal/Video.cs b/SabreTools.Models/Internal/Video.cs deleted file mode 100644 index a1ff8a39..00000000 --- a/SabreTools.Models/Internal/Video.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml.Serialization; -using Newtonsoft.Json; - -namespace SabreTools.Models.Internal -{ - [JsonObject("video"), XmlRoot("video")] - public class Video : DatItem - { - #region Keys - - /// long - public const string AspectXKey = "aspectx"; - - /// long - public const string AspectYKey = "aspecty"; - - /// long; Originally "y" - public const string HeightKey = "height"; - - /// (vertical|horizontal) - public const string OrientationKey = "orientation"; - - /// double; Originally "freq" - public const string RefreshKey = "refresh"; - - /// (raster|vector) - public const string ScreenKey = "screen"; - - /// long; Originally "x" - public const string WidthKey = "width"; - - #endregion - - public Video() => Type = ItemType.Video; - } -} diff --git a/SabreTools.Models/Listrom/MetadataFile.cs b/SabreTools.Models/Listrom/MetadataFile.cs deleted file mode 100644 index 018e017d..00000000 --- a/SabreTools.Models/Listrom/MetadataFile.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace SabreTools.Models.Listrom -{ - public class MetadataFile - { - public Set[]? Set { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listrom/Row.cs b/SabreTools.Models/Listrom/Row.cs deleted file mode 100644 index 4f3dce97..00000000 --- a/SabreTools.Models/Listrom/Row.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace SabreTools.Models.Listrom -{ - /// - /// ROMs required for driver "testdriver". - /// Name Size Checksum - /// abcd.bin 1024 CRC(00000000) SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) - /// efgh.bin 1024 BAD CRC(00000000) SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) BAD_DUMP - /// ijkl.bin 1024 NO GOOD DUMP KNOWN - /// abcd MD5(d41d8cd98f00b204e9800998ecf8427e) - /// abcd SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) - /// efgh BAD MD5(d41d8cd98f00b204e9800998ecf8427e) BAD_DUMP - /// efgh BAD SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) BAD_DUMP - /// ijkl NO GOOD DUMP KNOWN - /// - public class Row - { - [Required] - public string? Name { get; set; } - - public string? Size { get; set; } - - public bool Bad { get; set; } - - public string? CRC { get; set; } - - public string? MD5 { get; set; } - - public string? SHA1 { get; set; } - - public bool NoGoodDumpKnown { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listrom/Set.cs b/SabreTools.Models/Listrom/Set.cs deleted file mode 100644 index 2d5eaa9b..00000000 --- a/SabreTools.Models/Listrom/Set.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace SabreTools.Models.Listrom -{ - /// - /// ROMs required for driver "testdriver". - /// Name Size Checksum - /// abcd.bin 1024 CRC(00000000) SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) - /// efgh.bin 1024 BAD CRC(00000000) SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) BAD_DUMP - /// ijkl.bin 1024 NO GOOD DUMP KNOWN - /// abcd SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) - /// efgh BAD SHA1(da39a3ee5e6b4b0d3255bfef95601890afd80709) BAD_DUMP - /// ijkl NO GOOD DUMP KNOWN - /// - public class Set - { - public string? Driver { get; set; } - - public string? Device { get; set; } - - public Row[]? Row { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Adjuster.cs b/SabreTools.Models/Listxml/Adjuster.cs deleted file mode 100644 index f5d6de1a..00000000 --- a/SabreTools.Models/Listxml/Adjuster.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("adjuster")] - public class Adjuster - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - [XmlElement("condition")] - public Condition? Condition { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Analog.cs b/SabreTools.Models/Listxml/Analog.cs deleted file mode 100644 index 1effbaf5..00000000 --- a/SabreTools.Models/Listxml/Analog.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("analog")] - public class Analog - { - [Required] - [XmlAttribute("mask")] - public string? Mask { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/BiosSet.cs b/SabreTools.Models/Listxml/BiosSet.cs deleted file mode 100644 index 51dc9e3d..00000000 --- a/SabreTools.Models/Listxml/BiosSet.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("biosset")] - public class BiosSet - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("description")] - public string? Description { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Chip.cs b/SabreTools.Models/Listxml/Chip.cs deleted file mode 100644 index dc722b83..00000000 --- a/SabreTools.Models/Listxml/Chip.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("chip")] - public class Chip - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("tag")] - public string? Tag { get; set; } - - /// (cpu|audio) - [Required] - [XmlAttribute("type")] - public string? Type { get; set; } - - /// Only present in older versions - [XmlAttribute("soundonly")] - public string? SoundOnly { get; set; } - - [XmlAttribute("clock")] - public string? Clock { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Condition.cs b/SabreTools.Models/Listxml/Condition.cs deleted file mode 100644 index ddf02c66..00000000 --- a/SabreTools.Models/Listxml/Condition.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("condition")] - public class Condition - { - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [Required] - [XmlAttribute("mask")] - public string? Mask { get; set; } - - /// (eq|ne|gt|le|lt|ge) - [Required] - [XmlAttribute("relation")] - public string? Relation { get; set; } - - [Required] - [XmlAttribute("value")] - public string? Value { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/ConfLocation.cs b/SabreTools.Models/Listxml/ConfLocation.cs deleted file mode 100644 index 9199c715..00000000 --- a/SabreTools.Models/Listxml/ConfLocation.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("conflocation")] - public class ConfLocation - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// Numeric? - [Required] - [XmlAttribute("number")] - public string? Number { get; set; } - - /// (yes|no) "no" - [XmlAttribute("inverted")] - public string? Inverted { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/ConfSetting.cs b/SabreTools.Models/Listxml/ConfSetting.cs deleted file mode 100644 index 2d3d972d..00000000 --- a/SabreTools.Models/Listxml/ConfSetting.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("confsetting")] - public class ConfSetting - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("value")] - public string? Value { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - [XmlElement("condition")] - public Condition? Condition { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Configuration.cs b/SabreTools.Models/Listxml/Configuration.cs deleted file mode 100644 index 1871ad70..00000000 --- a/SabreTools.Models/Listxml/Configuration.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("configuration")] - public class Configuration - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [XmlAttribute("mask")] - public string? Mask { get; set; } - - [XmlElement("condition")] - public Condition? Condition { get; set; } - - [XmlElement("conflocation")] - public ConfLocation[]? ConfLocation { get; set; } - - [XmlElement("confsetting")] - public ConfSetting[]? ConfSetting { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Control.cs b/SabreTools.Models/Listxml/Control.cs deleted file mode 100644 index c517de7c..00000000 --- a/SabreTools.Models/Listxml/Control.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("control")] - public class Control - { - /// (joy|stick|paddle|pedal|lightgun|positional|dial|trackball|mouse|only_buttons|keypad|keyboard|mahjong|hanafuda|gambling) - [Required] - [XmlAttribute("type")] - public string? Type { get; set; } - - /// Numeric - [XmlAttribute("player")] - public string? Player { get; set; } - - /// Numeric - [XmlAttribute("buttons")] - public string? Buttons { get; set; } - - /// Numeric - [XmlAttribute("reqbuttons")] - public string? ReqButtons { get; set; } - - /// Numeric - [XmlAttribute("minimum")] - public string? Minimum { get; set; } - - /// Numeric - [XmlAttribute("maximum")] - public string? Maximum { get; set; } - - /// Numeric - [XmlAttribute("sensitivity")] - public string? Sensitivity { get; set; } - - /// Numeric - [XmlAttribute("keydelta")] - public string? KeyDelta { get; set; } - - /// (yes|no) "no" - [XmlAttribute("reverse")] - public string? Reverse { get; set; } - - /// Numeric? - [XmlAttribute("ways")] - public string? Ways { get; set; } - - /// Numeric? - [XmlAttribute("ways2")] - public string? Ways2 { get; set; } - - /// Numeric? - [XmlAttribute("ways3")] - public string? Ways3 { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Device.cs b/SabreTools.Models/Listxml/Device.cs deleted file mode 100644 index ceb17d66..00000000 --- a/SabreTools.Models/Listxml/Device.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("device")] - public class Device - { - [Required] - [XmlAttribute("type")] - public string? Type { get; set; } - - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [XmlAttribute("fixed_image")] - public string? FixedImage { get; set; } - - /// Numeric boolean - [XmlAttribute("mandatory")] - public string? Mandatory { get; set; } - - [XmlAttribute("interface")] - public string? Interface { get; set; } - - [XmlElement("instance")] - public Instance? Instance { get; set; } - - [XmlElement("extension")] - public Extension[]? Extension { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/DeviceRef.cs b/SabreTools.Models/Listxml/DeviceRef.cs deleted file mode 100644 index f9b5d8c6..00000000 --- a/SabreTools.Models/Listxml/DeviceRef.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("device_ref")] - public class DeviceRef - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/DipLocation.cs b/SabreTools.Models/Listxml/DipLocation.cs deleted file mode 100644 index adb628d3..00000000 --- a/SabreTools.Models/Listxml/DipLocation.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("diplocation")] - public class DipLocation - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// Numeric? - [Required] - [XmlAttribute("number")] - public string? Number { get; set; } - - /// (yes|no) "no" - [XmlAttribute("inverted")] - public string? Inverted { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/DipSwitch.cs b/SabreTools.Models/Listxml/DipSwitch.cs deleted file mode 100644 index 13ab0d96..00000000 --- a/SabreTools.Models/Listxml/DipSwitch.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("dipswitch")] - public class DipSwitch - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [XmlAttribute("mask")] - public string? Mask { get; set; } - - [XmlElement("condition")] - public Condition? Condition { get; set; } - - [XmlElement("diplocation")] - public DipLocation[]? DipLocation { get; set; } - - [XmlElement("dipvalue")] - public DipValue[]? DipValue { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/DipValue.cs b/SabreTools.Models/Listxml/DipValue.cs deleted file mode 100644 index e48a9838..00000000 --- a/SabreTools.Models/Listxml/DipValue.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("dipvalue")] - public class DipValue - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("value")] - public string? Value { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - [XmlElement("condition")] - public Condition? Condition { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Disk.cs b/SabreTools.Models/Listxml/Disk.cs deleted file mode 100644 index bd979a9b..00000000 --- a/SabreTools.Models/Listxml/Disk.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("disk")] - public class Disk - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// Only present in older versions - [XmlAttribute("md5")] - public string? MD5 { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - [XmlAttribute("merge")] - public string? Merge { get; set; } - - [XmlAttribute("region")] - public string? Region { get; set; } - - /// Numeric? - [XmlAttribute("index")] - public string? Index { get; set; } - - /// (yes|no) "no" - [XmlAttribute("writable")] - public string? Writable { get; set; } - - /// (baddump|nodump|good) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (yes|no) "no" - [XmlAttribute("optional")] - public string? Optional { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Display.cs b/SabreTools.Models/Listxml/Display.cs deleted file mode 100644 index 1763d7fe..00000000 --- a/SabreTools.Models/Listxml/Display.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("display")] - public class Display - { - [XmlAttribute("tag")] - public string? Tag { get; set; } - - /// (raster|vector|lcd|svg|unknown) - [Required] - [XmlAttribute("type")] - public string? Type { get; set; } - - /// (0|90|180|270) - [XmlAttribute("rotate")] - public string? Rotate { get; set; } - - /// (yes|no) "no" - [XmlAttribute("flipx")] - public string? FlipX { get; set; } - - /// Numeric - [XmlAttribute("width")] - public string? Width { get; set; } - - /// Numeric - [XmlAttribute("height")] - public string? Height { get; set; } - - /// Numeric - [Required] - [XmlAttribute("refresh")] - public string? Refresh { get; set; } - - /// Numeric - [XmlAttribute("pixclock")] - public string? PixClock { get; set; } - - /// Numeric - [XmlAttribute("htotal")] - public string? HTotal { get; set; } - - /// Numeric - [XmlAttribute("hbend")] - public string? HBEnd { get; set; } - - /// Numeric - [XmlAttribute("hbstart")] - public string? HBStart { get; set; } - - /// Numeric - [XmlAttribute("vtotal")] - public string? VTotal { get; set; } - - /// Numeric - [XmlAttribute("vbend")] - public string? VBEnd { get; set; } - - /// Numeric - [XmlAttribute("vbstart")] - public string? VBStart { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Driver.cs b/SabreTools.Models/Listxml/Driver.cs deleted file mode 100644 index e4480017..00000000 --- a/SabreTools.Models/Listxml/Driver.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("driver")] - public class Driver - { - /// (good|imperfect|preliminary), (good|preliminary|test) in older versions - [Required] - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (good|imperfect|preliminary), Only present in older versions - [XmlAttribute("color")] - public string? Color { get; set; } - - /// (good|imperfect|preliminary), Only present in older versions - [XmlAttribute("sound")] - public string? Sound { get; set; } - - /// Only present in older versions - [XmlAttribute("palettesize")] - public string? PaletteSize { get; set; } - - /// (good|imperfect|preliminary) - [Required] - [XmlAttribute("emulation")] - public string? Emulation { get; set; } - - /// (good|imperfect|preliminary) - [Required] - [XmlAttribute("cocktail")] - public string? Cocktail { get; set; } - - /// (supported|unsupported) - [Required] - [XmlAttribute("savestate")] - public string? SaveState { get; set; } - - /// (yes|no) "no" - [XmlAttribute("requiresartwork")] - public string? RequiresArtwork { get; set; } - - /// (yes|no) "no" - [XmlAttribute("unofficial")] - public string? Unofficial { get; set; } - - /// (yes|no) "no" - [XmlAttribute("nosoundhardware")] - public string? NoSoundHardware { get; set; } - - /// (yes|no) "no" - [XmlAttribute("incomplete")] - public string? Incomplete { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Extension.cs b/SabreTools.Models/Listxml/Extension.cs deleted file mode 100644 index a73f4909..00000000 --- a/SabreTools.Models/Listxml/Extension.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("extension")] - public class Extension - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Feature.cs b/SabreTools.Models/Listxml/Feature.cs deleted file mode 100644 index 9610218a..00000000 --- a/SabreTools.Models/Listxml/Feature.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("feature")] - public class Feature - { - /// (protection|timing|graphics|palette|sound|capture|camera|microphone|controls|keyboard|mouse|media|disk|printer|tape|punch|drum|rom|comms|lan|wan) - [Required] - [XmlAttribute("type")] - public string? Type { get; set; } - - /// (unemulated|imperfect) - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (unemulated|imperfect) - [XmlAttribute("overall")] - public string? Overall { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Game.cs b/SabreTools.Models/Listxml/Game.cs deleted file mode 100644 index 06bdcbaf..00000000 --- a/SabreTools.Models/Listxml/Game.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("game")] - public class Game : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/GameBase.cs b/SabreTools.Models/Listxml/GameBase.cs deleted file mode 100644 index cbb7444d..00000000 --- a/SabreTools.Models/Listxml/GameBase.cs +++ /dev/null @@ -1,131 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - /// - /// Base class to unify the various game-like types - /// - public abstract class GameBase - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// Machine only - [XmlAttribute("sourcefile")] - public string? SourceFile { get; set; } - - /// (yes|no) "no", Machine only - [XmlAttribute("isbios")] - public string? IsBios { get; set; } - - /// (yes|no) "no", Machine only - [XmlAttribute("isdevice")] - public string? IsDevice { get; set; } - - /// (yes|no) "no", Machine only - [XmlAttribute("ismechanical")] - public string? IsMechanical { get; set; } - - /// (yes|no) "no" - [XmlAttribute("runnable")] - public string? Runnable { get; set; } - - [XmlAttribute("cloneof")] - public string? CloneOf { get; set; } - - [XmlAttribute("romof")] - public string? RomOf { get; set; } - - [XmlAttribute("sampleof")] - public string? SampleOf { get; set; } - - [Required] - [XmlElement("description")] - public string? Description { get; set; } - - [XmlElement("year")] - public string? Year { get; set; } - - [XmlElement("manufacturer")] - public string? Manufacturer { get; set; } - - /// Game only - [XmlElement("history")] - public string? History { get; set; } - - [XmlElement("biosset")] - public BiosSet[]? BiosSet { get; set; } - - [XmlElement("rom")] - public Rom[]? Rom { get; set; } - - [XmlElement("disk")] - public Disk[]? Disk { get; set; } - - [XmlElement("device_ref")] - public DeviceRef[]? DeviceRef { get; set; } - - [XmlElement("sample")] - public Sample[]? Sample { get; set; } - - [XmlElement("chip")] - public Chip[]? Chip { get; set; } - - [XmlElement("display")] - public Display[]? Display { get; set; } - - /// Only present in older versions - [XmlElement("video")] - public Video[]? Video { get; set; } - - [XmlElement("sound")] - public Sound? Sound { get; set; } - - [XmlElement("input")] - public Input? Input { get; set; } - - [XmlElement("dipswitch")] - public DipSwitch[]? DipSwitch { get; set; } - - [XmlElement("configuration")] - public Configuration[]? Configuration { get; set; } - - [XmlElement("port")] - public Port[]? Port { get; set; } - - [XmlElement("adjuster")] - public Adjuster[]? Adjuster { get; set; } - - [XmlElement("driver")] - public Driver? Driver { get; set; } - - [XmlElement("feature")] - public Feature[]? Feature { get; set; } - - [XmlElement("device")] - public Device[]? Device { get; set; } - - [XmlElement("slot")] - public Slot[]? Slot { get; set; } - - [XmlElement("softwarelist")] - public SoftwareList[]? SoftwareList { get; set; } - - [XmlElement("ramoption")] - public RamOption[]? RamOption { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Input.cs b/SabreTools.Models/Listxml/Input.cs deleted file mode 100644 index 26a76c11..00000000 --- a/SabreTools.Models/Listxml/Input.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("input")] - public class Input - { - /// (yes|no) "no" - [XmlAttribute("service")] - public string? Service { get; set; } - - /// (yes|no) "no" - [XmlAttribute("tilt")] - public string? Tilt { get; set; } - - /// Numeric - [Required] - [XmlAttribute("players")] - public string? Players { get; set; } - - /// Only present in older versions - [XmlAttribute("control")] - public string? ControlAttr { get; set; } - - /// Only present in older versions, Numeric? - [XmlAttribute("buttons")] - public string? Buttons { get; set; } - - /// Numeric? - [XmlAttribute("coins")] - public string? Coins { get; set; } - - [XmlElement("control")] - public Control[]? Control { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Instance.cs b/SabreTools.Models/Listxml/Instance.cs deleted file mode 100644 index 9711a791..00000000 --- a/SabreTools.Models/Listxml/Instance.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("instance")] - public class Instance - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("briefname")] - public string? BriefName { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/M1.cs b/SabreTools.Models/Listxml/M1.cs deleted file mode 100644 index a5529ad7..00000000 --- a/SabreTools.Models/Listxml/M1.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("m1")] - public class M1 - { - [XmlAttribute("version")] - public string? Version { get; set; } - - [XmlElement("machine", typeof(Machine))] - [XmlElement("game", typeof(Game))] - public GameBase[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Machine.cs b/SabreTools.Models/Listxml/Machine.cs deleted file mode 100644 index d4cedaa3..00000000 --- a/SabreTools.Models/Listxml/Machine.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("machine")] - public class Machine : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Mame.cs b/SabreTools.Models/Listxml/Mame.cs deleted file mode 100644 index 00117be0..00000000 --- a/SabreTools.Models/Listxml/Mame.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("mame")] - public class Mame - { - [XmlAttribute("build")] - public string? Build { get; set; } - - /// (yes|no) "no" - [XmlAttribute("debug")] - public string? Debug { get; set; } - - [Required] - [XmlAttribute("mameconfig")] - public string? MameConfig { get; set; } - - [XmlElement("machine", typeof(Machine))] - [XmlElement("game", typeof(Game))] - public GameBase[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Port.cs b/SabreTools.Models/Listxml/Port.cs deleted file mode 100644 index fe4a6c65..00000000 --- a/SabreTools.Models/Listxml/Port.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("port")] - public class Port - { - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [XmlElement("analog")] - public Analog[]? Analog { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/RamOption.cs b/SabreTools.Models/Listxml/RamOption.cs deleted file mode 100644 index a6a7603f..00000000 --- a/SabreTools.Models/Listxml/RamOption.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("ramoption")] - public class RamOption - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("default")] - public string? Default { get; set; } - - [XmlText] - public string? Content { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Rom.cs b/SabreTools.Models/Listxml/Rom.cs deleted file mode 100644 index 9f978fe9..00000000 --- a/SabreTools.Models/Listxml/Rom.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("rom")] - public class Rom - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("bios")] - public string? Bios { get; set; } - - /// Numeric - [Required] - [XmlAttribute("size")] - public string? Size { get; set; } - - [XmlAttribute("crc")] - public string? CRC { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - [XmlAttribute("merge")] - public string? Merge { get; set; } - - [XmlAttribute("region")] - public string? Region { get; set; } - - /// Numeric - [XmlAttribute("offset")] - public string? Offset { get; set; } - - /// (baddump|nodump|good) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (yes|no) "no" - [XmlAttribute("optional")] - public string? Optional { get; set; } - - /// (yes|no) "no", Only present in older versions - [XmlAttribute("dispose")] - public string? Dispose { get; set; } - - /// (yes|no) "no", Only present in older versions - [XmlAttribute("soundonly")] - public string? SoundOnly { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Sample.cs b/SabreTools.Models/Listxml/Sample.cs deleted file mode 100644 index fdfd56bd..00000000 --- a/SabreTools.Models/Listxml/Sample.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("sample")] - public class Sample - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Slot.cs b/SabreTools.Models/Listxml/Slot.cs deleted file mode 100644 index 945194af..00000000 --- a/SabreTools.Models/Listxml/Slot.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("slot")] - public class Slot - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlElement("slotoption")] - public SlotOption[]? SlotOption { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/SlotOption.cs b/SabreTools.Models/Listxml/SlotOption.cs deleted file mode 100644 index b47b8273..00000000 --- a/SabreTools.Models/Listxml/SlotOption.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("slotoption")] - public class SlotOption - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("devname")] - public string? DevName { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/SoftwareList.cs b/SabreTools.Models/Listxml/SoftwareList.cs deleted file mode 100644 index 7ae155b1..00000000 --- a/SabreTools.Models/Listxml/SoftwareList.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("softwarelist")] - public class SoftwareList - { - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// (original|compatible) - [Required] - [XmlAttribute("status")] - public string? Status { get; set; } - - [XmlAttribute("filter")] - public string? Filter { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Sound.cs b/SabreTools.Models/Listxml/Sound.cs deleted file mode 100644 index 5b6c25d8..00000000 --- a/SabreTools.Models/Listxml/Sound.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("sound")] - public class Sound - { - /// Numeric - [Required] - [XmlAttribute("channels")] - public string? Channels { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Listxml/Video.cs b/SabreTools.Models/Listxml/Video.cs deleted file mode 100644 index f50d399f..00000000 --- a/SabreTools.Models/Listxml/Video.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Listxml -{ - [XmlRoot("video")] - public class Video - { - /// (raster|vector) - [Required] - [XmlAttribute("screen")] - public string? Screen { get; set; } - - /// (vertical|horizontal) - [Required] - [XmlAttribute("orientation")] - public string? Orientation { get; set; } - - /// Numeric - [XmlAttribute("width")] - public string? Width { get; set; } - - /// Numeric - [XmlAttribute("height")] - public string? Height { get; set; } - - /// Numeric - [XmlAttribute("aspectx")] - public string? AspectX { get; set; } - - /// Numeric - [XmlAttribute("aspecty")] - public string? AspectY { get; set; } - - /// Numeric - [XmlAttribute("refresh")] - public string? Refresh { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Archive.cs b/SabreTools.Models/Logiqx/Archive.cs deleted file mode 100644 index 60889b0c..00000000 --- a/SabreTools.Models/Logiqx/Archive.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("archive")] - public class Archive - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/BiosSet.cs b/SabreTools.Models/Logiqx/BiosSet.cs deleted file mode 100644 index 2695739b..00000000 --- a/SabreTools.Models/Logiqx/BiosSet.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("biosset")] - public class BiosSet - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("description")] - public string? Description { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/ClrMamePro.cs b/SabreTools.Models/Logiqx/ClrMamePro.cs deleted file mode 100644 index d20b197a..00000000 --- a/SabreTools.Models/Logiqx/ClrMamePro.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("clrmamepro")] - public class ClrMamePro - { - [XmlAttribute("header")] - public string? Header { get; set; } - - /// (none|split|merged|nonmerged|fullmerged|device|full) "split" - [XmlAttribute("forcemerging")] - public string? ForceMerging { get; set; } - - /// (obsolete|required|ignore) "obsolete" - [XmlAttribute("forcenodump")] - public string? ForceNodump { get; set; } - - /// (zip|unzip) "zip" - [XmlAttribute("forcepacking")] - public string? ForcePacking { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Datafile.cs b/SabreTools.Models/Logiqx/Datafile.cs deleted file mode 100644 index 220c1704..00000000 --- a/SabreTools.Models/Logiqx/Datafile.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("datafile")] - public class Datafile - { - [XmlAttribute("build")] - public string? Build { get; set; } - - /// (yes|no) "no" - [XmlAttribute("debug")] - public string? Debug { get; set; } - - /// No-Intro extension - [XmlAttribute(Namespace = "http://www.w3.org/2001/XMLSchema-instance", AttributeName = "schemaLocation")] - public string? SchemaLocation { get; set; } - - [XmlElement("header")] - public Header? Header { get; set; } - - [XmlElement("game", typeof(Game))] - [XmlElement("machine", typeof(Machine))] - public GameBase[]? Game { get; set; } - - /// RomVault extension - [XmlElement("dir")] - public Dir[]? Dir { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/DeviceRef.cs b/SabreTools.Models/Logiqx/DeviceRef.cs deleted file mode 100644 index 7d6ae1b6..00000000 --- a/SabreTools.Models/Logiqx/DeviceRef.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("device_ref")] - public class DeviceRef - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Dir.cs b/SabreTools.Models/Logiqx/Dir.cs deleted file mode 100644 index 75418ec9..00000000 --- a/SabreTools.Models/Logiqx/Dir.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("dir")] - public class Dir - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlElement("game", typeof(Game))] - [XmlElement("machine", typeof(Machine))] - public GameBase[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Disk.cs b/SabreTools.Models/Logiqx/Disk.cs deleted file mode 100644 index 957ff810..00000000 --- a/SabreTools.Models/Logiqx/Disk.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("disk")] - public class Disk - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("md5")] - public string? MD5 { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - [XmlAttribute("merge")] - public string? Merge { get; set; } - - /// (baddump|nodump|good|verified) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// MAME extension - [XmlAttribute("region")] - public string? Region { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Driver.cs b/SabreTools.Models/Logiqx/Driver.cs deleted file mode 100644 index 823605c0..00000000 --- a/SabreTools.Models/Logiqx/Driver.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("driver")] - public class Driver - { - /// (good|imperfect|preliminary) - [Required] - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (good|imperfect|preliminary) - [Required] - [XmlAttribute("emulation")] - public string? Emulation { get; set; } - - /// (good|imperfect|preliminary) - [Required] - [XmlAttribute("cocktail")] - public string? Cocktail { get; set; } - - /// (supported|unsupported) - [Required] - [XmlAttribute("savestate")] - public string? SaveState { get; set; } - - /// (yes|no) "no" - [XmlAttribute("requiresartwork")] - public string? RequiresArtwork { get; set; } - - /// (yes|no) "no" - [XmlAttribute("unofficial")] - public string? Unofficial { get; set; } - - /// (yes|no) "no" - [XmlAttribute("nosoundhardware")] - public string? NoSoundHardware { get; set; } - - /// (yes|no) "no" - [XmlAttribute("incomplete")] - public string? Incomplete { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Game.cs b/SabreTools.Models/Logiqx/Game.cs deleted file mode 100644 index 9e60cf05..00000000 --- a/SabreTools.Models/Logiqx/Game.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("game")] - public class Game : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/GameBase.cs b/SabreTools.Models/Logiqx/GameBase.cs deleted file mode 100644 index cdaf2409..00000000 --- a/SabreTools.Models/Logiqx/GameBase.cs +++ /dev/null @@ -1,127 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - /// - /// Base class to unify the various game-like types - /// - public abstract class GameBase - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("sourcefile")] - public string? SourceFile { get; set; } - - /// (yes|no) "no" - [XmlAttribute("isbios")] - public string? IsBios { get; set; } - - /// (yes|no) "no", MAME extension - [XmlAttribute("isdevice")] - public string? IsDevice { get; set; } - - /// (yes|no) "no", MAME extension - [XmlAttribute("ismechanical")] - public string? IsMechanical { get; set; } - - [XmlAttribute("cloneof")] - public string? CloneOf { get; set; } - - [XmlAttribute("romof")] - public string? RomOf { get; set; } - - [XmlAttribute("sampleof")] - public string? SampleOf { get; set; } - - [XmlAttribute("board")] - public string? Board { get; set; } - - [XmlAttribute("rebuildto")] - public string? RebuildTo { get; set; } - - /// No-Intro extension - [XmlAttribute("id")] - public string? Id { get; set; } - - /// No-Intro extension - [XmlAttribute("cloneofid")] - public string? CloneOfId { get; set; } - - /// (no|partial|yes) "no" - [XmlAttribute("runnable")] - public string? Runnable { get; set; } - - [XmlElement("comment")] - public string[]? Comment { get; set; } - - [Required] - [XmlElement("description")] - public string? Description { get; set; } - - [XmlElement("year")] - public string? Year { get; set; } - - [XmlElement("manufacturer")] - public string? Manufacturer { get; set; } - - [XmlElement("publisher")] - public string? Publisher { get; set; } - - /// No-Intro extension includes more than 1 instance - [XmlElement("category")] - public string[]? Category { get; set; } - - /// Trurip extension - [XmlElement("trurip")] - public Trurip? Trurip { get; set; } - - [XmlElement(elementName: "release")] - public Release[]? Release { get; set; } - - [XmlElement("biosset")] - public BiosSet[]? BiosSet { get; set; } - - [XmlElement("rom")] - public Rom[]? Rom { get; set; } - - [XmlElement("disk")] - public Disk[]? Disk { get; set; } - - /// Aaru extension - [XmlElement("media")] - public Media[]? Media { get; set; } - - /// MAME extension - [XmlElement("device_ref")] - public DeviceRef[]? DeviceRef { get; set; } - - [XmlElement("sample")] - public Sample[]? Sample { get; set; } - - [XmlElement("archive")] - public Archive[]? Archive { get; set; } - - /// MAME extension - [XmlElement("driver")] - public Driver? Driver { get; set; } - - /// MAME extension - [XmlElement("softwarelist")] - public SoftwareList[]? SoftwareList { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Header.cs b/SabreTools.Models/Logiqx/Header.cs deleted file mode 100644 index 8dd020b1..00000000 --- a/SabreTools.Models/Logiqx/Header.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("header")] - public class Header - { - /// No-Intro extension - [XmlElement("id")] - public string? Id { get; set; } - - [Required] - [XmlElement("name")] - public string? Name { get; set; } - - [Required] - [XmlElement("description")] - public string? Description { get; set; } - - /// Trurip extension - [XmlElement("rootdir")] - public string? RootDir { get; set; } - - [XmlElement("category")] - public string? Category { get; set; } - - [Required] - [XmlElement("version")] - public string? Version { get; set; } - - [XmlElement("date")] - public string? Date { get; set; } - - [Required] - [XmlElement("author")] - public string? Author { get; set; } - - [XmlElement("email")] - public string? Email { get; set; } - - [XmlElement("homepage")] - public string? Homepage { get; set; } - - [XmlElement("url")] - public string? Url { get; set; } - - [XmlElement("comment")] - public string? Comment { get; set; } - - /// Trurip extension - [XmlElement("type")] - public string? Type { get; set; } - - [XmlElement("clrmamepro")] - public ClrMamePro? ClrMamePro { get; set; } - - [XmlElement("romcenter")] - public RomCenter? RomCenter { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Machine.cs b/SabreTools.Models/Logiqx/Machine.cs deleted file mode 100644 index 784be1b0..00000000 --- a/SabreTools.Models/Logiqx/Machine.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("machine")] - public class Machine : GameBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Media.cs b/SabreTools.Models/Logiqx/Media.cs deleted file mode 100644 index d13fdf75..00000000 --- a/SabreTools.Models/Logiqx/Media.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("media")] - public class Media - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("md5")] - public string? MD5 { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - [XmlAttribute("sha256")] - public string? SHA256 { get; set; } - - [XmlAttribute("spamsum")] - public string? SpamSum { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Release.cs b/SabreTools.Models/Logiqx/Release.cs deleted file mode 100644 index b44fa76b..00000000 --- a/SabreTools.Models/Logiqx/Release.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("release")] - public class Release - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("region")] - public string? Region { get; set; } - - [XmlAttribute("language")] - public string? Language { get; set; } - - [XmlAttribute("date")] - public string? Date { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Rom.cs b/SabreTools.Models/Logiqx/Rom.cs deleted file mode 100644 index 6866113e..00000000 --- a/SabreTools.Models/Logiqx/Rom.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("rom")] - public class Rom - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("size")] - public string? Size { get; set; } - - [XmlAttribute("crc")] - public string? CRC { get; set; } - - [XmlAttribute("md5")] - public string? MD5 { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - /// Hash/No-Intro extension - [XmlAttribute("sha256")] - public string? SHA256 { get; set; } - - /// Hash extension - [XmlAttribute("sha384")] - public string? SHA384 { get; set; } - - /// Hash extension - [XmlAttribute("sha512")] - public string? SHA512 { get; set; } - - /// Hash extension - [XmlAttribute("spamsum")] - public string? SpamSum { get; set; } - - /// DiscImgeCreator extension - [XmlAttribute("xxh3_64")] - public string? xxHash364 { get; set; } - - /// DiscImgeCreator extension - [XmlAttribute("xxh3_128")] - public string? xxHash3128 { get; set; } - - [XmlAttribute("merge")] - public string? Merge { get; set; } - - /// (baddump|nodump|good|verified) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// No-Intro extension - [XmlAttribute("serial")] - public string? Serial { get; set; } - - /// No-Intro extension - [XmlAttribute("header")] - public string? Header { get; set; } - - [XmlAttribute("date")] - public string? Date { get; set; } - - /// Boolean; RomVault extension - [XmlAttribute("inverted")] - public string? Inverted { get; set; } - - /// Boolean; RomVault extension - [XmlAttribute("mia")] - public string? MIA { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/RomCenter.cs b/SabreTools.Models/Logiqx/RomCenter.cs deleted file mode 100644 index 2675acca..00000000 --- a/SabreTools.Models/Logiqx/RomCenter.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("romcenter")] - public class RomCenter - { - [XmlAttribute("plugin")] - public string? Plugin { get; set; } - - /// (none|split|merged|unmerged|fullmerged|device|full) "split" - [XmlAttribute("rommode")] - public string? RomMode { get; set; } - - /// (none|split|merged|unmerged|fullmerged|device|full) "split" - [XmlAttribute("biosmode")] - public string? BiosMode { get; set; } - - /// (none|split|merged|unmerged|fullmerged|device|full) "merged" - [XmlAttribute("samplemode")] - public string? SampleMode { get; set; } - - /// (yes|no) "no" - [XmlAttribute("lockrommode")] - public string? LockRomMode { get; set; } - - /// (yes|no) "no" - [XmlAttribute("lockbiosmode")] - public string? LockBiosMode { get; set; } - - /// (yes|no) "no" - [XmlAttribute("locksamplemode")] - public string? LockSampleMode { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Sample.cs b/SabreTools.Models/Logiqx/Sample.cs deleted file mode 100644 index 98901f36..00000000 --- a/SabreTools.Models/Logiqx/Sample.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("sample")] - public class Sample - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/SoftwareList.cs b/SabreTools.Models/Logiqx/SoftwareList.cs deleted file mode 100644 index 36cabc85..00000000 --- a/SabreTools.Models/Logiqx/SoftwareList.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("softwarelist")] - public class SoftwareList - { - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - /// (original|compatible) - [Required] - [XmlAttribute("status")] - public string? Status { get; set; } - - [XmlAttribute("filter")] - public string? Filter { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/Logiqx/Trurip.cs b/SabreTools.Models/Logiqx/Trurip.cs deleted file mode 100644 index 0c69185e..00000000 --- a/SabreTools.Models/Logiqx/Trurip.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.Logiqx -{ - [XmlRoot("trurip")] - public class Trurip - { - [XmlElement("titleid")] - public string? TitleID { get; set; } - - [XmlElement("publisher")] - public string? Publisher { get; set; } - - [XmlElement("developer")] - public string? Developer { get; set; } - - [XmlElement("year")] - public string? Year { get; set; } - - [XmlElement("genre")] - public string? Genre { get; set; } - - [XmlElement("subgenre")] - public string? Subgenre { get; set; } - - [XmlElement("ratings")] - public string? Ratings { get; set; } - - [XmlElement("score")] - public string? Score { get; set; } - - [XmlElement("players")] - public string? Players { get; set; } - - /// Boolean? - [XmlElement("enabled")] - public string? Enabled { get; set; } - - [XmlElement("crc")] - public string? CRC { get; set; } - - [XmlElement("source")] - public string? Source { get; set; } - - [XmlElement("cloneof")] - public string? CloneOf { get; set; } - - [XmlElement("relatedto")] - public string? RelatedTo { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/NoFilterAttribute.cs b/SabreTools.Models/NoFilterAttribute.cs deleted file mode 100644 index e9ed2c8a..00000000 --- a/SabreTools.Models/NoFilterAttribute.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace SabreTools.Models -{ - /// - /// Marks a key as unable to be filtered on - /// - [System.AttributeUsage(System.AttributeTargets.Field)] - public class NoFilterAttribute : System.Attribute { } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/CanOpen.cs b/SabreTools.Models/OfflineList/CanOpen.cs deleted file mode 100644 index 50087d4a..00000000 --- a/SabreTools.Models/OfflineList/CanOpen.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("canOpen")] - public class CanOpen - { - [XmlElement("extension")] - public string[]? Extension { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Configuration.cs b/SabreTools.Models/OfflineList/Configuration.cs deleted file mode 100644 index 743198da..00000000 --- a/SabreTools.Models/OfflineList/Configuration.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("configuration")] - public class Configuration - { - [XmlElement("datName")] - public string? DatName { get; set; } - - [XmlElement("imFolder")] - public string? ImFolder { get; set; } - - [XmlElement("datVersion")] - public string? DatVersion { get; set; } - - [XmlElement("system")] - public string? System { get; set; } - - /// Numeric? - [XmlElement("screenshotsWidth")] - public string? ScreenshotsWidth { get; set; } - - /// Numeric? - [XmlElement("screenshotsHeight")] - public string? ScreenshotsHeight { get; set; } - - [XmlElement("infos")] - public Infos? Infos { get; set; } - - [XmlElement("canOpen")] - public CanOpen? CanOpen { get; set; } - - [XmlElement("newDat")] - public NewDat? NewDat { get; set; } - - [XmlElement("search")] - public Search? Search { get; set; } - - [XmlElement("romTitle")] - public string? RomTitle { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Dat.cs b/SabreTools.Models/OfflineList/Dat.cs deleted file mode 100644 index f1e29641..00000000 --- a/SabreTools.Models/OfflineList/Dat.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("dat")] - public class Dat - { - [XmlAttribute(Namespace = "http://www.w3.org/2001/XMLSchema-instance", AttributeName = "noNamespaceSchemaLocation")] - public string? NoNamespaceSchemaLocation { get; set; } - - [XmlElement("configuration")] - public Configuration? Configuration { get; set; } - - [XmlElement("games")] - public Games? Games { get; set; } - - [XmlElement("gui")] - public GUI? GUI { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/DatUrl.cs b/SabreTools.Models/OfflineList/DatUrl.cs deleted file mode 100644 index 792285bb..00000000 --- a/SabreTools.Models/OfflineList/DatUrl.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("datURL")] - public class DatUrl - { - [XmlAttribute("fileName")] - public string? FileName { get; set; } - - [XmlText] - public string? Content { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/FileRomCRC.cs b/SabreTools.Models/OfflineList/FileRomCRC.cs deleted file mode 100644 index b3691d39..00000000 --- a/SabreTools.Models/OfflineList/FileRomCRC.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("romCRC")] - public class FileRomCRC - { - [XmlAttribute("extension")] - public string? Extension { get; set; } - - [XmlText] - public string? Content { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Files.cs b/SabreTools.Models/OfflineList/Files.cs deleted file mode 100644 index e5e0f2a3..00000000 --- a/SabreTools.Models/OfflineList/Files.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("files")] - public class Files - { - [XmlElement("romCRC")] - public FileRomCRC[]? RomCRC { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Find.cs b/SabreTools.Models/OfflineList/Find.cs deleted file mode 100644 index 652e0674..00000000 --- a/SabreTools.Models/OfflineList/Find.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("find")] - public class Find - { - [XmlAttribute("operation")] - public string? Operation { get; set; } - - /// Numeric? - [XmlAttribute("value")] - public string? Value { get; set; } - - [XmlText] - public string? Content { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/GUI.cs b/SabreTools.Models/OfflineList/GUI.cs deleted file mode 100644 index 0ead2f6e..00000000 --- a/SabreTools.Models/OfflineList/GUI.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("gui")] - public class GUI - { - [XmlElement("images")] - public Images? Images { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Game.cs b/SabreTools.Models/OfflineList/Game.cs deleted file mode 100644 index 26e34366..00000000 --- a/SabreTools.Models/OfflineList/Game.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("game")] - public class Game - { - [XmlElement("imageNumber")] - public string? ImageNumber { get; set; } - - [XmlElement("releaseNumber")] - public string? ReleaseNumber { get; set; } - - [XmlElement("title")] - public string? Title { get; set; } - - [XmlElement("saveType")] - public string? SaveType { get; set; } - - /// Numeric - [XmlElement("romSize")] - public string? RomSize { get; set; } - - [XmlElement("publisher")] - public string? Publisher { get; set; } - - [XmlElement("location")] - public string? Location { get; set; } - - [XmlElement("sourceRom")] - public string? SourceRom { get; set; } - - [XmlElement("language")] - public string? Language { get; set; } - - [XmlElement("files")] - public Files? Files { get; set; } - - [XmlElement("im1CRC")] - public string? Im1CRC { get; set; } - - [XmlElement("im2CRC")] - public string? Im2CRC { get; set; } - - [XmlElement("comment")] - public string? Comment { get; set; } - - [XmlElement("duplicateID")] - public string? DuplicateID { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Games.cs b/SabreTools.Models/OfflineList/Games.cs deleted file mode 100644 index 2098fbfa..00000000 --- a/SabreTools.Models/OfflineList/Games.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("games")] - public class Games - { - [XmlElement("game")] - public Game[]? Game { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Image.cs b/SabreTools.Models/OfflineList/Image.cs deleted file mode 100644 index c6ce986f..00000000 --- a/SabreTools.Models/OfflineList/Image.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("image")] - public class Image - { - [XmlAttribute("x")] - public string? X { get; set; } - - [XmlAttribute("y")] - public string? Y { get; set; } - - [XmlAttribute("width")] - public string? Width { get; set; } - - [XmlAttribute("height")] - public string? Height { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Images.cs b/SabreTools.Models/OfflineList/Images.cs deleted file mode 100644 index 7f28b1cf..00000000 --- a/SabreTools.Models/OfflineList/Images.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("images")] - public class Images - { - [XmlAttribute("width")] - public string? Width { get; set; } - - [XmlAttribute("height")] - public string? Height { get; set; } - - [XmlElement("image")] - public Image[]? Image { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/InfoBase.cs b/SabreTools.Models/OfflineList/InfoBase.cs deleted file mode 100644 index 338836f4..00000000 --- a/SabreTools.Models/OfflineList/InfoBase.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - public class InfoBase - { - /// Boolean - [XmlAttribute("visible")] - public string? Visible { get; set; } - - /// Boolean - [XmlAttribute("inNamingOption")] - public string? InNamingOption { get; set; } - - /// Boolean - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } - - [XmlRoot("title")] - public class Title : InfoBase { } - - [XmlRoot("location")] - public class Location : InfoBase { } - - [XmlRoot("publisher")] - public class Publisher : InfoBase { } - - [XmlRoot("sourceRom")] - public class SourceRom : InfoBase { } - - [XmlRoot("saveType")] - public class SaveType : InfoBase { } - - [XmlRoot("romSize")] - public class RomSize : InfoBase { } - - [XmlRoot("releaseNumber")] - public class ReleaseNumber : InfoBase { } - - [XmlRoot("imageNumber")] - public class ImageNumber : InfoBase { } - - [XmlRoot("languageNumber")] - public class LanguageNumber : InfoBase { } - - [XmlRoot("comment")] - public class Comment : InfoBase { } - - [XmlRoot("romCRC")] - public class RomCRC : InfoBase { } - - [XmlRoot("im1CRC")] - public class Im1CRC : InfoBase { } - - [XmlRoot("im2CRC")] - public class Im2CRC : InfoBase { } - - [XmlRoot("languages")] - public class Languages : InfoBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Infos.cs b/SabreTools.Models/OfflineList/Infos.cs deleted file mode 100644 index 6f10afa0..00000000 --- a/SabreTools.Models/OfflineList/Infos.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("infos")] - public class Infos - { - [XmlElement("title")] - public Title? Title { get; set; } - - [XmlElement("location")] - public Location? Location { get; set; } - - [XmlElement("publisher")] - public Publisher? Publisher { get; set; } - - [XmlElement("sourceRom")] - public SourceRom? SourceRom { get; set; } - - [XmlElement("saveType")] - public SaveType? SaveType { get; set; } - - [XmlElement("romSize")] - public RomSize? RomSize { get; set; } - - [XmlElement("releaseNumber")] - public ReleaseNumber? ReleaseNumber { get; set; } - - [XmlElement("languageNumber")] - public LanguageNumber? LanguageNumber { get; set; } - - [XmlElement("comment")] - public Comment? Comment { get; set; } - - [XmlElement("romCRC")] - public RomCRC? RomCRC { get; set; } - - [XmlElement("im1CRC")] - public Im1CRC? Im1CRC { get; set; } - - [XmlElement("im2CRC")] - public Im2CRC? Im2CRC { get; set; } - - [XmlElement("languages")] - public Languages? Languages { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/NewDat.cs b/SabreTools.Models/OfflineList/NewDat.cs deleted file mode 100644 index 817ed286..00000000 --- a/SabreTools.Models/OfflineList/NewDat.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("newDat")] - public class NewDat - { - [XmlElement("datVersionURL")] - public string? DatVersionUrl { get; set; } - - [XmlElement("datURL")] - public DatUrl? DatUrl { get; set; } - - [XmlElement("imURL")] - public string? ImUrl { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/Search.cs b/SabreTools.Models/OfflineList/Search.cs deleted file mode 100644 index 6aca4f8a..00000000 --- a/SabreTools.Models/OfflineList/Search.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("search")] - public class Search - { - [XmlElement("to")] - public To[]? To { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OfflineList/To.cs b/SabreTools.Models/OfflineList/To.cs deleted file mode 100644 index a907db1f..00000000 --- a/SabreTools.Models/OfflineList/To.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OfflineList -{ - [XmlRoot("to")] - public class To - { - [XmlAttribute("value")] - public string? Value { get; set; } - - /// Boolean - [XmlAttribute("default")] - public string? Default { get; set; } - - /// Boolean - [XmlAttribute("auto")] - public string? Auto { get; set; } - - [XmlElement("find")] - public Find[]? Find { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/Dump.cs b/SabreTools.Models/OpenMSX/Dump.cs deleted file mode 100644 index 286b521b..00000000 --- a/SabreTools.Models/OpenMSX/Dump.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("dump")] - public class Dump - { - [XmlElement("original")] - public Original? Original { get; set; } - - [XmlElement("rom", typeof(Rom))] - [XmlElement("megarom", typeof(MegaRom))] - [XmlElement("sccpluscart", typeof(SCCPlusCart))] - public RomBase? Rom { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/MegaRom.cs b/SabreTools.Models/OpenMSX/MegaRom.cs deleted file mode 100644 index 78fa13ac..00000000 --- a/SabreTools.Models/OpenMSX/MegaRom.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("megarom")] - public class MegaRom : RomBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/Original.cs b/SabreTools.Models/OpenMSX/Original.cs deleted file mode 100644 index 7659b1d4..00000000 --- a/SabreTools.Models/OpenMSX/Original.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("original")] - public class Original - { - /// Boolean? - [XmlAttribute("value")] - public string? Value { get; set; } - - [XmlText] - public string? Content { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/Rom.cs b/SabreTools.Models/OpenMSX/Rom.cs deleted file mode 100644 index bfa03810..00000000 --- a/SabreTools.Models/OpenMSX/Rom.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("rom")] - public class Rom : RomBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/RomBase.cs b/SabreTools.Models/OpenMSX/RomBase.cs deleted file mode 100644 index dbff0a33..00000000 --- a/SabreTools.Models/OpenMSX/RomBase.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - /// - /// Base class to unify the various rom types - /// - public abstract class RomBase - { - [XmlElement("start")] - public string? Start { get; set; } - - [XmlElement("type")] - public string? Type { get; set; } - - /// SHA-1 hash - [XmlElement("hash")] - public string? Hash { get; set; } - - [XmlElement("remark")] - public string? Remark { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/SCCPlusCart.cs b/SabreTools.Models/OpenMSX/SCCPlusCart.cs deleted file mode 100644 index 9d108317..00000000 --- a/SabreTools.Models/OpenMSX/SCCPlusCart.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("sccpluscart")] - public class SCCPlusCart : RomBase { } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/Software.cs b/SabreTools.Models/OpenMSX/Software.cs deleted file mode 100644 index 29167e15..00000000 --- a/SabreTools.Models/OpenMSX/Software.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("software")] - public class Software - { - [Required] - [XmlElement("title")] - public string? Title { get; set; } - - [XmlElement("genmsxid")] - public string? GenMSXID { get; set; } - - [Required] - [XmlElement("system")] - public string? System { get; set; } - - [Required] - [XmlElement("company")] - public string? Company { get; set; } - - [Required] - [XmlElement("year")] - public string? Year { get; set; } - - [Required] - [XmlElement("country")] - public string? Country { get; set; } - - [XmlElement("dump")] - public Dump[]? Dump { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/OpenMSX/SoftwareDb.cs b/SabreTools.Models/OpenMSX/SoftwareDb.cs deleted file mode 100644 index f94db294..00000000 --- a/SabreTools.Models/OpenMSX/SoftwareDb.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.OpenMSX -{ - [XmlRoot("softwaredb")] - public class SoftwareDb - { - [XmlAttribute("timestamp")] - public string? Timestamp { get; set; } - - [XmlElement("software")] - public Software[]? Software { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/README.MD b/SabreTools.Models/README.MD deleted file mode 100644 index 5afae30a..00000000 --- a/SabreTools.Models/README.MD +++ /dev/null @@ -1,28 +0,0 @@ -# SabreTools.Models - -This library comprises of models that represent either directly serializable or representative structures for all DAT types. All of the main models representing metadata files should have parsers created outside of the current code. The parser code will likely be partially patterned off of the code being used to create the serialization tests. - -In each completed model, there is a section that looks like the following: -``` - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion -``` - -This code should be removed before the models are used. This is only included during debugging and implementation as to ensure that there are no notable holes in the models that would disallow 1:1 replication of inputs. - -## Missing Formats - -The following formats do not have models included in this library yet and, as such, do not have serializers: - -- Missfile -- SabreJSON -- SabreDAT XML \ No newline at end of file diff --git a/SabreTools.Models/RequiredAttribute.cs b/SabreTools.Models/RequiredAttribute.cs deleted file mode 100644 index dfb4eb5c..00000000 --- a/SabreTools.Models/RequiredAttribute.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SabreTools.Models -{ - /// - /// Marks a property as required on write - /// - /// TODO: Use reflection to determine required fields on write - [System.AttributeUsage(System.AttributeTargets.Property)] - public class RequiredAttribute : System.Attribute { } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/Credits.cs b/SabreTools.Models/RomCenter/Credits.cs deleted file mode 100644 index c26e2f36..00000000 --- a/SabreTools.Models/RomCenter/Credits.cs +++ /dev/null @@ -1,34 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - /// [credits] - public class Credits - { - /// author - public string? Author { get; set; } - - /// version - public string? Version { get; set; } - - /// email - public string? Email { get; set; } - - /// homepage - public string? Homepage { get; set; } - - /// url - public string? Url { get; set; } - - /// date - public string? Date { get; set; } - - /// comment - public string? Comment { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/Dat.cs b/SabreTools.Models/RomCenter/Dat.cs deleted file mode 100644 index 330a1188..00000000 --- a/SabreTools.Models/RomCenter/Dat.cs +++ /dev/null @@ -1,25 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - /// [dat] - public class Dat - { - /// version - public string? Version { get; set; } - - /// plugin - public string? Plugin { get; set; } - - /// split - public string? Split { get; set; } - - /// merge - public string? Merge { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/Emulator.cs b/SabreTools.Models/RomCenter/Emulator.cs deleted file mode 100644 index f0f234e4..00000000 --- a/SabreTools.Models/RomCenter/Emulator.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - /// [emulator] - public class Emulator - { - /// refname - public string? RefName { get; set; } - - /// version - public string? Version { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/Games.cs b/SabreTools.Models/RomCenter/Games.cs deleted file mode 100644 index 28993258..00000000 --- a/SabreTools.Models/RomCenter/Games.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - /// [games] - public class Games - { - public Rom[]? Rom { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/MetadataFile.cs b/SabreTools.Models/RomCenter/MetadataFile.cs deleted file mode 100644 index c68919aa..00000000 --- a/SabreTools.Models/RomCenter/MetadataFile.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - public class MetadataFile - { - /// [credits] - public Credits? Credits { get; set; } - - /// [dat] - public Dat? Dat { get; set; } - - /// [emulator] - public Emulator? Emulator { get; set; } - - /// [games] - public Games? Games { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/RomCenter/Rom.cs b/SabreTools.Models/RomCenter/Rom.cs deleted file mode 100644 index fff9b41c..00000000 --- a/SabreTools.Models/RomCenter/Rom.cs +++ /dev/null @@ -1,40 +0,0 @@ -namespace SabreTools.Models.RomCenter -{ - /// ¬-delimited - public class Rom - { - /// 0 - public string? ParentName { get; set; } - - /// 1 - public string? ParentDescription { get; set; } - - /// 2 - public string? GameName { get; set; } - - /// 3 - public string? GameDescription { get; set; } - - /// 4 - public string? RomName { get; set; } - - /// 5 - public string? RomCRC { get; set; } - - /// 6 - public string? RomSize { get; set; } - - /// 7 - public string? RomOf { get; set; } - - /// 8 - public string? MergeName { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SabreTools.Models.csproj b/SabreTools.Models/SabreTools.Models.csproj deleted file mode 100644 index dde70861..00000000 --- a/SabreTools.Models/SabreTools.Models.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net6.0;net7.0 - enable - - - - - - - diff --git a/SabreTools.Models/SeparatedValue/MetadataFile.cs b/SabreTools.Models/SeparatedValue/MetadataFile.cs deleted file mode 100644 index 7fddc2eb..00000000 --- a/SabreTools.Models/SeparatedValue/MetadataFile.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace SabreTools.Models.SeparatedValue -{ - public class MetadataFile - { - [Required] - public string[]? Header { get; set; } - - public Row[]? Row { get; set; } - } -} \ No newline at end of file diff --git a/SabreTools.Models/SeparatedValue/Row.cs b/SabreTools.Models/SeparatedValue/Row.cs deleted file mode 100644 index b9f170c1..00000000 --- a/SabreTools.Models/SeparatedValue/Row.cs +++ /dev/null @@ -1,68 +0,0 @@ -namespace SabreTools.Models.SeparatedValue -{ - /// - /// Standardized variant of a row - /// - public class Row - { - /// File Name - public string? FileName { get; set; } - - /// Internal Name - public string? InternalName { get; set; } - - /// Description - public string? Description { get; set; } - - /// Game Name - [Required] - public string? GameName { get; set; } - - /// Game Description - public string? GameDescription { get; set; } - - /// Type - [Required] - public string? Type { get; set; } - - /// Rom Name - public string? RomName { get; set; } - - /// Disk Name - public string? DiskName { get; set; } - - /// Size, Numeric - public string? Size { get; set; } - - /// CRC - public string? CRC { get; set; } - - /// MD5 - public string? MD5 { get; set; } - - /// SHA1 - public string? SHA1 { get; set; } - - /// SHA256 - public string? SHA256 { get; set; } - - /// SHA384, Optional - public string? SHA384 { get; set; } - - /// SHA512, Optional - public string? SHA512 { get; set; } - - /// SpamSum, Optional - public string? SpamSum { get; set; } - - /// Status, Nodump - public string? Status { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - public string[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/DataArea.cs b/SabreTools.Models/SoftwareList/DataArea.cs deleted file mode 100644 index d58ae7f1..00000000 --- a/SabreTools.Models/SoftwareList/DataArea.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("dataarea")] - public class DataArea - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("size")] - public string? Size { get; set; } - - /// (8|16|32|64) "8" - [XmlAttribute("width")] - public string? Width { get; set; } - - /// (big|little) "little" - [XmlAttribute("endianness")] - public string? Endianness { get; set; } - - [XmlElement("rom")] - public Rom[]? Rom { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/DipSwitch.cs b/SabreTools.Models/SoftwareList/DipSwitch.cs deleted file mode 100644 index 2fd6fd3d..00000000 --- a/SabreTools.Models/SoftwareList/DipSwitch.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("dipswitch")] - public class DipSwitch - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("tag")] - public string? Tag { get; set; } - - [XmlAttribute("mask")] - public string? Mask { get; set; } - - [XmlElement("dipvalue")] - public DipValue[]? DipValue { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/DipValue.cs b/SabreTools.Models/SoftwareList/DipValue.cs deleted file mode 100644 index 1f70bd05..00000000 --- a/SabreTools.Models/SoftwareList/DipValue.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("dipvalue")] - public class DipValue - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("value")] - public string? Value { get; set; } - - /// (yes|no) "no" - [XmlAttribute("default")] - public string? Default { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Disk.cs b/SabreTools.Models/SoftwareList/Disk.cs deleted file mode 100644 index ca0cbe3d..00000000 --- a/SabreTools.Models/SoftwareList/Disk.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("disk")] - public class Disk - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("md5")] - public string? MD5 { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - /// (baddump|nodump|good) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (yes|no) "no" - [XmlAttribute("writeable")] - public string? Writeable { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/DiskArea.cs b/SabreTools.Models/SoftwareList/DiskArea.cs deleted file mode 100644 index 20bba255..00000000 --- a/SabreTools.Models/SoftwareList/DiskArea.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("diskarea")] - public class DiskArea - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlElement("disk")] - public Disk[]? Disk { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Feature.cs b/SabreTools.Models/SoftwareList/Feature.cs deleted file mode 100644 index 2d15ec4e..00000000 --- a/SabreTools.Models/SoftwareList/Feature.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("feature")] - public class Feature - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("value")] - public string? Value { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Info.cs b/SabreTools.Models/SoftwareList/Info.cs deleted file mode 100644 index b68f5d7e..00000000 --- a/SabreTools.Models/SoftwareList/Info.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("info")] - public class Info - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("value")] - public string? Value { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Part.cs b/SabreTools.Models/SoftwareList/Part.cs deleted file mode 100644 index d4ff21f2..00000000 --- a/SabreTools.Models/SoftwareList/Part.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("part")] - public class Part - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [Required] - [XmlAttribute("interface")] - public string? Interface { get; set; } - - [XmlElement("feature")] - public Feature[]? Feature { get; set; } - - [XmlElement("dataarea")] - public DataArea[]? DataArea { get; set; } - - [XmlElement("diskarea")] - public DiskArea[]? DiskArea { get; set; } - - [XmlElement("dipswitch")] - public DipSwitch[]? DipSwitch { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Rom.cs b/SabreTools.Models/SoftwareList/Rom.cs deleted file mode 100644 index e738389f..00000000 --- a/SabreTools.Models/SoftwareList/Rom.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("rom")] - public class Rom - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("size")] - public string? Size { get; set; } - - [XmlAttribute("length")] - public string? Length { get; set; } - - [XmlAttribute("crc")] - public string? CRC { get; set; } - - [XmlAttribute("sha1")] - public string? SHA1 { get; set; } - - /// Numeric? - [XmlAttribute("offset")] - public string? Offset { get; set; } - - [XmlAttribute("value")] - public string? Value { get; set; } - - /// (baddump|nodump|good) "good" - [XmlAttribute("status")] - public string? Status { get; set; } - - /// (load16_byte|load16_word|load16_word_swap|load32_byte|load32_word|load32_word_swap|load32_dword|load64_word|load64_word_swap|reload|fill|continue|reload_plain|ignore) - [XmlAttribute("loadflag")] - public string? LoadFlag { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/SharedFeat.cs b/SabreTools.Models/SoftwareList/SharedFeat.cs deleted file mode 100644 index 22c1b493..00000000 --- a/SabreTools.Models/SoftwareList/SharedFeat.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("sharedfeat")] - public class SharedFeat - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("value")] - public string? Value { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/Software.cs b/SabreTools.Models/SoftwareList/Software.cs deleted file mode 100644 index 194acd8b..00000000 --- a/SabreTools.Models/SoftwareList/Software.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("software")] - public class Software - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("cloneof")] - public string? CloneOf { get; set; } - - /// (yes|partial|no) "yes" - [XmlAttribute("supported")] - public string? Supported { get; set; } - - [Required] - [XmlElement("description")] - public string? Description { get; set; } - - [Required] - [XmlElement("year")] - public string? Year { get; set; } - - [Required] - [XmlElement("publisher")] - public string? Publisher { get; set; } - - [XmlElement("notes")] - public string? Notes { get; set; } - - [XmlElement("info")] - public Info[]? Info { get; set; } - - [XmlElement("sharedfeat")] - public SharedFeat[]? SharedFeat { get; set; } - - [XmlElement("part")] - public Part[]? Part { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Models/SoftwareList/SoftwareList.cs b/SabreTools.Models/SoftwareList/SoftwareList.cs deleted file mode 100644 index 8dd27821..00000000 --- a/SabreTools.Models/SoftwareList/SoftwareList.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Xml; -using System.Xml.Serialization; - -namespace SabreTools.Models.SoftwareList -{ - [XmlRoot("softwarelist")] - public class SoftwareList - { - [Required] - [XmlAttribute("name")] - public string? Name { get; set; } - - [XmlAttribute("description")] - public string? Description { get; set; } - - [XmlElement("notes")] - public string? Notes { get; set; } - - [XmlElement("software")] - public Software[]? Software { get; set; } - - #region DO NOT USE IN PRODUCTION - - /// Should be empty - [XmlAnyAttribute] - public XmlAttribute[]? ADDITIONAL_ATTRIBUTES { get; set; } - - /// Should be empty - [XmlAnyElement] - public object[]? ADDITIONAL_ELEMENTS { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/SabreTools.Serialization/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/ArchiveDotOrg.Deserializer.cs index 7c8e83e2..6675589f 100644 --- a/SabreTools.Serialization/ArchiveDotOrg.Deserializer.cs +++ b/SabreTools.Serialization/ArchiveDotOrg.Deserializer.cs @@ -12,16 +12,16 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to an array of + /// Convert from to an array of /// - public static Files? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static Files? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; var files = new Files(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { files.File = machines @@ -34,11 +34,11 @@ namespace SabreTools.Serialization } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static File[] ConvertFromInternalModel(Models.Internal.Machine item) + private static File[] ConvertFromInternalModel(Models.Metadata.Machine item) { - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms == null) return Array.Empty(); @@ -48,74 +48,74 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static File ConvertFromInternalModel(Models.Internal.Rom item) + private static File ConvertFromInternalModel(Models.Metadata.Rom item) { var file = new File { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Source = item.ReadString(Models.Internal.Rom.SourceKey), - BitTorrentMagnetHash = item.ReadString(Models.Internal.Rom.BitTorrentMagnetHashKey), - LastModifiedTime = item.ReadString(Models.Internal.Rom.LastModifiedTimeKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - MD5 = item.ReadString(Models.Internal.Rom.MD5Key), - CRC32 = item.ReadString(Models.Internal.Rom.CRCKey), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - FileCount = item.ReadString(Models.Internal.Rom.FileCountKey), - Format = item.ReadString(Models.Internal.Rom.FormatKey), - Original = item.ReadString(Models.Internal.Rom.OriginalKey), - Summation = item.ReadString(Models.Internal.Rom.SummationKey), - MatrixNumber = item.ReadString(Models.Internal.Rom.MatrixNumberKey), - CollectionCatalogNumber = item.ReadString(Models.Internal.Rom.CollectionCatalogNumberKey), - Comment = item.ReadString(Models.Internal.Rom.CommentKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Source = item.ReadString(Models.Metadata.Rom.SourceKey), + BitTorrentMagnetHash = item.ReadString(Models.Metadata.Rom.BitTorrentMagnetHashKey), + LastModifiedTime = item.ReadString(Models.Metadata.Rom.LastModifiedTimeKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + MD5 = item.ReadString(Models.Metadata.Rom.MD5Key), + CRC32 = item.ReadString(Models.Metadata.Rom.CRCKey), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + FileCount = item.ReadString(Models.Metadata.Rom.FileCountKey), + Format = item.ReadString(Models.Metadata.Rom.FormatKey), + Original = item.ReadString(Models.Metadata.Rom.OriginalKey), + Summation = item.ReadString(Models.Metadata.Rom.SummationKey), + MatrixNumber = item.ReadString(Models.Metadata.Rom.MatrixNumberKey), + CollectionCatalogNumber = item.ReadString(Models.Metadata.Rom.CollectionCatalogNumberKey), + Comment = item.ReadString(Models.Metadata.Rom.CommentKey), - ASRDetectedLang = item.ReadString(Models.Internal.Rom.ASRDetectedLangKey), - ASRDetectedLangConf = item.ReadString(Models.Internal.Rom.ASRDetectedLangConfKey), - ASRTranscribedLang = item.ReadString(Models.Internal.Rom.ASRTranscribedLangKey), - WhisperASRModuleVersion = item.ReadString(Models.Internal.Rom.WhisperASRModuleVersionKey), - WhisperModelHash = item.ReadString(Models.Internal.Rom.WhisperModelHashKey), - WhisperModelName = item.ReadString(Models.Internal.Rom.WhisperModelNameKey), - WhisperVersion = item.ReadString(Models.Internal.Rom.WhisperVersionKey), + ASRDetectedLang = item.ReadString(Models.Metadata.Rom.ASRDetectedLangKey), + ASRDetectedLangConf = item.ReadString(Models.Metadata.Rom.ASRDetectedLangConfKey), + ASRTranscribedLang = item.ReadString(Models.Metadata.Rom.ASRTranscribedLangKey), + WhisperASRModuleVersion = item.ReadString(Models.Metadata.Rom.WhisperASRModuleVersionKey), + WhisperModelHash = item.ReadString(Models.Metadata.Rom.WhisperModelHashKey), + WhisperModelName = item.ReadString(Models.Metadata.Rom.WhisperModelNameKey), + WhisperVersion = item.ReadString(Models.Metadata.Rom.WhisperVersionKey), - ClothCoverDetectionModuleVersion = item.ReadString(Models.Internal.Rom.ClothCoverDetectionModuleVersionKey), - hOCRCharToWordhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordhOCRVersionKey), - hOCRCharToWordModuleVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordModuleVersionKey), - hOCRFtsTexthOCRVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTexthOCRVersionKey), - hOCRFtsTextModuleVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTextModuleVersionKey), - hOCRPageIndexhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexhOCRVersionKey), - hOCRPageIndexModuleVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexModuleVersionKey), - TesseractOCR = item.ReadString(Models.Internal.Rom.TesseractOCRKey), - TesseractOCRConverted = item.ReadString(Models.Internal.Rom.TesseractOCRConvertedKey), - TesseractOCRDetectedLang = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangKey), - TesseractOCRDetectedLangConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangConfKey), - TesseractOCRDetectedScript = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptKey), - TesseractOCRDetectedScriptConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptConfKey), - TesseractOCRModuleVersion = item.ReadString(Models.Internal.Rom.TesseractOCRModuleVersionKey), - TesseractOCRParameters = item.ReadString(Models.Internal.Rom.TesseractOCRParametersKey), - PDFModuleVersion = item.ReadString(Models.Internal.Rom.PDFModuleVersionKey), - WordConfidenceInterval0To10 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval0To10Key), - WordConfidenceInterval11To20 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval11To20Key), - WordConfidenceInterval21To30 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval21To30Key), - WordConfidenceInterval31To40 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval31To40Key), - WordConfidenceInterval41To50 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval41To50Key), - WordConfidenceInterval51To60 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval51To60Key), - WordConfidenceInterval61To70 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval61To70Key), - WordConfidenceInterval71To80 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval71To80Key), - WordConfidenceInterval81To90 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval81To90Key), - WordConfidenceInterval91To100 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval91To100Key), + ClothCoverDetectionModuleVersion = item.ReadString(Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey), + hOCRCharToWordhOCRVersion = item.ReadString(Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey), + hOCRCharToWordModuleVersion = item.ReadString(Models.Metadata.Rom.hOCRCharToWordModuleVersionKey), + hOCRFtsTexthOCRVersion = item.ReadString(Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey), + hOCRFtsTextModuleVersion = item.ReadString(Models.Metadata.Rom.hOCRFtsTextModuleVersionKey), + hOCRPageIndexhOCRVersion = item.ReadString(Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey), + hOCRPageIndexModuleVersion = item.ReadString(Models.Metadata.Rom.hOCRPageIndexModuleVersionKey), + TesseractOCR = item.ReadString(Models.Metadata.Rom.TesseractOCRKey), + TesseractOCRConverted = item.ReadString(Models.Metadata.Rom.TesseractOCRConvertedKey), + TesseractOCRDetectedLang = item.ReadString(Models.Metadata.Rom.TesseractOCRDetectedLangKey), + TesseractOCRDetectedLangConf = item.ReadString(Models.Metadata.Rom.TesseractOCRDetectedLangConfKey), + TesseractOCRDetectedScript = item.ReadString(Models.Metadata.Rom.TesseractOCRDetectedScriptKey), + TesseractOCRDetectedScriptConf = item.ReadString(Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey), + TesseractOCRModuleVersion = item.ReadString(Models.Metadata.Rom.TesseractOCRModuleVersionKey), + TesseractOCRParameters = item.ReadString(Models.Metadata.Rom.TesseractOCRParametersKey), + PDFModuleVersion = item.ReadString(Models.Metadata.Rom.PDFModuleVersionKey), + WordConfidenceInterval0To10 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval0To10Key), + WordConfidenceInterval11To20 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval11To20Key), + WordConfidenceInterval21To30 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval21To30Key), + WordConfidenceInterval31To40 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval31To40Key), + WordConfidenceInterval41To50 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval41To50Key), + WordConfidenceInterval51To60 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval51To60Key), + WordConfidenceInterval61To70 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval61To70Key), + WordConfidenceInterval71To80 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval71To80Key), + WordConfidenceInterval81To90 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval81To90Key), + WordConfidenceInterval91To100 = item.ReadString(Models.Metadata.Rom.WordConfidenceInterval91To100Key), - Album = item.ReadString(Models.Internal.Rom.AlbumKey), - Artist = item.ReadString(Models.Internal.Rom.ArtistKey), - Bitrate = item.ReadString(Models.Internal.Rom.BitrateKey), - Creator = item.ReadString(Models.Internal.Rom.CreatorKey), - Height = item.ReadString(Models.Internal.Rom.HeightKey), - Length = item.ReadString(Models.Internal.Rom.LengthKey), - PreviewImage = item.ReadString(Models.Internal.Rom.PreviewImageKey), - Rotation = item.ReadString(Models.Internal.Rom.RotationKey), - Title = item.ReadString(Models.Internal.Rom.TitleKey), - Track = item.ReadString(Models.Internal.Rom.TrackKey), - Width = item.ReadString(Models.Internal.Rom.WidthKey), + Album = item.ReadString(Models.Metadata.Rom.AlbumKey), + Artist = item.ReadString(Models.Metadata.Rom.ArtistKey), + Bitrate = item.ReadString(Models.Metadata.Rom.BitrateKey), + Creator = item.ReadString(Models.Metadata.Rom.CreatorKey), + Height = item.ReadString(Models.Metadata.Rom.HeightKey), + Length = item.ReadString(Models.Metadata.Rom.LengthKey), + PreviewImage = item.ReadString(Models.Metadata.Rom.PreviewImageKey), + Rotation = item.ReadString(Models.Metadata.Rom.RotationKey), + Title = item.ReadString(Models.Metadata.Rom.TitleKey), + Track = item.ReadString(Models.Metadata.Rom.TrackKey), + Width = item.ReadString(Models.Metadata.Rom.WidthKey), }; return file; } diff --git a/SabreTools.Serialization/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/ArchiveDotOrg.Serializer.cs index 8b1df2c0..29773754 100644 --- a/SabreTools.Serialization/ArchiveDotOrg.Serializer.cs +++ b/SabreTools.Serialization/ArchiveDotOrg.Serializer.cs @@ -11,21 +11,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(Files? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(Files? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.File != null && item.File.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.File + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.File .Where(f => f != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -35,99 +35,99 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Files item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Files item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = "archive.org", + [Models.Metadata.Header.NameKey] = "archive.org", }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(File item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(File item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.RomKey] = ConvertToInternalModel(item), + [Models.Metadata.Machine.RomKey] = ConvertToInternalModel(item), }; return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(File item) + private static Models.Metadata.Rom ConvertToInternalModel(File item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SourceKey] = item.Source, - [Models.Internal.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash, - [Models.Internal.Rom.LastModifiedTimeKey] = item.LastModifiedTime, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.MD5Key] = item.MD5, - [Models.Internal.Rom.CRCKey] = item.CRC32, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.FileCountKey] = item.FileCount, - [Models.Internal.Rom.FormatKey] = item.Format, - [Models.Internal.Rom.OriginalKey] = item.Original, - [Models.Internal.Rom.SummationKey] = item.Summation, - [Models.Internal.Rom.MatrixNumberKey] = item.MatrixNumber, - [Models.Internal.Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber, - [Models.Internal.Rom.PublisherKey] = item.Publisher, - [Models.Internal.Rom.CommentKey] = item.Comment, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SourceKey] = item.Source, + [Models.Metadata.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash, + [Models.Metadata.Rom.LastModifiedTimeKey] = item.LastModifiedTime, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.MD5Key] = item.MD5, + [Models.Metadata.Rom.CRCKey] = item.CRC32, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.FileCountKey] = item.FileCount, + [Models.Metadata.Rom.FormatKey] = item.Format, + [Models.Metadata.Rom.OriginalKey] = item.Original, + [Models.Metadata.Rom.SummationKey] = item.Summation, + [Models.Metadata.Rom.MatrixNumberKey] = item.MatrixNumber, + [Models.Metadata.Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber, + [Models.Metadata.Rom.PublisherKey] = item.Publisher, + [Models.Metadata.Rom.CommentKey] = item.Comment, - [Models.Internal.Rom.ASRDetectedLangKey] = item.ASRDetectedLang, - [Models.Internal.Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf, - [Models.Internal.Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang, - [Models.Internal.Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion, - [Models.Internal.Rom.WhisperModelHashKey] = item.WhisperModelHash, - [Models.Internal.Rom.WhisperModelNameKey] = item.WhisperModelName, - [Models.Internal.Rom.WhisperVersionKey] = item.WhisperVersion, + [Models.Metadata.Rom.ASRDetectedLangKey] = item.ASRDetectedLang, + [Models.Metadata.Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf, + [Models.Metadata.Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang, + [Models.Metadata.Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion, + [Models.Metadata.Rom.WhisperModelHashKey] = item.WhisperModelHash, + [Models.Metadata.Rom.WhisperModelNameKey] = item.WhisperModelName, + [Models.Metadata.Rom.WhisperVersionKey] = item.WhisperVersion, - [Models.Internal.Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion, - [Models.Internal.Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion, - [Models.Internal.Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion, - [Models.Internal.Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion, - [Models.Internal.Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion, - [Models.Internal.Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion, - [Models.Internal.Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion, - [Models.Internal.Rom.TesseractOCRKey] = item.TesseractOCR, - [Models.Internal.Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted, - [Models.Internal.Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang, - [Models.Internal.Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf, - [Models.Internal.Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript, - [Models.Internal.Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf, - [Models.Internal.Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion, - [Models.Internal.Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters, - [Models.Internal.Rom.PDFModuleVersionKey] = item.PDFModuleVersion, - [Models.Internal.Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10, - [Models.Internal.Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20, - [Models.Internal.Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30, - [Models.Internal.Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40, - [Models.Internal.Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50, - [Models.Internal.Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60, - [Models.Internal.Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70, - [Models.Internal.Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80, - [Models.Internal.Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90, - [Models.Internal.Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100, + [Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion, + [Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion, + [Models.Metadata.Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion, + [Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion, + [Models.Metadata.Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion, + [Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion, + [Models.Metadata.Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion, + [Models.Metadata.Rom.TesseractOCRKey] = item.TesseractOCR, + [Models.Metadata.Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted, + [Models.Metadata.Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang, + [Models.Metadata.Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf, + [Models.Metadata.Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript, + [Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf, + [Models.Metadata.Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion, + [Models.Metadata.Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters, + [Models.Metadata.Rom.PDFModuleVersionKey] = item.PDFModuleVersion, + [Models.Metadata.Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10, + [Models.Metadata.Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20, + [Models.Metadata.Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30, + [Models.Metadata.Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40, + [Models.Metadata.Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50, + [Models.Metadata.Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60, + [Models.Metadata.Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70, + [Models.Metadata.Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80, + [Models.Metadata.Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90, + [Models.Metadata.Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100, - [Models.Internal.Rom.AlbumKey] = item.Album, - [Models.Internal.Rom.ArtistKey] = item.Artist, - [Models.Internal.Rom.BitrateKey] = item.Bitrate, - [Models.Internal.Rom.CreatorKey] = item.Creator, - [Models.Internal.Rom.HeightKey] = item.Height, - [Models.Internal.Rom.LengthKey] = item.Length, - [Models.Internal.Rom.PreviewImageKey] = item.PreviewImage, - [Models.Internal.Rom.RotationKey] = item.Rotation, - [Models.Internal.Rom.TitleKey] = item.Title, - [Models.Internal.Rom.TrackKey] = item.Track, - [Models.Internal.Rom.WidthKey] = item.Width, + [Models.Metadata.Rom.AlbumKey] = item.Album, + [Models.Metadata.Rom.ArtistKey] = item.Artist, + [Models.Metadata.Rom.BitrateKey] = item.Bitrate, + [Models.Metadata.Rom.CreatorKey] = item.Creator, + [Models.Metadata.Rom.HeightKey] = item.Height, + [Models.Metadata.Rom.LengthKey] = item.Length, + [Models.Metadata.Rom.PreviewImageKey] = item.PreviewImage, + [Models.Metadata.Rom.RotationKey] = item.Rotation, + [Models.Metadata.Rom.TitleKey] = item.Title, + [Models.Metadata.Rom.TrackKey] = item.Track, + [Models.Metadata.Rom.WidthKey] = item.Width, }; return rom; } diff --git a/SabreTools.Serialization/AttractMode.Deserializer.cs b/SabreTools.Serialization/AttractMode.Deserializer.cs index aa9f4ed6..5c019fda 100644 --- a/SabreTools.Serialization/AttractMode.Deserializer.cs +++ b/SabreTools.Serialization/AttractMode.Deserializer.cs @@ -125,17 +125,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var metadataFile = header != null ? ConvertHeaderFromInternalModel(header) : new MetadataFile(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Row = machines @@ -148,23 +148,23 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static MetadataFile ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static MetadataFile ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var metadataFile = new MetadataFile { - Header = item.ReadStringArray(Models.Internal.Header.HeaderKey), + Header = item.ReadStringArray(Models.Metadata.Header.HeaderKey), }; return metadataFile; } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static Row[] ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Row[] ConvertMachineFromInternalModel(Models.Metadata.Machine item) { - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms == null || !roms.Any()) return Array.Empty(); @@ -175,34 +175,34 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Rom item, Models.Internal.Machine parent) + private static Row ConvertFromInternalModel(Models.Metadata.Rom item, Models.Metadata.Machine parent) { var row = new Row { - Name = parent.ReadString(Models.Internal.Machine.NameKey), - Title = item.ReadString(Models.Internal.Rom.NameKey), - Emulator = parent.ReadString(Models.Internal.Machine.EmulatorKey), - CloneOf = parent.ReadString(Models.Internal.Machine.CloneOfKey), - Year = parent.ReadString(Models.Internal.Machine.YearKey), - Manufacturer = parent.ReadString(Models.Internal.Machine.ManufacturerKey), - Category = parent.ReadString(Models.Internal.Machine.CategoryKey), - Players = parent.ReadString(Models.Internal.Machine.PlayersKey), - Rotation = parent.ReadString(Models.Internal.Machine.RotationKey), - Control = parent.ReadString(Models.Internal.Machine.ControlKey), - Status = parent.ReadString(Models.Internal.Machine.StatusKey), - DisplayCount = parent.ReadString(Models.Internal.Machine.DisplayCountKey), - DisplayType = parent.ReadString(Models.Internal.Machine.DisplayTypeKey), - AltRomname = item.ReadString(Models.Internal.Rom.AltRomnameKey), - AltTitle = item.ReadString(Models.Internal.Rom.AltTitleKey), - Extra = parent.ReadString(Models.Internal.Machine.ExtraKey), - Buttons = parent.ReadString(Models.Internal.Machine.ButtonsKey), - Favorite = parent.ReadString(Models.Internal.Machine.FavoriteKey), - Tags = parent.ReadString(Models.Internal.Machine.TagsKey), - PlayedCount = parent.ReadString(Models.Internal.Machine.PlayedCountKey), - PlayedTime = parent.ReadString(Models.Internal.Machine.PlayedTimeKey), - FileIsAvailable = item.ReadString(Models.Internal.Rom.FileIsAvailableKey), + Name = parent.ReadString(Models.Metadata.Machine.NameKey), + Title = item.ReadString(Models.Metadata.Rom.NameKey), + Emulator = parent.ReadString(Models.Metadata.Machine.EmulatorKey), + CloneOf = parent.ReadString(Models.Metadata.Machine.CloneOfKey), + Year = parent.ReadString(Models.Metadata.Machine.YearKey), + Manufacturer = parent.ReadString(Models.Metadata.Machine.ManufacturerKey), + Category = parent.ReadString(Models.Metadata.Machine.CategoryKey), + Players = parent.ReadString(Models.Metadata.Machine.PlayersKey), + Rotation = parent.ReadString(Models.Metadata.Machine.RotationKey), + Control = parent.ReadString(Models.Metadata.Machine.ControlKey), + Status = parent.ReadString(Models.Metadata.Machine.StatusKey), + DisplayCount = parent.ReadString(Models.Metadata.Machine.DisplayCountKey), + DisplayType = parent.ReadString(Models.Metadata.Machine.DisplayTypeKey), + AltRomname = item.ReadString(Models.Metadata.Rom.AltRomnameKey), + AltTitle = item.ReadString(Models.Metadata.Rom.AltTitleKey), + Extra = parent.ReadString(Models.Metadata.Machine.ExtraKey), + Buttons = parent.ReadString(Models.Metadata.Machine.ButtonsKey), + Favorite = parent.ReadString(Models.Metadata.Machine.FavoriteKey), + Tags = parent.ReadString(Models.Metadata.Machine.TagsKey), + PlayedCount = parent.ReadString(Models.Metadata.Machine.PlayedCountKey), + PlayedTime = parent.ReadString(Models.Metadata.Machine.PlayedTimeKey), + FileIsAvailable = item.ReadString(Models.Metadata.Rom.FileIsAvailableKey), }; return row; } diff --git a/SabreTools.Serialization/AttractMode.Serializer.cs b/SabreTools.Serialization/AttractMode.Serializer.cs index f4282a0e..e6a6f887 100644 --- a/SabreTools.Serialization/AttractMode.Serializer.cs +++ b/SabreTools.Serialization/AttractMode.Serializer.cs @@ -103,21 +103,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Row != null && item.Row.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Row + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Row .Where(r => r != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -127,59 +127,59 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(MetadataFile item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(MetadataFile item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.HeaderKey] = item.Header, + [Models.Metadata.Header.HeaderKey] = item.Header, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Row item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Row item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, - [Models.Internal.Machine.EmulatorKey] = item.Emulator, - [Models.Internal.Machine.CloneOfKey] = item.CloneOf, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, - [Models.Internal.Machine.CategoryKey] = item.Category, - [Models.Internal.Machine.PlayersKey] = item.Players, - [Models.Internal.Machine.RotationKey] = item.Rotation, - [Models.Internal.Machine.ControlKey] = item.Control, - [Models.Internal.Machine.StatusKey] = item.Status, - [Models.Internal.Machine.DisplayCountKey] = item.DisplayCount, - [Models.Internal.Machine.DisplayTypeKey] = item.DisplayType, - [Models.Internal.Machine.ExtraKey] = item.Extra, - [Models.Internal.Machine.ButtonsKey] = item.Buttons, - [Models.Internal.Machine.FavoriteKey] = item.Favorite, - [Models.Internal.Machine.TagsKey] = item.Tags, - [Models.Internal.Machine.PlayedCountKey] = item.PlayedCount, - [Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime, - [Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime, - [Models.Internal.Machine.RomKey] = ConvertToInternalModel(item), + [Models.Metadata.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.EmulatorKey] = item.Emulator, + [Models.Metadata.Machine.CloneOfKey] = item.CloneOf, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, + [Models.Metadata.Machine.CategoryKey] = item.Category, + [Models.Metadata.Machine.PlayersKey] = item.Players, + [Models.Metadata.Machine.RotationKey] = item.Rotation, + [Models.Metadata.Machine.ControlKey] = item.Control, + [Models.Metadata.Machine.StatusKey] = item.Status, + [Models.Metadata.Machine.DisplayCountKey] = item.DisplayCount, + [Models.Metadata.Machine.DisplayTypeKey] = item.DisplayType, + [Models.Metadata.Machine.ExtraKey] = item.Extra, + [Models.Metadata.Machine.ButtonsKey] = item.Buttons, + [Models.Metadata.Machine.FavoriteKey] = item.Favorite, + [Models.Metadata.Machine.TagsKey] = item.Tags, + [Models.Metadata.Machine.PlayedCountKey] = item.PlayedCount, + [Models.Metadata.Machine.PlayedTimeKey] = item.PlayedTime, + [Models.Metadata.Machine.PlayedTimeKey] = item.PlayedTime, + [Models.Metadata.Machine.RomKey] = ConvertToInternalModel(item), }; return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Row item) + private static Models.Metadata.Rom ConvertToInternalModel(Row item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Title, - [Models.Internal.Rom.AltRomnameKey] = item.AltRomname, - [Models.Internal.Rom.AltTitleKey] = item.AltTitle, - [Models.Internal.Rom.FileIsAvailableKey] = item.FileIsAvailable, + [Models.Metadata.Rom.NameKey] = item.Title, + [Models.Metadata.Rom.AltRomnameKey] = item.AltRomname, + [Models.Metadata.Rom.AltTitleKey] = item.AltTitle, + [Models.Metadata.Rom.FileIsAvailableKey] = item.FileIsAvailable, }; return rom; } diff --git a/SabreTools.Serialization/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/ClrMamePro.Deserializer.cs index 9ec0a6e0..4f600e8d 100644 --- a/SabreTools.Serialization/ClrMamePro.Deserializer.cs +++ b/SabreTools.Serialization/ClrMamePro.Deserializer.cs @@ -911,20 +911,20 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item, bool game = false) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item, bool game = false) { if (item == null) return null; var metadataFile = new MetadataFile(); - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); if (header != null) metadataFile.ClrMamePro = ConvertHeaderFromInternalModel(header); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Game = machines @@ -937,48 +937,48 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.ClrMamePro.ClrMamePro ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static Models.ClrMamePro.ClrMamePro ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var clrMamePro = new Models.ClrMamePro.ClrMamePro { - Name = item.ReadString(Models.Internal.Header.NameKey), - Description = item.ReadString(Models.Internal.Header.DescriptionKey), - RootDir = item.ReadString(Models.Internal.Header.RootDirKey), - Category = item.ReadString(Models.Internal.Header.CategoryKey), - Version = item.ReadString(Models.Internal.Header.VersionKey), - Date = item.ReadString(Models.Internal.Header.DateKey), - Author = item.ReadString(Models.Internal.Header.AuthorKey), - Homepage = item.ReadString(Models.Internal.Header.HomepageKey), - Url = item.ReadString(Models.Internal.Header.UrlKey), - Comment = item.ReadString(Models.Internal.Header.CommentKey), - Header = item.ReadString(Models.Internal.Header.HeaderKey), - Type = item.ReadString(Models.Internal.Header.TypeKey), - ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey), - ForceZipping = item.ReadString(Models.Internal.Header.ForceZippingKey), - ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey), + Name = item.ReadString(Models.Metadata.Header.NameKey), + Description = item.ReadString(Models.Metadata.Header.DescriptionKey), + RootDir = item.ReadString(Models.Metadata.Header.RootDirKey), + Category = item.ReadString(Models.Metadata.Header.CategoryKey), + Version = item.ReadString(Models.Metadata.Header.VersionKey), + Date = item.ReadString(Models.Metadata.Header.DateKey), + Author = item.ReadString(Models.Metadata.Header.AuthorKey), + Homepage = item.ReadString(Models.Metadata.Header.HomepageKey), + Url = item.ReadString(Models.Metadata.Header.UrlKey), + Comment = item.ReadString(Models.Metadata.Header.CommentKey), + Header = item.ReadString(Models.Metadata.Header.HeaderKey), + Type = item.ReadString(Models.Metadata.Header.TypeKey), + ForceMerging = item.ReadString(Models.Metadata.Header.ForceMergingKey), + ForceZipping = item.ReadString(Models.Metadata.Header.ForceZippingKey), + ForcePacking = item.ReadString(Models.Metadata.Header.ForcePackingKey), }; return clrMamePro; } /// - /// Convert from to + /// Convert from to /// - private static GameBase ConvertMachineFromInternalModel(Models.Internal.Machine item, bool game = false) + private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item, bool game = false) { GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine(); - gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey); - gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey); - gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey); - gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey); - gameBase.Category = item.ReadString(Models.Internal.Machine.CategoryKey); - gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey); - gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey); - gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey); + gameBase.Name = item.ReadString(Models.Metadata.Machine.NameKey); + gameBase.Description = item.ReadString(Models.Metadata.Machine.DescriptionKey); + gameBase.Year = item.ReadString(Models.Metadata.Machine.YearKey); + gameBase.Manufacturer = item.ReadString(Models.Metadata.Machine.ManufacturerKey); + gameBase.Category = item.ReadString(Models.Metadata.Machine.CategoryKey); + gameBase.CloneOf = item.ReadString(Models.Metadata.Machine.CloneOfKey); + gameBase.RomOf = item.ReadString(Models.Metadata.Machine.RomOfKey); + gameBase.SampleOf = item.ReadString(Models.Metadata.Machine.SampleOfKey); - var releases = item.Read(Models.Internal.Machine.ReleaseKey); + var releases = item.Read(Models.Metadata.Machine.ReleaseKey); if (releases != null && releases.Any()) { gameBase.Release = releases @@ -987,7 +987,7 @@ namespace SabreTools.Serialization .ToArray(); } - var biosSets = item.Read(Models.Internal.Machine.BiosSetKey); + var biosSets = item.Read(Models.Metadata.Machine.BiosSetKey); if (biosSets != null && biosSets.Any()) { gameBase.BiosSet = biosSets @@ -996,7 +996,7 @@ namespace SabreTools.Serialization .ToArray(); } - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { gameBase.Rom = roms @@ -1005,7 +1005,7 @@ namespace SabreTools.Serialization .ToArray(); } - var disks = item.Read(Models.Internal.Machine.DiskKey); + var disks = item.Read(Models.Metadata.Machine.DiskKey); if (disks != null && disks.Any()) { gameBase.Disk = disks @@ -1014,7 +1014,7 @@ namespace SabreTools.Serialization .ToArray(); } - var medias = item.Read(Models.Internal.Machine.MediaKey); + var medias = item.Read(Models.Metadata.Machine.MediaKey); if (medias != null && medias.Any()) { gameBase.Media = medias @@ -1023,7 +1023,7 @@ namespace SabreTools.Serialization .ToArray(); } - var samples = item.Read(Models.Internal.Machine.SampleKey); + var samples = item.Read(Models.Metadata.Machine.SampleKey); if (samples != null && samples.Any()) { gameBase.Sample = samples @@ -1032,7 +1032,7 @@ namespace SabreTools.Serialization .ToArray(); } - var archives = item.Read(Models.Internal.Machine.ArchiveKey); + var archives = item.Read(Models.Metadata.Machine.ArchiveKey); if (archives != null && archives.Any()) { gameBase.Archive = archives @@ -1041,7 +1041,7 @@ namespace SabreTools.Serialization .ToArray(); } - var chips = item.Read(Models.Internal.Machine.ChipKey); + var chips = item.Read(Models.Metadata.Machine.ChipKey); if (chips != null && chips.Any()) { gameBase.Chip = chips @@ -1050,7 +1050,7 @@ namespace SabreTools.Serialization .ToArray(); } - var videos = item.Read(Models.Internal.Machine.VideoKey); + var videos = item.Read(Models.Metadata.Machine.VideoKey); if (videos != null && videos.Any()) { gameBase.Video = videos @@ -1059,15 +1059,15 @@ namespace SabreTools.Serialization .ToArray(); } - var sound = item.Read(Models.Internal.Machine.SoundKey); + var sound = item.Read(Models.Metadata.Machine.SoundKey); if (sound != null) gameBase.Sound = ConvertFromInternalModel(sound); - var input = item.Read(Models.Internal.Machine.InputKey); + var input = item.Read(Models.Metadata.Machine.InputKey); if (input != null) gameBase.Input = ConvertFromInternalModel(input); - var dipSwitches = item.Read(Models.Internal.Machine.DipSwitchKey); + var dipSwitches = item.Read(Models.Metadata.Machine.DipSwitchKey); if (dipSwitches != null && dipSwitches.Any()) { gameBase.DipSwitch = dipSwitches @@ -1076,7 +1076,7 @@ namespace SabreTools.Serialization .ToArray(); } - var driver = item.Read(Models.Internal.Machine.DriverKey); + var driver = item.Read(Models.Metadata.Machine.DriverKey); if (driver != null) gameBase.Driver = ConvertFromInternalModel(driver); @@ -1084,212 +1084,212 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Archive ConvertFromInternalModel(Models.Internal.Archive item) + private static Archive ConvertFromInternalModel(Models.Metadata.Archive item) { var archive = new Archive { - Name = item.ReadString(Models.Internal.Archive.NameKey), + Name = item.ReadString(Models.Metadata.Archive.NameKey), }; return archive; } /// - /// Convert from to + /// Convert from to /// - private static BiosSet ConvertFromInternalModel(Models.Internal.BiosSet item) + private static BiosSet ConvertFromInternalModel(Models.Metadata.BiosSet item) { var biosset = new BiosSet { - Name = item.ReadString(Models.Internal.BiosSet.NameKey), - Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey), - Default = item.ReadString(Models.Internal.BiosSet.DefaultKey), + Name = item.ReadString(Models.Metadata.BiosSet.NameKey), + Description = item.ReadString(Models.Metadata.BiosSet.DescriptionKey), + Default = item.ReadString(Models.Metadata.BiosSet.DefaultKey), }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static Chip ConvertFromInternalModel(Models.Internal.Chip item) + private static Chip ConvertFromInternalModel(Models.Metadata.Chip item) { var chip = new Chip { - Type = item.ReadString(Models.Internal.Chip.ChipTypeKey), - Name = item.ReadString(Models.Internal.Chip.NameKey), - Flags = item.ReadString(Models.Internal.Chip.FlagsKey), - Clock = item.ReadString(Models.Internal.Chip.ClockKey), + Type = item.ReadString(Models.Metadata.Chip.ChipTypeKey), + Name = item.ReadString(Models.Metadata.Chip.NameKey), + Flags = item.ReadString(Models.Metadata.Chip.FlagsKey), + Clock = item.ReadString(Models.Metadata.Chip.ClockKey), }; return chip; } /// - /// Convert from to + /// Convert from to /// - private static DipSwitch ConvertFromInternalModel(Models.Internal.DipSwitch item) + private static DipSwitch ConvertFromInternalModel(Models.Metadata.DipSwitch item) { var dipswitch = new DipSwitch { - Name = item.ReadString(Models.Internal.DipSwitch.NameKey), - Entry = item[Models.Internal.DipSwitch.EntryKey] as string[], - Default = item.ReadString(Models.Internal.DipSwitch.DefaultKey), + Name = item.ReadString(Models.Metadata.DipSwitch.NameKey), + Entry = item[Models.Metadata.DipSwitch.EntryKey] as string[], + Default = item.ReadString(Models.Metadata.DipSwitch.DefaultKey), }; return dipswitch; } /// - /// Convert from to + /// Convert from to /// - private static Disk ConvertFromInternalModel(Models.Internal.Disk item) + private static Disk ConvertFromInternalModel(Models.Metadata.Disk item) { var disk = new Disk { - Name = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), - Merge = item.ReadString(Models.Internal.Disk.MergeKey), - Status = item.ReadString(Models.Internal.Disk.StatusKey), - Flags = item.ReadString(Models.Internal.Disk.FlagsKey), + Name = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), + Merge = item.ReadString(Models.Metadata.Disk.MergeKey), + Status = item.ReadString(Models.Metadata.Disk.StatusKey), + Flags = item.ReadString(Models.Metadata.Disk.FlagsKey), }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Driver ConvertFromInternalModel(Models.Internal.Driver item) + private static Driver ConvertFromInternalModel(Models.Metadata.Driver item) { var driver = new Driver { - Status = item.ReadString(Models.Internal.Driver.StatusKey), - Color = item.ReadString(Models.Internal.Driver.ColorKey), - Sound = item.ReadString(Models.Internal.Driver.SoundKey), - PaletteSize = item.ReadString(Models.Internal.Driver.PaletteSizeKey), - Blit = item.ReadString(Models.Internal.Driver.BlitKey), + Status = item.ReadString(Models.Metadata.Driver.StatusKey), + Color = item.ReadString(Models.Metadata.Driver.ColorKey), + Sound = item.ReadString(Models.Metadata.Driver.SoundKey), + PaletteSize = item.ReadString(Models.Metadata.Driver.PaletteSizeKey), + Blit = item.ReadString(Models.Metadata.Driver.BlitKey), }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Input ConvertFromInternalModel(Models.Internal.Input item) + private static Input ConvertFromInternalModel(Models.Metadata.Input item) { var input = new Input { - Players = item.ReadString(Models.Internal.Input.PlayersKey), - Control = item.ReadString(Models.Internal.Input.ControlKey), - Buttons = item.ReadString(Models.Internal.Input.ButtonsKey), - Coins = item.ReadString(Models.Internal.Input.CoinsKey), - Tilt = item.ReadString(Models.Internal.Input.TiltKey), - Service = item.ReadString(Models.Internal.Input.ServiceKey), + Players = item.ReadString(Models.Metadata.Input.PlayersKey), + Control = item.ReadString(Models.Metadata.Input.ControlKey), + Buttons = item.ReadString(Models.Metadata.Input.ButtonsKey), + Coins = item.ReadString(Models.Metadata.Input.CoinsKey), + Tilt = item.ReadString(Models.Metadata.Input.TiltKey), + Service = item.ReadString(Models.Metadata.Input.ServiceKey), }; return input; } /// - /// Convert from to + /// Convert from to /// - private static Media ConvertFromInternalModel(Models.Internal.Media item) + private static Media ConvertFromInternalModel(Models.Metadata.Media item) { var media = new Media { - Name = item.ReadString(Models.Internal.Media.NameKey), - MD5 = item.ReadString(Models.Internal.Media.MD5Key), - SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), - SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), + Name = item.ReadString(Models.Metadata.Media.NameKey), + MD5 = item.ReadString(Models.Metadata.Media.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Media.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Media.SHA256Key), + SpamSum = item.ReadString(Models.Metadata.Media.SpamSumKey), }; return media; } /// - /// Convert from to + /// Convert from to /// - private static Release ConvertFromInternalModel(Models.Internal.Release item) + private static Release ConvertFromInternalModel(Models.Metadata.Release item) { var release = new Release { - Name = item.ReadString(Models.Internal.Release.NameKey), - Region = item.ReadString(Models.Internal.Release.RegionKey), - Language = item.ReadString(Models.Internal.Release.LanguageKey), - Date = item.ReadString(Models.Internal.Release.DateKey), - Default = item.ReadString(Models.Internal.Release.DefaultKey), + Name = item.ReadString(Models.Metadata.Release.NameKey), + Region = item.ReadString(Models.Metadata.Release.RegionKey), + Language = item.ReadString(Models.Metadata.Release.LanguageKey), + Date = item.ReadString(Models.Metadata.Release.DateKey), + Default = item.ReadString(Models.Metadata.Release.DefaultKey), }; return release; } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertFromInternalModel(Models.Internal.Rom item) + private static Rom ConvertFromInternalModel(Models.Metadata.Rom item) { var rom = new Rom { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - MD5 = item.ReadString(Models.Internal.Rom.MD5Key), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), - SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), - SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), - SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), - xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key), - xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key), - Merge = item.ReadString(Models.Internal.Rom.MergeKey), - Status = item.ReadString(Models.Internal.Rom.StatusKey), - Region = item.ReadString(Models.Internal.Rom.RegionKey), - Flags = item.ReadString(Models.Internal.Rom.FlagsKey), - Offs = item.ReadString(Models.Internal.Rom.OffsetKey), - Serial = item.ReadString(Models.Internal.Rom.SerialKey), - Header = item.ReadString(Models.Internal.Rom.HeaderKey), - Date = item.ReadString(Models.Internal.Rom.DateKey), - Inverted = item.ReadString(Models.Internal.Rom.InvertedKey), - MIA = item.ReadString(Models.Internal.Rom.MIAKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + MD5 = item.ReadString(Models.Metadata.Rom.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Rom.SHA256Key), + SHA384 = item.ReadString(Models.Metadata.Rom.SHA384Key), + SHA512 = item.ReadString(Models.Metadata.Rom.SHA512Key), + SpamSum = item.ReadString(Models.Metadata.Rom.SpamSumKey), + xxHash364 = item.ReadString(Models.Metadata.Rom.xxHash364Key), + xxHash3128 = item.ReadString(Models.Metadata.Rom.xxHash3128Key), + Merge = item.ReadString(Models.Metadata.Rom.MergeKey), + Status = item.ReadString(Models.Metadata.Rom.StatusKey), + Region = item.ReadString(Models.Metadata.Rom.RegionKey), + Flags = item.ReadString(Models.Metadata.Rom.FlagsKey), + Offs = item.ReadString(Models.Metadata.Rom.OffsetKey), + Serial = item.ReadString(Models.Metadata.Rom.SerialKey), + Header = item.ReadString(Models.Metadata.Rom.HeaderKey), + Date = item.ReadString(Models.Metadata.Rom.DateKey), + Inverted = item.ReadString(Models.Metadata.Rom.InvertedKey), + MIA = item.ReadString(Models.Metadata.Rom.MIAKey), }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Sample ConvertFromInternalModel(Models.Internal.Sample item) + private static Sample ConvertFromInternalModel(Models.Metadata.Sample item) { var sample = new Sample { - Name = item.ReadString(Models.Internal.Sample.NameKey), + Name = item.ReadString(Models.Metadata.Sample.NameKey), }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static Sound ConvertFromInternalModel(Models.Internal.Sound item) + private static Sound ConvertFromInternalModel(Models.Metadata.Sound item) { var sound = new Sound { - Channels = item.ReadString(Models.Internal.Sound.ChannelsKey), + Channels = item.ReadString(Models.Metadata.Sound.ChannelsKey), }; return sound; } /// - /// Convert from to + /// Convert from to /// - private static Video ConvertFromInternalModel(Models.Internal.Video item) + private static Video ConvertFromInternalModel(Models.Metadata.Video item) { var video = new Video { - Screen = item.ReadString(Models.Internal.Video.ScreenKey), - Orientation = item.ReadString(Models.Internal.Video.OrientationKey), - X = item.ReadString(Models.Internal.Video.WidthKey), - Y = item.ReadString(Models.Internal.Video.HeightKey), - AspectX = item.ReadString(Models.Internal.Video.AspectXKey), - AspectY = item.ReadString(Models.Internal.Video.AspectYKey), - Freq = item.ReadString(Models.Internal.Video.RefreshKey), + Screen = item.ReadString(Models.Metadata.Video.ScreenKey), + Orientation = item.ReadString(Models.Metadata.Video.OrientationKey), + X = item.ReadString(Models.Metadata.Video.WidthKey), + Y = item.ReadString(Models.Metadata.Video.HeightKey), + AspectX = item.ReadString(Models.Metadata.Video.AspectXKey), + AspectY = item.ReadString(Models.Metadata.Video.AspectYKey), + Freq = item.ReadString(Models.Metadata.Video.RefreshKey), }; return video; } diff --git a/SabreTools.Serialization/ClrMamePro.Serializer.cs b/SabreTools.Serialization/ClrMamePro.Serializer.cs index aa7164ba..92cc2126 100644 --- a/SabreTools.Serialization/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization/ClrMamePro.Serializer.cs @@ -463,21 +463,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile(); + var metadataFile = new Models.Metadata.MetadataFile(); if (item?.ClrMamePro != null) - metadataFile[Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.ClrMamePro); + metadataFile[Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.ClrMamePro); if (item?.Game != null && item.Game.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Game .Where(g => g != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -487,51 +487,51 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Models.ClrMamePro.ClrMamePro item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Models.ClrMamePro.ClrMamePro item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = item.Name, - [Models.Internal.Header.DescriptionKey] = item.Description, - [Models.Internal.Header.RootDirKey] = item.RootDir, - [Models.Internal.Header.CategoryKey] = item.Category, - [Models.Internal.Header.VersionKey] = item.Version, - [Models.Internal.Header.DateKey] = item.Date, - [Models.Internal.Header.AuthorKey] = item.Author, - [Models.Internal.Header.HomepageKey] = item.Homepage, - [Models.Internal.Header.UrlKey] = item.Url, - [Models.Internal.Header.CommentKey] = item.Comment, - [Models.Internal.Header.HeaderKey] = item.Header, - [Models.Internal.Header.TypeKey] = item.Type, - [Models.Internal.Header.ForceMergingKey] = item.ForceMerging, - [Models.Internal.Header.ForceZippingKey] = item.ForceZipping, - [Models.Internal.Header.ForcePackingKey] = item.ForcePacking, + [Models.Metadata.Header.NameKey] = item.Name, + [Models.Metadata.Header.DescriptionKey] = item.Description, + [Models.Metadata.Header.RootDirKey] = item.RootDir, + [Models.Metadata.Header.CategoryKey] = item.Category, + [Models.Metadata.Header.VersionKey] = item.Version, + [Models.Metadata.Header.DateKey] = item.Date, + [Models.Metadata.Header.AuthorKey] = item.Author, + [Models.Metadata.Header.HomepageKey] = item.Homepage, + [Models.Metadata.Header.UrlKey] = item.Url, + [Models.Metadata.Header.CommentKey] = item.Comment, + [Models.Metadata.Header.HeaderKey] = item.Header, + [Models.Metadata.Header.TypeKey] = item.Type, + [Models.Metadata.Header.ForceMergingKey] = item.ForceMerging, + [Models.Metadata.Header.ForceZippingKey] = item.ForceZipping, + [Models.Metadata.Header.ForcePackingKey] = item.ForcePacking, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(GameBase item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(GameBase item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, - [Models.Internal.Machine.DescriptionKey] = item.Description, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, - [Models.Internal.Machine.CategoryKey] = item.Category, - [Models.Internal.Machine.CloneOfKey] = item.CloneOf, - [Models.Internal.Machine.RomOfKey] = item.RomOf, - [Models.Internal.Machine.SampleOfKey] = item.SampleOf, + [Models.Metadata.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.DescriptionKey] = item.Description, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, + [Models.Metadata.Machine.CategoryKey] = item.Category, + [Models.Metadata.Machine.CloneOfKey] = item.CloneOf, + [Models.Metadata.Machine.RomOfKey] = item.RomOf, + [Models.Metadata.Machine.SampleOfKey] = item.SampleOf, }; if (item.Release != null && item.Release.Any()) { - machine[Models.Internal.Machine.ReleaseKey] = item.Release + machine[Models.Metadata.Machine.ReleaseKey] = item.Release .Where(r => r != null) .Select(ConvertToInternalModel) .ToArray(); @@ -539,7 +539,7 @@ namespace SabreTools.Serialization if (item.BiosSet != null && item.BiosSet.Any()) { - machine[Models.Internal.Machine.BiosSetKey] = item.BiosSet + machine[Models.Metadata.Machine.BiosSetKey] = item.BiosSet .Where(b => b != null) .Select(ConvertToInternalModel) .ToArray(); @@ -547,7 +547,7 @@ namespace SabreTools.Serialization if (item.Rom != null && item.Rom.Any()) { - machine[Models.Internal.Machine.RomKey] = item.Rom + machine[Models.Metadata.Machine.RomKey] = item.Rom .Where(r => r != null) .Select(ConvertToInternalModel) .ToArray(); @@ -555,7 +555,7 @@ namespace SabreTools.Serialization if (item.Disk != null && item.Disk.Any()) { - machine[Models.Internal.Machine.DiskKey] = item.Disk + machine[Models.Metadata.Machine.DiskKey] = item.Disk .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -563,7 +563,7 @@ namespace SabreTools.Serialization if (item.Media != null && item.Media.Any()) { - machine[Models.Internal.Machine.MediaKey] = item.Media + machine[Models.Metadata.Machine.MediaKey] = item.Media .Where(m => m != null) .Select(ConvertToInternalModel) .ToArray(); @@ -571,7 +571,7 @@ namespace SabreTools.Serialization if (item.Sample != null && item.Sample.Any()) { - machine[Models.Internal.Machine.SampleKey] = item.Sample + machine[Models.Metadata.Machine.SampleKey] = item.Sample .Where(s => s != null) .Select(ConvertToInternalModel) .ToArray(); @@ -579,7 +579,7 @@ namespace SabreTools.Serialization if (item.Archive != null && item.Archive.Any()) { - machine[Models.Internal.Machine.ArchiveKey] = item.Archive + machine[Models.Metadata.Machine.ArchiveKey] = item.Archive .Where(a => a != null) .Select(ConvertToInternalModel) .ToArray(); @@ -587,7 +587,7 @@ namespace SabreTools.Serialization if (item.Chip != null && item.Chip.Any()) { - machine[Models.Internal.Machine.ChipKey] = item.Chip + machine[Models.Metadata.Machine.ChipKey] = item.Chip .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -595,239 +595,239 @@ namespace SabreTools.Serialization if (item.Video != null) { - machine[Models.Internal.Machine.VideoKey] = item.Video + machine[Models.Metadata.Machine.VideoKey] = item.Video .Where(v => v != null) .Select(ConvertToInternalModel) .ToArray(); } if (item.Sound != null) - machine[Models.Internal.Machine.SoundKey] = ConvertToInternalModel(item.Sound); + machine[Models.Metadata.Machine.SoundKey] = ConvertToInternalModel(item.Sound); if (item.Input != null) - machine[Models.Internal.Machine.InputKey] = ConvertToInternalModel(item.Input); + machine[Models.Metadata.Machine.InputKey] = ConvertToInternalModel(item.Input); if (item.DipSwitch != null && item.DipSwitch.Any()) { - machine[Models.Internal.Machine.DipSwitchKey] = item.DipSwitch + machine[Models.Metadata.Machine.DipSwitchKey] = item.DipSwitch .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); } if (item.Driver != null) - machine[Models.Internal.Machine.DriverKey] = ConvertToInternalModel(item.Driver); + machine[Models.Metadata.Machine.DriverKey] = ConvertToInternalModel(item.Driver); return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Archive ConvertToInternalModel(Archive item) + private static Models.Metadata.Archive ConvertToInternalModel(Archive item) { - var archive = new Models.Internal.Archive + var archive = new Models.Metadata.Archive { - [Models.Internal.Archive.NameKey] = item.Name, + [Models.Metadata.Archive.NameKey] = item.Name, }; return archive; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.BiosSet ConvertToInternalModel(BiosSet item) + private static Models.Metadata.BiosSet ConvertToInternalModel(BiosSet item) { - var biosset = new Models.Internal.BiosSet + var biosset = new Models.Metadata.BiosSet { - [Models.Internal.BiosSet.NameKey] = item.Name, - [Models.Internal.BiosSet.DescriptionKey] = item.Description, - [Models.Internal.BiosSet.DefaultKey] = item.Default, + [Models.Metadata.BiosSet.NameKey] = item.Name, + [Models.Metadata.BiosSet.DescriptionKey] = item.Description, + [Models.Metadata.BiosSet.DefaultKey] = item.Default, }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Chip ConvertToInternalModel(Chip item) + private static Models.Metadata.Chip ConvertToInternalModel(Chip item) { - var chip = new Models.Internal.Chip + var chip = new Models.Metadata.Chip { - [Models.Internal.Chip.ChipTypeKey] = item.Type, - [Models.Internal.Chip.NameKey] = item.Name, - [Models.Internal.Chip.FlagsKey] = item.Flags, - [Models.Internal.Chip.ClockKey] = item.Clock, + [Models.Metadata.Chip.ChipTypeKey] = item.Type, + [Models.Metadata.Chip.NameKey] = item.Name, + [Models.Metadata.Chip.FlagsKey] = item.Flags, + [Models.Metadata.Chip.ClockKey] = item.Clock, }; return chip; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipSwitch ConvertToInternalModel(DipSwitch item) + private static Models.Metadata.DipSwitch ConvertToInternalModel(DipSwitch item) { - var dipswitch = new Models.Internal.DipSwitch + var dipswitch = new Models.Metadata.DipSwitch { - [Models.Internal.DipSwitch.NameKey] = item.Name, - [Models.Internal.DipSwitch.EntryKey] = item.Entry, - [Models.Internal.DipSwitch.DefaultKey] = item.Default, + [Models.Metadata.DipSwitch.NameKey] = item.Name, + [Models.Metadata.DipSwitch.EntryKey] = item.Entry, + [Models.Metadata.DipSwitch.DefaultKey] = item.Default, }; return dipswitch; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Disk ConvertToInternalModel(Disk item) + private static Models.Metadata.Disk ConvertToInternalModel(Disk item) { - var disk = new Models.Internal.Disk + var disk = new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.Name, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, - [Models.Internal.Disk.MergeKey] = item.Merge, - [Models.Internal.Disk.StatusKey] = item.Status, - [Models.Internal.Disk.FlagsKey] = item.Flags, + [Models.Metadata.Disk.NameKey] = item.Name, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.MergeKey] = item.Merge, + [Models.Metadata.Disk.StatusKey] = item.Status, + [Models.Metadata.Disk.FlagsKey] = item.Flags, }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Driver ConvertToInternalModel(Driver item) + private static Models.Metadata.Driver ConvertToInternalModel(Driver item) { - var driver = new Models.Internal.Driver + var driver = new Models.Metadata.Driver { - [Models.Internal.Driver.StatusKey] = item.Status, - [Models.Internal.Driver.ColorKey] = item.Color, - [Models.Internal.Driver.SoundKey] = item.Sound, - [Models.Internal.Driver.PaletteSizeKey] = item.PaletteSize, - [Models.Internal.Driver.BlitKey] = item.Blit, + [Models.Metadata.Driver.StatusKey] = item.Status, + [Models.Metadata.Driver.ColorKey] = item.Color, + [Models.Metadata.Driver.SoundKey] = item.Sound, + [Models.Metadata.Driver.PaletteSizeKey] = item.PaletteSize, + [Models.Metadata.Driver.BlitKey] = item.Blit, }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Input ConvertToInternalModel(Input item) + private static Models.Metadata.Input ConvertToInternalModel(Input item) { - var input = new Models.Internal.Input + var input = new Models.Metadata.Input { - [Models.Internal.Input.PlayersKey] = item.Players, - [Models.Internal.Input.ControlKey] = item.Control, - [Models.Internal.Input.ButtonsKey] = item.Buttons, - [Models.Internal.Input.CoinsKey] = item.Coins, - [Models.Internal.Input.TiltKey] = item.Tilt, - [Models.Internal.Input.ServiceKey] = item.Service, + [Models.Metadata.Input.PlayersKey] = item.Players, + [Models.Metadata.Input.ControlKey] = item.Control, + [Models.Metadata.Input.ButtonsKey] = item.Buttons, + [Models.Metadata.Input.CoinsKey] = item.Coins, + [Models.Metadata.Input.TiltKey] = item.Tilt, + [Models.Metadata.Input.ServiceKey] = item.Service, }; return input; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Media ConvertToInternalModel(Media item) + private static Models.Metadata.Media ConvertToInternalModel(Media item) { - var media = new Models.Internal.Media + var media = new Models.Metadata.Media { - [Models.Internal.Media.NameKey] = item.Name, - [Models.Internal.Media.MD5Key] = item.MD5, - [Models.Internal.Media.SHA1Key] = item.SHA1, - [Models.Internal.Media.SHA256Key] = item.SHA256, - [Models.Internal.Media.SpamSumKey] = item.SpamSum, + [Models.Metadata.Media.NameKey] = item.Name, + [Models.Metadata.Media.MD5Key] = item.MD5, + [Models.Metadata.Media.SHA1Key] = item.SHA1, + [Models.Metadata.Media.SHA256Key] = item.SHA256, + [Models.Metadata.Media.SpamSumKey] = item.SpamSum, }; return media; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Release ConvertToInternalModel(Release item) + private static Models.Metadata.Release ConvertToInternalModel(Release item) { - var release = new Models.Internal.Release + var release = new Models.Metadata.Release { - [Models.Internal.Release.NameKey] = item.Name, - [Models.Internal.Release.RegionKey] = item.Region, - [Models.Internal.Release.LanguageKey] = item.Language, - [Models.Internal.Release.DateKey] = item.Date, - [Models.Internal.Release.DefaultKey] = item.Default, + [Models.Metadata.Release.NameKey] = item.Name, + [Models.Metadata.Release.RegionKey] = item.Region, + [Models.Metadata.Release.LanguageKey] = item.Language, + [Models.Metadata.Release.DateKey] = item.Date, + [Models.Metadata.Release.DefaultKey] = item.Default, }; return release; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Rom item) + private static Models.Metadata.Rom ConvertToInternalModel(Rom item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.MD5Key] = item.MD5, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.SHA256Key] = item.SHA256, - [Models.Internal.Rom.SHA384Key] = item.SHA384, - [Models.Internal.Rom.SHA512Key] = item.SHA512, - [Models.Internal.Rom.SpamSumKey] = item.SpamSum, - [Models.Internal.Rom.xxHash364Key] = item.xxHash364, - [Models.Internal.Rom.xxHash3128Key] = item.xxHash3128, - [Models.Internal.Rom.MergeKey] = item.Merge, - [Models.Internal.Rom.StatusKey] = item.Status, - [Models.Internal.Rom.RegionKey] = item.Region, - [Models.Internal.Rom.FlagsKey] = item.Flags, - [Models.Internal.Rom.OffsetKey] = item.Offs, - [Models.Internal.Rom.SerialKey] = item.Serial, - [Models.Internal.Rom.HeaderKey] = item.Header, - [Models.Internal.Rom.DateKey] = item.Date, - [Models.Internal.Rom.InvertedKey] = item.Inverted, - [Models.Internal.Rom.MIAKey] = item.MIA, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.MD5Key] = item.MD5, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.SHA256Key] = item.SHA256, + [Models.Metadata.Rom.SHA384Key] = item.SHA384, + [Models.Metadata.Rom.SHA512Key] = item.SHA512, + [Models.Metadata.Rom.SpamSumKey] = item.SpamSum, + [Models.Metadata.Rom.xxHash364Key] = item.xxHash364, + [Models.Metadata.Rom.xxHash3128Key] = item.xxHash3128, + [Models.Metadata.Rom.MergeKey] = item.Merge, + [Models.Metadata.Rom.StatusKey] = item.Status, + [Models.Metadata.Rom.RegionKey] = item.Region, + [Models.Metadata.Rom.FlagsKey] = item.Flags, + [Models.Metadata.Rom.OffsetKey] = item.Offs, + [Models.Metadata.Rom.SerialKey] = item.Serial, + [Models.Metadata.Rom.HeaderKey] = item.Header, + [Models.Metadata.Rom.DateKey] = item.Date, + [Models.Metadata.Rom.InvertedKey] = item.Inverted, + [Models.Metadata.Rom.MIAKey] = item.MIA, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Sample ConvertToInternalModel(Sample item) + private static Models.Metadata.Sample ConvertToInternalModel(Sample item) { - var sample = new Models.Internal.Sample + var sample = new Models.Metadata.Sample { - [Models.Internal.Sample.NameKey] = item.Name, + [Models.Metadata.Sample.NameKey] = item.Name, }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Sound ConvertToInternalModel(Sound item) + private static Models.Metadata.Sound ConvertToInternalModel(Sound item) { - var sound = new Models.Internal.Sound + var sound = new Models.Metadata.Sound { - [Models.Internal.Sound.ChannelsKey] = item.Channels, + [Models.Metadata.Sound.ChannelsKey] = item.Channels, }; return sound; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Video ConvertToInternalModel(Video item) + private static Models.Metadata.Video ConvertToInternalModel(Video item) { - var video = new Models.Internal.Video + var video = new Models.Metadata.Video { - [Models.Internal.Video.ScreenKey] = item.Screen, - [Models.Internal.Video.OrientationKey] = item.Orientation, - [Models.Internal.Video.WidthKey] = item.X, - [Models.Internal.Video.HeightKey] = item.Y, - [Models.Internal.Video.AspectXKey] = item.AspectX, - [Models.Internal.Video.AspectYKey] = item.AspectY, - [Models.Internal.Video.RefreshKey] = item.Freq, + [Models.Metadata.Video.ScreenKey] = item.Screen, + [Models.Metadata.Video.OrientationKey] = item.Orientation, + [Models.Metadata.Video.WidthKey] = item.X, + [Models.Metadata.Video.HeightKey] = item.Y, + [Models.Metadata.Video.AspectXKey] = item.AspectX, + [Models.Metadata.Video.AspectYKey] = item.AspectY, + [Models.Metadata.Video.RefreshKey] = item.Freq, }; return video; } diff --git a/SabreTools.Serialization/DosCenter.Deserializer.cs b/SabreTools.Serialization/DosCenter.Deserializer.cs index a271cf0a..f8d3fa86 100644 --- a/SabreTools.Serialization/DosCenter.Deserializer.cs +++ b/SabreTools.Serialization/DosCenter.Deserializer.cs @@ -233,20 +233,20 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; var metadataFile = new MetadataFile(); - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); if (header != null) metadataFile.DosCenter = ConvertHeaderFromInternalModel(header); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Game = machines @@ -259,34 +259,34 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.DosCenter.DosCenter ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static Models.DosCenter.DosCenter ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var dosCenter = new Models.DosCenter.DosCenter { - Name = item.ReadString(Models.Internal.Header.NameKey), - Description = item.ReadString(Models.Internal.Header.DescriptionKey), - Version = item.ReadString(Models.Internal.Header.VersionKey), - Date = item.ReadString(Models.Internal.Header.DateKey), - Author = item.ReadString(Models.Internal.Header.AuthorKey), - Homepage = item.ReadString(Models.Internal.Header.HomepageKey), - Comment = item.ReadString(Models.Internal.Header.CommentKey), + Name = item.ReadString(Models.Metadata.Header.NameKey), + Description = item.ReadString(Models.Metadata.Header.DescriptionKey), + Version = item.ReadString(Models.Metadata.Header.VersionKey), + Date = item.ReadString(Models.Metadata.Header.DateKey), + Author = item.ReadString(Models.Metadata.Header.AuthorKey), + Homepage = item.ReadString(Models.Metadata.Header.HomepageKey), + Comment = item.ReadString(Models.Metadata.Header.CommentKey), }; return dosCenter; } /// - /// Convert from to + /// Convert from to /// - private static Game ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Game ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var game = new Game { - Name = item.ReadString(Models.Internal.Machine.NameKey), + Name = item.ReadString(Models.Metadata.Machine.NameKey), }; - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { game.File = roms @@ -299,16 +299,16 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.DosCenter.File ConvertFromInternalModel(Models.Internal.Rom item) + private static Models.DosCenter.File ConvertFromInternalModel(Models.Metadata.Rom item) { var file = new Models.DosCenter.File { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - Date = item.ReadString(Models.Internal.Rom.DateKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + Date = item.ReadString(Models.Metadata.Rom.DateKey), }; return file; } diff --git a/SabreTools.Serialization/DosCenter.Serializer.cs b/SabreTools.Serialization/DosCenter.Serializer.cs index 2c4b34d9..4d6ecd10 100644 --- a/SabreTools.Serialization/DosCenter.Serializer.cs +++ b/SabreTools.Serialization/DosCenter.Serializer.cs @@ -149,21 +149,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile(); + var metadataFile = new Models.Metadata.MetadataFile(); if (item?.DosCenter != null) - metadataFile[Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.DosCenter); + metadataFile[Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item.DosCenter); if (item?.Game != null && item.Game.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Game .Where(g => g != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -173,36 +173,36 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Models.DosCenter.DosCenter item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Models.DosCenter.DosCenter item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = item.Name, - [Models.Internal.Header.DescriptionKey] = item.Description, - [Models.Internal.Header.VersionKey] = item.Version, - [Models.Internal.Header.DateKey] = item.Date, - [Models.Internal.Header.AuthorKey] = item.Author, - [Models.Internal.Header.HomepageKey] = item.Homepage, - [Models.Internal.Header.CommentKey] = item.Comment, + [Models.Metadata.Header.NameKey] = item.Name, + [Models.Metadata.Header.DescriptionKey] = item.Description, + [Models.Metadata.Header.VersionKey] = item.Version, + [Models.Metadata.Header.DateKey] = item.Date, + [Models.Metadata.Header.AuthorKey] = item.Author, + [Models.Metadata.Header.HomepageKey] = item.Homepage, + [Models.Metadata.Header.CommentKey] = item.Comment, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Game item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Game item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.NameKey] = item.Name, }; if (item.File != null && item.File.Any()) { - machine[Models.Internal.Machine.RomKey] = item.File + machine[Models.Metadata.Machine.RomKey] = item.File .Where(f => f != null) .Select(ConvertToInternalModel) .ToArray(); @@ -212,16 +212,16 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Models.DosCenter.File item) + private static Models.Metadata.Rom ConvertToInternalModel(Models.DosCenter.File item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.DateKey] = item.Date, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.DateKey] = item.Date, }; return rom; } diff --git a/SabreTools.Serialization/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/EverdriveSMDB.Deserializer.cs index d52a695c..b5280b87 100644 --- a/SabreTools.Serialization/EverdriveSMDB.Deserializer.cs +++ b/SabreTools.Serialization/EverdriveSMDB.Deserializer.cs @@ -81,16 +81,16 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; var metadataFile = new MetadataFile(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Row = machines @@ -103,11 +103,11 @@ namespace SabreTools.Serialization } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static Row[] ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Row[] ConvertMachineFromInternalModel(Models.Metadata.Machine item) { - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms == null || !roms.Any()) return Array.Empty(); @@ -118,18 +118,18 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Rom item) + private static Row ConvertFromInternalModel(Models.Metadata.Rom item) { var row = new Row { - SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), - Name = item.ReadString(Models.Internal.Rom.NameKey), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - MD5 = item.ReadString(Models.Internal.Rom.MD5Key), - CRC32 = item.ReadString(Models.Internal.Rom.CRCKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), + SHA256 = item.ReadString(Models.Metadata.Rom.SHA256Key), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + MD5 = item.ReadString(Models.Metadata.Rom.MD5Key), + CRC32 = item.ReadString(Models.Metadata.Rom.CRCKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), }; return row; } diff --git a/SabreTools.Serialization/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/EverdriveSMDB.Serializer.cs index 31a9f976..4a327656 100644 --- a/SabreTools.Serialization/EverdriveSMDB.Serializer.cs +++ b/SabreTools.Serialization/EverdriveSMDB.Serializer.cs @@ -89,21 +89,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), }; if (item?.Row != null && item.Row.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Row + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Row .Where(r => r != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -113,42 +113,42 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel() + private static Models.Metadata.Header ConvertHeaderToInternalModel() { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = "Everdrive SMDB", + [Models.Metadata.Header.NameKey] = "Everdrive SMDB", }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Row item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Row item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.RomKey] = ConvertToInternalModel(item), + [Models.Metadata.Machine.RomKey] = ConvertToInternalModel(item), }; return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Row item) + private static Models.Metadata.Rom ConvertToInternalModel(Row item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SHA256Key] = item.SHA256, - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.MD5Key] = item.MD5, - [Models.Internal.Rom.CRCKey] = item.CRC32, - [Models.Internal.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.SHA256Key] = item.SHA256, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.MD5Key] = item.MD5, + [Models.Metadata.Rom.CRCKey] = item.CRC32, + [Models.Metadata.Rom.SizeKey] = item.Size, }; return rom; } diff --git a/SabreTools.Serialization/Hashfile.Deserializer.cs b/SabreTools.Serialization/Hashfile.Deserializer.cs index c970f508..f02a7329 100644 --- a/SabreTools.Serialization/Hashfile.Deserializer.cs +++ b/SabreTools.Serialization/Hashfile.Deserializer.cs @@ -145,15 +145,15 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to an array of + /// Convert from to an array of /// /// TODO: Add machine name prefixes to all items - public static Models.Hashfile.Hashfile? ConvertFromInternalModel(Models.Internal.MetadataFile? item, Hash hash) + public static Models.Hashfile.Hashfile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item, Hash hash) { if (item == null) return null; - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines == null || !machines.Any()) return null; @@ -208,14 +208,14 @@ namespace SabreTools.Serialization } /// - /// Convert from to an array of + /// Convert from to an array of /// - public static Models.Hashfile.Hashfile[]? ConvertArrayFromInternalModel(Models.Internal.MetadataFile? item, Hash hash) + public static Models.Hashfile.Hashfile[]? ConvertArrayFromInternalModel(Models.Metadata.MetadataFile? item, Hash hash) { if (item == null) return null; - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { return machines @@ -228,11 +228,11 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Hashfile.Hashfile ConvertMachineFromInternalModel(Models.Internal.Machine item, Hash hash) + private static Models.Hashfile.Hashfile ConvertMachineFromInternalModel(Models.Metadata.Machine item, Hash hash) { - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms == null) return new Models.Hashfile.Hashfile(); @@ -284,92 +284,92 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static MD5 ConvertToMD5(Models.Internal.Rom item) + private static MD5 ConvertToMD5(Models.Metadata.Rom item) { var md5 = new MD5 { - Hash = item.ReadString(Models.Internal.Rom.MD5Key), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.MD5Key), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return md5; } /// - /// Convert from to + /// Convert from to /// - private static SFV ConvertToSFV(Models.Internal.Rom item) + private static SFV ConvertToSFV(Models.Metadata.Rom item) { var sfv = new SFV { - File = item.ReadString(Models.Internal.Rom.NameKey), - Hash = item.ReadString(Models.Internal.Rom.CRCKey), + File = item.ReadString(Models.Metadata.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.CRCKey), }; return sfv; } /// - /// Convert from to + /// Convert from to /// - private static SHA1 ConvertToSHA1(Models.Internal.Rom item) + private static SHA1 ConvertToSHA1(Models.Metadata.Rom item) { var sha1 = new SHA1 { - Hash = item.ReadString(Models.Internal.Rom.SHA1Key), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA1Key), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return sha1; } /// - /// Convert from to + /// Convert from to /// - private static SHA256 ConvertToSHA256(Models.Internal.Rom item) + private static SHA256 ConvertToSHA256(Models.Metadata.Rom item) { var sha256 = new SHA256 { - Hash = item.ReadString(Models.Internal.Rom.SHA256Key), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA256Key), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return sha256; } /// - /// Convert from to + /// Convert from to /// - private static SHA384 ConvertToSHA384(Models.Internal.Rom item) + private static SHA384 ConvertToSHA384(Models.Metadata.Rom item) { var sha384 = new SHA384 { - Hash = item.ReadString(Models.Internal.Rom.SHA384Key), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA384Key), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return sha384; } /// - /// Convert from to + /// Convert from to /// - private static SHA512 ConvertToSHA512(Models.Internal.Rom item) + private static SHA512 ConvertToSHA512(Models.Metadata.Rom item) { var sha512 = new SHA512 { - Hash = item.ReadString(Models.Internal.Rom.SHA512Key), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA512Key), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return sha512; } /// - /// Convert from to + /// Convert from to /// - private static SpamSum ConvertToSpamSum(Models.Internal.Rom item) + private static SpamSum ConvertToSpamSum(Models.Metadata.Rom item) { var spamsum = new SpamSum { - Hash = item.ReadString(Models.Internal.Rom.SpamSumKey), - File = item.ReadString(Models.Internal.Rom.NameKey), + Hash = item.ReadString(Models.Metadata.Rom.SpamSumKey), + File = item.ReadString(Models.Metadata.Rom.NameKey), }; return spamsum; } diff --git a/SabreTools.Serialization/Hashfile.Serializer.cs b/SabreTools.Serialization/Hashfile.Serializer.cs index 1ce5c295..7463a0b4 100644 --- a/SabreTools.Serialization/Hashfile.Serializer.cs +++ b/SabreTools.Serialization/Hashfile.Serializer.cs @@ -256,148 +256,148 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(Models.Hashfile.Hashfile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(Models.Hashfile.Hashfile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), }; var machine = ConvertMachineToInternalModel(item); - metadataFile[Models.Internal.MetadataFile.MachineKey] = new Models.Internal.Machine[] { machine }; + metadataFile[Models.Metadata.MetadataFile.MachineKey] = new Models.Metadata.Machine[] { machine }; return metadataFile; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel() + private static Models.Metadata.Header ConvertHeaderToInternalModel() { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = "Hashfile", + [Models.Metadata.Header.NameKey] = "Hashfile", }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Models.Hashfile.Hashfile item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Models.Hashfile.Hashfile item) { - var machine = new Models.Internal.Machine(); + var machine = new Models.Metadata.Machine(); if (item.SFV != null && item.SFV.Any()) - machine[Models.Internal.Machine.RomKey] = item.SFV.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SFV.Select(ConvertToInternalModel).ToArray(); else if (item.MD5 != null && item.MD5.Any()) - machine[Models.Internal.Machine.RomKey] = item.MD5.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.MD5.Select(ConvertToInternalModel).ToArray(); else if (item.SHA1 != null && item.SHA1.Any()) - machine[Models.Internal.Machine.RomKey] = item.SHA1.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SHA1.Select(ConvertToInternalModel).ToArray(); else if (item.SHA256 != null && item.SHA256.Any()) - machine[Models.Internal.Machine.RomKey] = item.SHA256.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SHA256.Select(ConvertToInternalModel).ToArray(); else if (item.SHA384 != null && item.SHA384.Any()) - machine[Models.Internal.Machine.RomKey] = item.SHA384.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SHA384.Select(ConvertToInternalModel).ToArray(); else if (item.SHA512 != null && item.SHA512.Any()) - machine[Models.Internal.Machine.RomKey] = item.SHA512.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SHA512.Select(ConvertToInternalModel).ToArray(); else if (item.SpamSum != null && item.SpamSum.Any()) - machine[Models.Internal.Machine.RomKey] = item.SpamSum.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.SpamSum.Select(ConvertToInternalModel).ToArray(); return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(MD5 item) + private static Models.Metadata.Rom ConvertToInternalModel(MD5 item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.MD5Key] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.MD5Key] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SFV item) + private static Models.Metadata.Rom ConvertToInternalModel(SFV item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.File, - [Models.Internal.Rom.CRCKey] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, + [Models.Metadata.Rom.CRCKey] = item.Hash, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SHA1 item) + private static Models.Metadata.Rom ConvertToInternalModel(SHA1 item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SHA1Key] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.SHA1Key] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SHA256 item) + private static Models.Metadata.Rom ConvertToInternalModel(SHA256 item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SHA256Key] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.SHA256Key] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SHA384 item) + private static Models.Metadata.Rom ConvertToInternalModel(SHA384 item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SHA384Key] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.SHA384Key] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SHA512 item) + private static Models.Metadata.Rom ConvertToInternalModel(SHA512 item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SHA512Key] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.SHA512Key] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(SpamSum item) + private static Models.Metadata.Rom ConvertToInternalModel(SpamSum item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.SpamSumKey] = item.Hash, - [Models.Internal.Rom.NameKey] = item.File, + [Models.Metadata.Rom.SpamSumKey] = item.Hash, + [Models.Metadata.Rom.NameKey] = item.File, }; return rom; } diff --git a/SabreTools.Serialization/Internal.cs b/SabreTools.Serialization/Internal.cs index cc1ba14b..e8085075 100644 --- a/SabreTools.Serialization/Internal.cs +++ b/SabreTools.Serialization/Internal.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using SabreTools.Models.Internal; +using SabreTools.Models.Metadata; namespace SabreTools.Serialization { diff --git a/SabreTools.Serialization/Listrom.Deserializer.cs b/SabreTools.Serialization/Listrom.Deserializer.cs index 3746eb09..78f6e9ff 100644 --- a/SabreTools.Serialization/Listrom.Deserializer.cs +++ b/SabreTools.Serialization/Listrom.Deserializer.cs @@ -193,16 +193,16 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; var metadataFile = new MetadataFile(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Set = machines @@ -215,25 +215,25 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Set ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Set ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var set = new Set(); - if (item.ReadString(Models.Internal.Machine.IsDeviceKey) == "yes") - set.Device = item.ReadString(Models.Internal.Machine.NameKey); + if (item.ReadString(Models.Metadata.Machine.IsDeviceKey) == "yes") + set.Device = item.ReadString(Models.Metadata.Machine.NameKey); else - set.Driver = item.ReadString(Models.Internal.Machine.NameKey); + set.Driver = item.ReadString(Models.Metadata.Machine.NameKey); var rowItems = new List(); - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null) { rowItems.AddRange(roms.Where(r => r != null).Select(ConvertFromInternalModel)); } - var disks = item.Read(Models.Internal.Machine.DiskKey); + var disks = item.Read(Models.Metadata.Machine.DiskKey); if (disks != null) rowItems.AddRange(disks.Where(d => d != null).Select(ConvertFromInternalModel)); @@ -242,41 +242,41 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Disk item) + private static Row ConvertFromInternalModel(Models.Metadata.Disk item) { var row = new Row { - Name = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), + Name = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), }; - if (item[Models.Internal.Disk.StatusKey] as string == "nodump") + if (item[Models.Metadata.Disk.StatusKey] as string == "nodump") row.NoGoodDumpKnown = true; - else if (item[Models.Internal.Disk.StatusKey] as string == "baddump") + else if (item[Models.Metadata.Disk.StatusKey] as string == "baddump") row.Bad = true; return row; } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Rom item) + private static Row ConvertFromInternalModel(Models.Metadata.Rom item) { var row = new Row { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), }; - if (item[Models.Internal.Rom.StatusKey] as string == "nodump") + if (item[Models.Metadata.Rom.StatusKey] as string == "nodump") row.NoGoodDumpKnown = true; - else if (item[Models.Internal.Rom.StatusKey] as string == "baddump") + else if (item[Models.Metadata.Rom.StatusKey] as string == "baddump") row.Bad = true; return row; diff --git a/SabreTools.Serialization/Listrom.Serializer.cs b/SabreTools.Serialization/Listrom.Serializer.cs index 9baede30..5cb7cab9 100644 --- a/SabreTools.Serialization/Listrom.Serializer.cs +++ b/SabreTools.Serialization/Listrom.Serializer.cs @@ -183,21 +183,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), }; if (item?.Set != null && item.Set.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Set + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Set .Where(s => s != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -209,81 +209,81 @@ namespace SabreTools.Serialization /// /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel() + private static Models.Metadata.Header ConvertHeaderToInternalModel() { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = "MAME Listrom", + [Models.Metadata.Header.NameKey] = "MAME Listrom", }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Set item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Set item) { - var machine = new Models.Internal.Machine(); + var machine = new Models.Metadata.Machine(); if (!string.IsNullOrWhiteSpace(item.Device)) { - machine[Models.Internal.Machine.NameKey] = item.Device; - machine[Models.Internal.Machine.IsDeviceKey] = "yes"; + machine[Models.Metadata.Machine.NameKey] = item.Device; + machine[Models.Metadata.Machine.IsDeviceKey] = "yes"; } else { - machine[Models.Internal.Machine.NameKey] = item.Driver; + machine[Models.Metadata.Machine.NameKey] = item.Driver; } if (item.Row != null && item.Row.Any()) { - var datItems = new List(); + var datItems = new List(); foreach (var file in item.Row) { datItems.Add(ConvertToInternalModel(file)); } - machine[Models.Internal.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "disk")?.ToArray(); - machine[Models.Internal.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "rom")?.ToArray(); + machine[Models.Metadata.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "disk")?.ToArray(); + machine[Models.Metadata.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "rom")?.ToArray(); } return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DatItem ConvertToInternalModel(Row item) + private static Models.Metadata.DatItem ConvertToInternalModel(Row item) { if (item.Size == null) { - var disk = new Models.Internal.Disk + var disk = new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.Name, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.NameKey] = item.Name, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, }; if (item.NoGoodDumpKnown) - disk[Models.Internal.Disk.StatusKey] = "nodump"; + disk[Models.Metadata.Disk.StatusKey] = "nodump"; else if (item.Bad) - disk[Models.Internal.Disk.StatusKey] = "baddump"; + disk[Models.Metadata.Disk.StatusKey] = "baddump"; return disk; } else { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, }; if (item.NoGoodDumpKnown) - rom[Models.Internal.Rom.StatusKey] = "nodump"; + rom[Models.Metadata.Rom.StatusKey] = "nodump"; else if (item.Bad) - rom[Models.Internal.Rom.StatusKey] = "baddump"; + rom[Models.Metadata.Rom.StatusKey] = "baddump"; return rom; } diff --git a/SabreTools.Serialization/Listxml.Deserializer.cs b/SabreTools.Serialization/Listxml.Deserializer.cs index ecb6d513..16867da6 100644 --- a/SabreTools.Serialization/Listxml.Deserializer.cs +++ b/SabreTools.Serialization/Listxml.Deserializer.cs @@ -11,17 +11,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static M1? ConvertM1FromInternalModel(Models.Internal.MetadataFile? item) + public static M1? ConvertM1FromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var m1 = header != null ? ConvertM1FromInternalModel(header) : new M1(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { m1.Game = machines @@ -34,17 +34,17 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - public static Mame? ConvertMameFromInternalModel(Models.Internal.MetadataFile? item) + public static Mame? ConvertMameFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var mame = header != null ? ConvertMameFromInternalModel(header) : new Mame(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { mame.Game = machines @@ -57,55 +57,55 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static M1 ConvertM1FromInternalModel(Models.Internal.Header item) + private static M1 ConvertM1FromInternalModel(Models.Metadata.Header item) { var m1 = new M1 { - Version = item.ReadString(Models.Internal.Header.VersionKey), + Version = item.ReadString(Models.Metadata.Header.VersionKey), }; return m1; } /// - /// Convert from to + /// Convert from to /// - private static Mame ConvertMameFromInternalModel(Models.Internal.Header item) + private static Mame ConvertMameFromInternalModel(Models.Metadata.Header item) { var mame = new Mame { - Build = item.ReadString(Models.Internal.Header.BuildKey), - Debug = item.ReadString(Models.Internal.Header.DebugKey), - MameConfig = item.ReadString(Models.Internal.Header.MameConfigKey), + Build = item.ReadString(Models.Metadata.Header.BuildKey), + Debug = item.ReadString(Models.Metadata.Header.DebugKey), + MameConfig = item.ReadString(Models.Metadata.Header.MameConfigKey), }; return mame; } /// - /// Convert from to + /// Convert from to /// - private static GameBase ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var machine = new Machine { - Name = item.ReadString(Models.Internal.Machine.NameKey), - SourceFile = item.ReadString(Models.Internal.Machine.SourceFileKey), - IsBios = item.ReadString(Models.Internal.Machine.IsBiosKey), - IsDevice = item.ReadString(Models.Internal.Machine.IsDeviceKey), - IsMechanical = item.ReadString(Models.Internal.Machine.IsMechanicalKey), - Runnable = item.ReadString(Models.Internal.Machine.RunnableKey), - CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey), - RomOf = item.ReadString(Models.Internal.Machine.RomOfKey), - SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey), - Description = item.ReadString(Models.Internal.Machine.DescriptionKey), - Year = item.ReadString(Models.Internal.Machine.YearKey), - Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey), - History = item.ReadString(Models.Internal.Machine.HistoryKey), + Name = item.ReadString(Models.Metadata.Machine.NameKey), + SourceFile = item.ReadString(Models.Metadata.Machine.SourceFileKey), + IsBios = item.ReadString(Models.Metadata.Machine.IsBiosKey), + IsDevice = item.ReadString(Models.Metadata.Machine.IsDeviceKey), + IsMechanical = item.ReadString(Models.Metadata.Machine.IsMechanicalKey), + Runnable = item.ReadString(Models.Metadata.Machine.RunnableKey), + CloneOf = item.ReadString(Models.Metadata.Machine.CloneOfKey), + RomOf = item.ReadString(Models.Metadata.Machine.RomOfKey), + SampleOf = item.ReadString(Models.Metadata.Machine.SampleOfKey), + Description = item.ReadString(Models.Metadata.Machine.DescriptionKey), + Year = item.ReadString(Models.Metadata.Machine.YearKey), + Manufacturer = item.ReadString(Models.Metadata.Machine.ManufacturerKey), + History = item.ReadString(Models.Metadata.Machine.HistoryKey), }; - var biosSets = item.Read(Models.Internal.Machine.BiosSetKey); + var biosSets = item.Read(Models.Metadata.Machine.BiosSetKey); if (biosSets != null && biosSets.Any()) { machine.BiosSet = biosSets @@ -114,7 +114,7 @@ namespace SabreTools.Serialization .ToArray(); } - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { machine.Rom = roms @@ -123,7 +123,7 @@ namespace SabreTools.Serialization .ToArray(); } - var disks = item.Read(Models.Internal.Machine.DiskKey); + var disks = item.Read(Models.Metadata.Machine.DiskKey); if (disks != null && disks.Any()) { machine.Disk = disks @@ -132,7 +132,7 @@ namespace SabreTools.Serialization .ToArray(); } - var deviceRefs = item.Read(Models.Internal.Machine.DeviceRefKey); + var deviceRefs = item.Read(Models.Metadata.Machine.DeviceRefKey); if (deviceRefs != null && deviceRefs.Any()) { machine.DeviceRef = deviceRefs @@ -141,7 +141,7 @@ namespace SabreTools.Serialization .ToArray(); } - var samples = item.Read(Models.Internal.Machine.SampleKey); + var samples = item.Read(Models.Metadata.Machine.SampleKey); if (samples != null && samples.Any()) { machine.Sample = samples @@ -150,7 +150,7 @@ namespace SabreTools.Serialization .ToArray(); } - var chips = item.Read(Models.Internal.Machine.ChipKey); + var chips = item.Read(Models.Metadata.Machine.ChipKey); if (chips != null && chips.Any()) { machine.Chip = chips @@ -159,7 +159,7 @@ namespace SabreTools.Serialization .ToArray(); } - var displays = item.Read(Models.Internal.Machine.DisplayKey); + var displays = item.Read(Models.Metadata.Machine.DisplayKey); if (displays != null && displays.Any()) { machine.Display = displays @@ -168,7 +168,7 @@ namespace SabreTools.Serialization .ToArray(); } - var videos = item.Read(Models.Internal.Machine.VideoKey); + var videos = item.Read(Models.Metadata.Machine.VideoKey); if (videos != null && videos.Any()) { machine.Video = videos @@ -177,15 +177,15 @@ namespace SabreTools.Serialization .ToArray(); } - var sound = item.Read(Models.Internal.Machine.SoundKey); + var sound = item.Read(Models.Metadata.Machine.SoundKey); if (sound != null) machine.Sound = ConvertFromInternalModel(sound); - var input = item.Read(Models.Internal.Machine.InputKey); + var input = item.Read(Models.Metadata.Machine.InputKey); if (input != null) machine.Input = ConvertFromInternalModel(input); - var dipSwitches = item.Read(Models.Internal.Machine.DipSwitchKey); + var dipSwitches = item.Read(Models.Metadata.Machine.DipSwitchKey); if (dipSwitches != null && dipSwitches.Any()) { machine.DipSwitch = dipSwitches @@ -194,7 +194,7 @@ namespace SabreTools.Serialization .ToArray(); } - var configurations = item.Read(Models.Internal.Machine.ConfigurationKey); + var configurations = item.Read(Models.Metadata.Machine.ConfigurationKey); if (configurations != null && configurations.Any()) { machine.Configuration = configurations @@ -203,7 +203,7 @@ namespace SabreTools.Serialization .ToArray(); } - var ports = item.Read(Models.Internal.Machine.PortKey); + var ports = item.Read(Models.Metadata.Machine.PortKey); if (ports != null && ports.Any()) { machine.Port = ports @@ -212,7 +212,7 @@ namespace SabreTools.Serialization .ToArray(); } - var adjusters = item.Read(Models.Internal.Machine.AdjusterKey); + var adjusters = item.Read(Models.Metadata.Machine.AdjusterKey); if (adjusters != null && adjusters.Any()) { machine.Adjuster = adjusters @@ -221,11 +221,11 @@ namespace SabreTools.Serialization .ToArray(); } - var driver = item.Read(Models.Internal.Machine.DriverKey); + var driver = item.Read(Models.Metadata.Machine.DriverKey); if (driver != null) machine.Driver = ConvertFromInternalModel(driver); - var features = item.Read(Models.Internal.Machine.FeatureKey); + var features = item.Read(Models.Metadata.Machine.FeatureKey); if (features != null && features.Any()) { machine.Feature = features @@ -234,7 +234,7 @@ namespace SabreTools.Serialization .ToArray(); } - var devices = item.Read(Models.Internal.Machine.DeviceKey); + var devices = item.Read(Models.Metadata.Machine.DeviceKey); if (devices != null && devices.Any()) { machine.Device = devices @@ -243,7 +243,7 @@ namespace SabreTools.Serialization .ToArray(); } - var slots = item.Read(Models.Internal.Machine.SlotKey); + var slots = item.Read(Models.Metadata.Machine.SlotKey); if (slots != null && slots.Any()) { machine.Slot = slots @@ -252,7 +252,7 @@ namespace SabreTools.Serialization .ToArray(); } - var softwareLists = item.Read(Models.Internal.Machine.SoftwareListKey); + var softwareLists = item.Read(Models.Metadata.Machine.SoftwareListKey); if (softwareLists != null && softwareLists.Any()) { machine.SoftwareList = softwareLists @@ -261,7 +261,7 @@ namespace SabreTools.Serialization .ToArray(); } - var ramOptions = item.Read(Models.Internal.Machine.RamOptionKey); + var ramOptions = item.Read(Models.Metadata.Machine.RamOptionKey); if (ramOptions != null && ramOptions.Any()) { machine.RamOption = ramOptions @@ -274,17 +274,17 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Adjuster ConvertFromInternalModel(Models.Internal.Adjuster item) + private static Adjuster ConvertFromInternalModel(Models.Metadata.Adjuster item) { var adjuster = new Adjuster { - Name = item.ReadString(Models.Internal.Adjuster.NameKey), - Default = item.ReadString(Models.Internal.Adjuster.DefaultKey), + Name = item.ReadString(Models.Metadata.Adjuster.NameKey), + Default = item.ReadString(Models.Metadata.Adjuster.DefaultKey), }; - var condition = item.Read(Models.Internal.Adjuster.ConditionKey); + var condition = item.Read(Models.Metadata.Adjuster.ConditionKey); if (condition != null) adjuster.Condition = ConvertFromInternalModel(condition); @@ -292,79 +292,79 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Analog ConvertFromInternalModel(Models.Internal.Analog item) + private static Analog ConvertFromInternalModel(Models.Metadata.Analog item) { var analog = new Analog { - Mask = item.ReadString(Models.Internal.Analog.MaskKey), + Mask = item.ReadString(Models.Metadata.Analog.MaskKey), }; return analog; } /// - /// Convert from to + /// Convert from to /// - private static BiosSet ConvertFromInternalModel(Models.Internal.BiosSet item) + private static BiosSet ConvertFromInternalModel(Models.Metadata.BiosSet item) { var biosset = new BiosSet { - Name = item.ReadString(Models.Internal.BiosSet.NameKey), - Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey), - Default = item.ReadString(Models.Internal.BiosSet.DefaultKey), + Name = item.ReadString(Models.Metadata.BiosSet.NameKey), + Description = item.ReadString(Models.Metadata.BiosSet.DescriptionKey), + Default = item.ReadString(Models.Metadata.BiosSet.DefaultKey), }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static Chip ConvertFromInternalModel(Models.Internal.Chip item) + private static Chip ConvertFromInternalModel(Models.Metadata.Chip item) { var chip = new Chip { - Name = item.ReadString(Models.Internal.Chip.NameKey), - Tag = item.ReadString(Models.Internal.Chip.TagKey), - Type = item.ReadString(Models.Internal.Chip.TypeKey), - SoundOnly = item.ReadString(Models.Internal.Chip.SoundOnlyKey), - Clock = item.ReadString(Models.Internal.Chip.ClockKey), + Name = item.ReadString(Models.Metadata.Chip.NameKey), + Tag = item.ReadString(Models.Metadata.Chip.TagKey), + Type = item.ReadString(Models.Metadata.Chip.TypeKey), + SoundOnly = item.ReadString(Models.Metadata.Chip.SoundOnlyKey), + Clock = item.ReadString(Models.Metadata.Chip.ClockKey), }; return chip; } /// - /// Convert from to + /// Convert from to /// - private static Condition ConvertFromInternalModel(Models.Internal.Condition item) + private static Condition ConvertFromInternalModel(Models.Metadata.Condition item) { var condition = new Condition { - Tag = item.ReadString(Models.Internal.Condition.TagKey), - Mask = item.ReadString(Models.Internal.Condition.MaskKey), - Relation = item.ReadString(Models.Internal.Condition.RelationKey), - Value = item.ReadString(Models.Internal.Condition.ValueKey), + Tag = item.ReadString(Models.Metadata.Condition.TagKey), + Mask = item.ReadString(Models.Metadata.Condition.MaskKey), + Relation = item.ReadString(Models.Metadata.Condition.RelationKey), + Value = item.ReadString(Models.Metadata.Condition.ValueKey), }; return condition; } /// - /// Convert from to + /// Convert from to /// - private static Configuration ConvertFromInternalModel(Models.Internal.Configuration item) + private static Configuration ConvertFromInternalModel(Models.Metadata.Configuration item) { var configuration = new Configuration { - Name = item.ReadString(Models.Internal.Configuration.NameKey), - Tag = item.ReadString(Models.Internal.Configuration.TagKey), - Mask = item.ReadString(Models.Internal.Configuration.MaskKey), + Name = item.ReadString(Models.Metadata.Configuration.NameKey), + Tag = item.ReadString(Models.Metadata.Configuration.TagKey), + Mask = item.ReadString(Models.Metadata.Configuration.MaskKey), }; - var condition = item.Read(Models.Internal.Configuration.ConditionKey); + var condition = item.Read(Models.Metadata.Configuration.ConditionKey); if (condition != null) configuration.Condition = ConvertFromInternalModel(condition); - var confLocations = item.Read(Models.Internal.Configuration.ConfLocationKey); + var confLocations = item.Read(Models.Metadata.Configuration.ConfLocationKey); if (confLocations != null && confLocations.Any()) { configuration.ConfLocation = confLocations @@ -373,7 +373,7 @@ namespace SabreTools.Serialization .ToArray(); } - var confSettings = item.Read(Models.Internal.Configuration.ConfSettingKey); + var confSettings = item.Read(Models.Metadata.Configuration.ConfSettingKey); if (confSettings != null && confSettings.Any()) { configuration.ConfSetting = confSettings @@ -386,32 +386,32 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static ConfLocation ConvertFromInternalModel(Models.Internal.ConfLocation item) + private static ConfLocation ConvertFromInternalModel(Models.Metadata.ConfLocation item) { var confLocation = new ConfLocation { - Name = item.ReadString(Models.Internal.ConfLocation.NameKey), - Number = item.ReadString(Models.Internal.ConfLocation.NumberKey), - Inverted = item.ReadString(Models.Internal.ConfLocation.InvertedKey), + Name = item.ReadString(Models.Metadata.ConfLocation.NameKey), + Number = item.ReadString(Models.Metadata.ConfLocation.NumberKey), + Inverted = item.ReadString(Models.Metadata.ConfLocation.InvertedKey), }; return confLocation; } /// - /// Convert from to + /// Convert from to /// - private static ConfSetting ConvertFromInternalModel(Models.Internal.ConfSetting item) + private static ConfSetting ConvertFromInternalModel(Models.Metadata.ConfSetting item) { var confSetting = new ConfSetting { - Name = item.ReadString(Models.Internal.ConfSetting.NameKey), - Value = item.ReadString(Models.Internal.ConfSetting.ValueKey), - Default = item.ReadString(Models.Internal.ConfSetting.DefaultKey), + Name = item.ReadString(Models.Metadata.ConfSetting.NameKey), + Value = item.ReadString(Models.Metadata.ConfSetting.ValueKey), + Default = item.ReadString(Models.Metadata.ConfSetting.DefaultKey), }; - var condition = item.Read(Models.Internal.ConfSetting.ConditionKey); + var condition = item.Read(Models.Metadata.ConfSetting.ConditionKey); if (condition != null) confSetting.Condition = ConvertFromInternalModel(condition); @@ -419,47 +419,47 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Control ConvertFromInternalModel(Models.Internal.Control item) + private static Control ConvertFromInternalModel(Models.Metadata.Control item) { var control = new Control { - Type = item.ReadString(Models.Internal.Control.TypeKey), - Player = item.ReadString(Models.Internal.Control.PlayerKey), - Buttons = item.ReadString(Models.Internal.Control.ButtonsKey), - ReqButtons = item.ReadString(Models.Internal.Control.ReqButtonsKey), - Minimum = item.ReadString(Models.Internal.Control.MinimumKey), - Maximum = item.ReadString(Models.Internal.Control.MaximumKey), - Sensitivity = item.ReadString(Models.Internal.Control.SensitivityKey), - KeyDelta = item.ReadString(Models.Internal.Control.KeyDeltaKey), - Reverse = item.ReadString(Models.Internal.Control.ReverseKey), - Ways = item.ReadString(Models.Internal.Control.WaysKey), - Ways2 = item.ReadString(Models.Internal.Control.Ways2Key), - Ways3 = item.ReadString(Models.Internal.Control.Ways3Key), + Type = item.ReadString(Models.Metadata.Control.TypeKey), + Player = item.ReadString(Models.Metadata.Control.PlayerKey), + Buttons = item.ReadString(Models.Metadata.Control.ButtonsKey), + ReqButtons = item.ReadString(Models.Metadata.Control.ReqButtonsKey), + Minimum = item.ReadString(Models.Metadata.Control.MinimumKey), + Maximum = item.ReadString(Models.Metadata.Control.MaximumKey), + Sensitivity = item.ReadString(Models.Metadata.Control.SensitivityKey), + KeyDelta = item.ReadString(Models.Metadata.Control.KeyDeltaKey), + Reverse = item.ReadString(Models.Metadata.Control.ReverseKey), + Ways = item.ReadString(Models.Metadata.Control.WaysKey), + Ways2 = item.ReadString(Models.Metadata.Control.Ways2Key), + Ways3 = item.ReadString(Models.Metadata.Control.Ways3Key), }; return control; } /// - /// Convert from to + /// Convert from to /// - private static Device ConvertFromInternalModel(Models.Internal.Device item) + private static Device ConvertFromInternalModel(Models.Metadata.Device item) { var device = new Device { - Type = item.ReadString(Models.Internal.Device.TypeKey), - Tag = item.ReadString(Models.Internal.Device.TagKey), - FixedImage = item.ReadString(Models.Internal.Device.FixedImageKey), - Mandatory = item.ReadString(Models.Internal.Device.MandatoryKey), - Interface = item.ReadString(Models.Internal.Device.InterfaceKey), + Type = item.ReadString(Models.Metadata.Device.TypeKey), + Tag = item.ReadString(Models.Metadata.Device.TagKey), + FixedImage = item.ReadString(Models.Metadata.Device.FixedImageKey), + Mandatory = item.ReadString(Models.Metadata.Device.MandatoryKey), + Interface = item.ReadString(Models.Metadata.Device.InterfaceKey), }; - var instance = item.Read(Models.Internal.Device.InstanceKey); + var instance = item.Read(Models.Metadata.Device.InstanceKey); if (instance != null) device.Instance = ConvertFromInternalModel(instance); - var extensions = item.Read(Models.Internal.Device.ExtensionKey); + var extensions = item.Read(Models.Metadata.Device.ExtensionKey); if (extensions != null && extensions.Any()) { device.Extension = extensions @@ -472,48 +472,48 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static DeviceRef ConvertFromInternalModel(Models.Internal.DeviceRef item) + private static DeviceRef ConvertFromInternalModel(Models.Metadata.DeviceRef item) { var deviceRef = new DeviceRef { - Name = item.ReadString(Models.Internal.DeviceRef.NameKey), + Name = item.ReadString(Models.Metadata.DeviceRef.NameKey), }; return deviceRef; } /// - /// Convert from to + /// Convert from to /// - private static DipLocation ConvertFromInternalModel(Models.Internal.DipLocation item) + private static DipLocation ConvertFromInternalModel(Models.Metadata.DipLocation item) { var dipLocation = new DipLocation { - Name = item.ReadString(Models.Internal.DipLocation.NameKey), - Number = item.ReadString(Models.Internal.DipLocation.NumberKey), - Inverted = item.ReadString(Models.Internal.DipLocation.InvertedKey), + Name = item.ReadString(Models.Metadata.DipLocation.NameKey), + Number = item.ReadString(Models.Metadata.DipLocation.NumberKey), + Inverted = item.ReadString(Models.Metadata.DipLocation.InvertedKey), }; return dipLocation; } /// - /// Convert from to + /// Convert from to /// - private static DipSwitch ConvertFromInternalModel(Models.Internal.DipSwitch item) + private static DipSwitch ConvertFromInternalModel(Models.Metadata.DipSwitch item) { var dipSwitch = new DipSwitch { - Name = item.ReadString(Models.Internal.DipSwitch.NameKey), - Tag = item.ReadString(Models.Internal.DipSwitch.TagKey), - Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey), + Name = item.ReadString(Models.Metadata.DipSwitch.NameKey), + Tag = item.ReadString(Models.Metadata.DipSwitch.TagKey), + Mask = item.ReadString(Models.Metadata.DipSwitch.MaskKey), }; - var condition = item.Read(Models.Internal.DipSwitch.ConditionKey); + var condition = item.Read(Models.Metadata.DipSwitch.ConditionKey); if (condition != null) dipSwitch.Condition = ConvertFromInternalModel(condition); - var dipLocations = item.Read(Models.Internal.DipSwitch.DipLocationKey); + var dipLocations = item.Read(Models.Metadata.DipSwitch.DipLocationKey); if (dipLocations != null && dipLocations.Any()) { dipSwitch.DipLocation = dipLocations @@ -522,7 +522,7 @@ namespace SabreTools.Serialization .ToArray(); } - var dipValues = item.Read(Models.Internal.DipSwitch.DipValueKey); + var dipValues = item.Read(Models.Metadata.DipSwitch.DipValueKey); if (dipValues != null && dipValues.Any()) { dipSwitch.DipValue = dipValues @@ -535,18 +535,18 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static DipValue ConvertFromInternalModel(Models.Internal.DipValue item) + private static DipValue ConvertFromInternalModel(Models.Metadata.DipValue item) { var dipValue = new DipValue { - Name = item.ReadString(Models.Internal.DipValue.NameKey), - Value = item.ReadString(Models.Internal.DipValue.ValueKey), - Default = item.ReadString(Models.Internal.DipValue.DefaultKey), + Name = item.ReadString(Models.Metadata.DipValue.NameKey), + Value = item.ReadString(Models.Metadata.DipValue.ValueKey), + Default = item.ReadString(Models.Metadata.DipValue.DefaultKey), }; - var condition = item.Read(Models.Internal.DipValue.ConditionKey); + var condition = item.Read(Models.Metadata.DipValue.ConditionKey); if (condition != null) dipValue.Condition = ConvertFromInternalModel(condition); @@ -554,114 +554,114 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Disk ConvertFromInternalModel(Models.Internal.Disk item) + private static Disk ConvertFromInternalModel(Models.Metadata.Disk item) { var disk = new Disk { - Name = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), - Merge = item.ReadString(Models.Internal.Disk.MergeKey), - Region = item.ReadString(Models.Internal.Disk.RegionKey), - Index = item.ReadString(Models.Internal.Disk.IndexKey), - Writable = item.ReadString(Models.Internal.Disk.WritableKey), - Status = item.ReadString(Models.Internal.Disk.StatusKey), - Optional = item.ReadString(Models.Internal.Disk.OptionalKey), + Name = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), + Merge = item.ReadString(Models.Metadata.Disk.MergeKey), + Region = item.ReadString(Models.Metadata.Disk.RegionKey), + Index = item.ReadString(Models.Metadata.Disk.IndexKey), + Writable = item.ReadString(Models.Metadata.Disk.WritableKey), + Status = item.ReadString(Models.Metadata.Disk.StatusKey), + Optional = item.ReadString(Models.Metadata.Disk.OptionalKey), }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Display ConvertFromInternalModel(Models.Internal.Display item) + private static Display ConvertFromInternalModel(Models.Metadata.Display item) { var display = new Display { - Tag = item.ReadString(Models.Internal.Display.TagKey), - Type = item.ReadString(Models.Internal.Display.TypeKey), - Rotate = item.ReadString(Models.Internal.Display.RotateKey), - FlipX = item.ReadString(Models.Internal.Display.FlipXKey), - Width = item.ReadString(Models.Internal.Display.WidthKey), - Height = item.ReadString(Models.Internal.Display.HeightKey), - Refresh = item.ReadString(Models.Internal.Display.RefreshKey), - PixClock = item.ReadString(Models.Internal.Display.PixClockKey), - HTotal = item.ReadString(Models.Internal.Display.HTotalKey), - HBEnd = item.ReadString(Models.Internal.Display.HBEndKey), - HBStart = item.ReadString(Models.Internal.Display.HBStartKey), - VTotal = item.ReadString(Models.Internal.Display.VTotalKey), - VBEnd = item.ReadString(Models.Internal.Display.VBEndKey), - VBStart = item.ReadString(Models.Internal.Display.VBStartKey), + Tag = item.ReadString(Models.Metadata.Display.TagKey), + Type = item.ReadString(Models.Metadata.Display.TypeKey), + Rotate = item.ReadString(Models.Metadata.Display.RotateKey), + FlipX = item.ReadString(Models.Metadata.Display.FlipXKey), + Width = item.ReadString(Models.Metadata.Display.WidthKey), + Height = item.ReadString(Models.Metadata.Display.HeightKey), + Refresh = item.ReadString(Models.Metadata.Display.RefreshKey), + PixClock = item.ReadString(Models.Metadata.Display.PixClockKey), + HTotal = item.ReadString(Models.Metadata.Display.HTotalKey), + HBEnd = item.ReadString(Models.Metadata.Display.HBEndKey), + HBStart = item.ReadString(Models.Metadata.Display.HBStartKey), + VTotal = item.ReadString(Models.Metadata.Display.VTotalKey), + VBEnd = item.ReadString(Models.Metadata.Display.VBEndKey), + VBStart = item.ReadString(Models.Metadata.Display.VBStartKey), }; return display; } /// - /// Convert from to + /// Convert from to /// - private static Driver ConvertFromInternalModel(Models.Internal.Driver item) + private static Driver ConvertFromInternalModel(Models.Metadata.Driver item) { var driver = new Driver { - Status = item.ReadString(Models.Internal.Driver.StatusKey), - Color = item.ReadString(Models.Internal.Driver.ColorKey), - Sound = item.ReadString(Models.Internal.Driver.SoundKey), - PaletteSize = item.ReadString(Models.Internal.Driver.PaletteSizeKey), - Emulation = item.ReadString(Models.Internal.Driver.EmulationKey), - Cocktail = item.ReadString(Models.Internal.Driver.CocktailKey), - SaveState = item.ReadString(Models.Internal.Driver.SaveStateKey), - RequiresArtwork = item.ReadString(Models.Internal.Driver.RequiresArtworkKey), - Unofficial = item.ReadString(Models.Internal.Driver.UnofficialKey), - NoSoundHardware = item.ReadString(Models.Internal.Driver.NoSoundHardwareKey), - Incomplete = item.ReadString(Models.Internal.Driver.IncompleteKey), + Status = item.ReadString(Models.Metadata.Driver.StatusKey), + Color = item.ReadString(Models.Metadata.Driver.ColorKey), + Sound = item.ReadString(Models.Metadata.Driver.SoundKey), + PaletteSize = item.ReadString(Models.Metadata.Driver.PaletteSizeKey), + Emulation = item.ReadString(Models.Metadata.Driver.EmulationKey), + Cocktail = item.ReadString(Models.Metadata.Driver.CocktailKey), + SaveState = item.ReadString(Models.Metadata.Driver.SaveStateKey), + RequiresArtwork = item.ReadString(Models.Metadata.Driver.RequiresArtworkKey), + Unofficial = item.ReadString(Models.Metadata.Driver.UnofficialKey), + NoSoundHardware = item.ReadString(Models.Metadata.Driver.NoSoundHardwareKey), + Incomplete = item.ReadString(Models.Metadata.Driver.IncompleteKey), }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Extension ConvertFromInternalModel(Models.Internal.Extension item) + private static Extension ConvertFromInternalModel(Models.Metadata.Extension item) { var extension = new Extension { - Name = item.ReadString(Models.Internal.Extension.NameKey), + Name = item.ReadString(Models.Metadata.Extension.NameKey), }; return extension; } /// - /// Convert from to + /// Convert from to /// - private static Feature ConvertFromInternalModel(Models.Internal.Feature item) + private static Feature ConvertFromInternalModel(Models.Metadata.Feature item) { var feature = new Feature { - Type = item.ReadString(Models.Internal.Feature.TypeKey), - Status = item.ReadString(Models.Internal.Feature.StatusKey), - Overall = item.ReadString(Models.Internal.Feature.OverallKey), + Type = item.ReadString(Models.Metadata.Feature.TypeKey), + Status = item.ReadString(Models.Metadata.Feature.StatusKey), + Overall = item.ReadString(Models.Metadata.Feature.OverallKey), }; return feature; } /// - /// Convert from to + /// Convert from to /// - private static Input ConvertFromInternalModel(Models.Internal.Input item) + private static Input ConvertFromInternalModel(Models.Metadata.Input item) { var input = new Input { - Service = item.ReadString(Models.Internal.Input.ServiceKey), - Tilt = item.ReadString(Models.Internal.Input.TiltKey), - Players = item.ReadString(Models.Internal.Input.PlayersKey), - ControlAttr = item.ReadString(Models.Internal.Input.ControlKey), - Buttons = item.ReadString(Models.Internal.Input.ButtonsKey), - Coins = item.ReadString(Models.Internal.Input.CoinsKey), + Service = item.ReadString(Models.Metadata.Input.ServiceKey), + Tilt = item.ReadString(Models.Metadata.Input.TiltKey), + Players = item.ReadString(Models.Metadata.Input.PlayersKey), + ControlAttr = item.ReadString(Models.Metadata.Input.ControlKey), + Buttons = item.ReadString(Models.Metadata.Input.ButtonsKey), + Coins = item.ReadString(Models.Metadata.Input.CoinsKey), }; - var controls = item.Read(Models.Internal.Input.ControlKey); + var controls = item.Read(Models.Metadata.Input.ControlKey); if (controls != null && controls.Any()) { input.Control = controls @@ -674,29 +674,29 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Instance ConvertFromInternalModel(Models.Internal.Instance item) + private static Instance ConvertFromInternalModel(Models.Metadata.Instance item) { var instance = new Instance { - Name = item.ReadString(Models.Internal.Instance.NameKey), - BriefName = item.ReadString(Models.Internal.Instance.BriefNameKey), + Name = item.ReadString(Models.Metadata.Instance.NameKey), + BriefName = item.ReadString(Models.Metadata.Instance.BriefNameKey), }; return instance; } /// - /// Convert from to + /// Convert from to /// - private static Port ConvertFromInternalModel(Models.Internal.Port item) + private static Port ConvertFromInternalModel(Models.Metadata.Port item) { var port = new Port { - Tag = item.ReadString(Models.Internal.Port.TagKey), + Tag = item.ReadString(Models.Metadata.Port.TagKey), }; - var analogs = item.Read(Models.Internal.Port.AnalogKey); + var analogs = item.Read(Models.Metadata.Port.AnalogKey); if (analogs != null && analogs.Any()) { port.Analog = analogs @@ -709,65 +709,65 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static RamOption ConvertFromInternalModel(Models.Internal.RamOption item) + private static RamOption ConvertFromInternalModel(Models.Metadata.RamOption item) { var ramOption = new RamOption { - Name = item.ReadString(Models.Internal.RamOption.NameKey), - Default = item.ReadString(Models.Internal.RamOption.DefaultKey), - Content = item.ReadString(Models.Internal.RamOption.ContentKey), + Name = item.ReadString(Models.Metadata.RamOption.NameKey), + Default = item.ReadString(Models.Metadata.RamOption.DefaultKey), + Content = item.ReadString(Models.Metadata.RamOption.ContentKey), }; return ramOption; } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertFromInternalModel(Models.Internal.Rom item) + private static Rom ConvertFromInternalModel(Models.Metadata.Rom item) { var rom = new Rom { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Bios = item.ReadString(Models.Internal.Rom.BiosKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - Merge = item.ReadString(Models.Internal.Rom.MergeKey), - Region = item.ReadString(Models.Internal.Rom.RegionKey), - Offset = item.ReadString(Models.Internal.Rom.OffsetKey), - Status = item.ReadString(Models.Internal.Rom.StatusKey), - Optional = item.ReadString(Models.Internal.Rom.OptionalKey), - Dispose = item.ReadString(Models.Internal.Rom.DisposeKey), - SoundOnly = item.ReadString(Models.Internal.Rom.SoundOnlyKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Bios = item.ReadString(Models.Metadata.Rom.BiosKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + Merge = item.ReadString(Models.Metadata.Rom.MergeKey), + Region = item.ReadString(Models.Metadata.Rom.RegionKey), + Offset = item.ReadString(Models.Metadata.Rom.OffsetKey), + Status = item.ReadString(Models.Metadata.Rom.StatusKey), + Optional = item.ReadString(Models.Metadata.Rom.OptionalKey), + Dispose = item.ReadString(Models.Metadata.Rom.DisposeKey), + SoundOnly = item.ReadString(Models.Metadata.Rom.SoundOnlyKey), }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Sample ConvertFromInternalModel(Models.Internal.Sample item) + private static Sample ConvertFromInternalModel(Models.Metadata.Sample item) { var sample = new Sample { - Name = item.ReadString(Models.Internal.Sample.NameKey), + Name = item.ReadString(Models.Metadata.Sample.NameKey), }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static Slot ConvertFromInternalModel(Models.Internal.Slot item) + private static Slot ConvertFromInternalModel(Models.Metadata.Slot item) { var slot = new Slot { - Name = item.ReadString(Models.Internal.Slot.NameKey), + Name = item.ReadString(Models.Metadata.Slot.NameKey), }; - var slotOptions = item.Read(Models.Internal.Slot.SlotOptionKey); + var slotOptions = item.Read(Models.Metadata.Slot.SlotOptionKey); if (slotOptions != null && slotOptions.Any()) { slot.SlotOption = slotOptions @@ -780,60 +780,60 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static SlotOption ConvertFromInternalModel(Models.Internal.SlotOption item) + private static SlotOption ConvertFromInternalModel(Models.Metadata.SlotOption item) { var slotOption = new SlotOption { - Name = item.ReadString(Models.Internal.SlotOption.NameKey), - DevName = item.ReadString(Models.Internal.SlotOption.DevNameKey), - Default = item.ReadString(Models.Internal.SlotOption.DefaultKey), + Name = item.ReadString(Models.Metadata.SlotOption.NameKey), + DevName = item.ReadString(Models.Metadata.SlotOption.DevNameKey), + Default = item.ReadString(Models.Metadata.SlotOption.DefaultKey), }; return slotOption; } /// - /// Convert from to + /// Convert from to /// - private static SoftwareList ConvertFromInternalModel(Models.Internal.SoftwareList item) + private static SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item) { var softwareList = new SoftwareList { - Tag = item.ReadString(Models.Internal.SoftwareList.TagKey), - Name = item.ReadString(Models.Internal.SoftwareList.NameKey), - Status = item.ReadString(Models.Internal.SoftwareList.StatusKey), - Filter = item.ReadString(Models.Internal.SoftwareList.FilterKey), + Tag = item.ReadString(Models.Metadata.SoftwareList.TagKey), + Name = item.ReadString(Models.Metadata.SoftwareList.NameKey), + Status = item.ReadString(Models.Metadata.SoftwareList.StatusKey), + Filter = item.ReadString(Models.Metadata.SoftwareList.FilterKey), }; return softwareList; } /// - /// Convert from to + /// Convert from to /// - private static Sound ConvertFromInternalModel(Models.Internal.Sound item) + private static Sound ConvertFromInternalModel(Models.Metadata.Sound item) { var sound = new Sound { - Channels = item.ReadString(Models.Internal.Sound.ChannelsKey), + Channels = item.ReadString(Models.Metadata.Sound.ChannelsKey), }; return sound; } /// - /// Convert from to + /// Convert from to /// - private static Video ConvertFromInternalModel(Models.Internal.Video item) + private static Video ConvertFromInternalModel(Models.Metadata.Video item) { var video = new Video { - Screen = item.ReadString(Models.Internal.Video.ScreenKey), - Orientation = item.ReadString(Models.Internal.Video.OrientationKey), - Width = item.ReadString(Models.Internal.Video.WidthKey), - Height = item.ReadString(Models.Internal.Video.HeightKey), - AspectX = item.ReadString(Models.Internal.Video.AspectXKey), - AspectY = item.ReadString(Models.Internal.Video.AspectYKey), - Refresh = item.ReadString(Models.Internal.Video.RefreshKey), + Screen = item.ReadString(Models.Metadata.Video.ScreenKey), + Orientation = item.ReadString(Models.Metadata.Video.OrientationKey), + Width = item.ReadString(Models.Metadata.Video.WidthKey), + Height = item.ReadString(Models.Metadata.Video.HeightKey), + AspectX = item.ReadString(Models.Metadata.Video.AspectXKey), + AspectY = item.ReadString(Models.Metadata.Video.AspectYKey), + Refresh = item.ReadString(Models.Metadata.Video.RefreshKey), }; return video; } diff --git a/SabreTools.Serialization/Listxml.Serializer.cs b/SabreTools.Serialization/Listxml.Serializer.cs index 51cbc1b6..35b9b7f7 100644 --- a/SabreTools.Serialization/Listxml.Serializer.cs +++ b/SabreTools.Serialization/Listxml.Serializer.cs @@ -11,21 +11,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(M1? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(M1? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Game != null && item.Game.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Game .Where(g => g != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -35,21 +35,21 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(Mame? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(Mame? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Game != null && item.Game.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Game + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Game .Where(g => g != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -59,56 +59,56 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(M1 item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(M1 item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.VersionKey] = item.Version, + [Models.Metadata.Header.VersionKey] = item.Version, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Mame item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Mame item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.BuildKey] = item.Build, - [Models.Internal.Header.DebugKey] = item.Debug, - [Models.Internal.Header.MameConfigKey] = item.MameConfig, + [Models.Metadata.Header.BuildKey] = item.Build, + [Models.Metadata.Header.DebugKey] = item.Debug, + [Models.Metadata.Header.MameConfigKey] = item.MameConfig, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(GameBase item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(GameBase item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, - [Models.Internal.Machine.SourceFileKey] = item.SourceFile, - [Models.Internal.Machine.IsBiosKey] = item.IsBios, - [Models.Internal.Machine.IsDeviceKey] = item.IsDevice, - [Models.Internal.Machine.IsMechanicalKey] = item.IsMechanical, - [Models.Internal.Machine.RunnableKey] = item.Runnable, - [Models.Internal.Machine.CloneOfKey] = item.CloneOf, - [Models.Internal.Machine.RomOfKey] = item.RomOf, - [Models.Internal.Machine.SampleOfKey] = item.SampleOf, - [Models.Internal.Machine.DescriptionKey] = item.Description, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, - [Models.Internal.Machine.HistoryKey] = item.History, + [Models.Metadata.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.SourceFileKey] = item.SourceFile, + [Models.Metadata.Machine.IsBiosKey] = item.IsBios, + [Models.Metadata.Machine.IsDeviceKey] = item.IsDevice, + [Models.Metadata.Machine.IsMechanicalKey] = item.IsMechanical, + [Models.Metadata.Machine.RunnableKey] = item.Runnable, + [Models.Metadata.Machine.CloneOfKey] = item.CloneOf, + [Models.Metadata.Machine.RomOfKey] = item.RomOf, + [Models.Metadata.Machine.SampleOfKey] = item.SampleOf, + [Models.Metadata.Machine.DescriptionKey] = item.Description, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, + [Models.Metadata.Machine.HistoryKey] = item.History, }; if (item.BiosSet != null && item.BiosSet.Any()) { - machine[Models.Internal.Machine.BiosSetKey] = item.BiosSet + machine[Models.Metadata.Machine.BiosSetKey] = item.BiosSet .Where(b => b != null) .Select(ConvertToInternalModel) .ToArray(); @@ -116,7 +116,7 @@ namespace SabreTools.Serialization if (item.Rom != null && item.Rom.Any()) { - machine[Models.Internal.Machine.RomKey] = item.Rom + machine[Models.Metadata.Machine.RomKey] = item.Rom .Where(r => r != null) .Select(ConvertToInternalModel) .ToArray(); @@ -124,7 +124,7 @@ namespace SabreTools.Serialization if (item.Disk != null && item.Disk.Any()) { - machine[Models.Internal.Machine.DiskKey] = item.Disk + machine[Models.Metadata.Machine.DiskKey] = item.Disk .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -132,7 +132,7 @@ namespace SabreTools.Serialization if (item.DeviceRef != null && item.DeviceRef.Any()) { - machine[Models.Internal.Machine.DeviceRefKey] = item.DeviceRef + machine[Models.Metadata.Machine.DeviceRefKey] = item.DeviceRef .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -140,7 +140,7 @@ namespace SabreTools.Serialization if (item.Sample != null && item.Sample.Any()) { - machine[Models.Internal.Machine.SampleKey] = item.Sample + machine[Models.Metadata.Machine.SampleKey] = item.Sample .Where(s => s != null) .Select(ConvertToInternalModel) .ToArray(); @@ -148,7 +148,7 @@ namespace SabreTools.Serialization if (item.Chip != null && item.Chip.Any()) { - machine[Models.Internal.Machine.ChipKey] = item.Chip + machine[Models.Metadata.Machine.ChipKey] = item.Chip .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -156,7 +156,7 @@ namespace SabreTools.Serialization if (item.Display != null && item.Display.Any()) { - machine[Models.Internal.Machine.DisplayKey] = item.Display + machine[Models.Metadata.Machine.DisplayKey] = item.Display .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -164,21 +164,21 @@ namespace SabreTools.Serialization if (item.Video != null && item.Video.Any()) { - machine[Models.Internal.Machine.VideoKey] = item.Video + machine[Models.Metadata.Machine.VideoKey] = item.Video .Where(v => v != null) .Select(ConvertToInternalModel) .ToArray(); } if (item.Sound != null) - machine[Models.Internal.Machine.SoundKey] = ConvertToInternalModel(item.Sound); + machine[Models.Metadata.Machine.SoundKey] = ConvertToInternalModel(item.Sound); if (item.Input != null) - machine[Models.Internal.Machine.InputKey] = ConvertToInternalModel(item.Input); + machine[Models.Metadata.Machine.InputKey] = ConvertToInternalModel(item.Input); if (item.DipSwitch != null && item.DipSwitch.Any()) { - machine[Models.Internal.Machine.DipSwitchKey] = item.DipSwitch + machine[Models.Metadata.Machine.DipSwitchKey] = item.DipSwitch .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -186,7 +186,7 @@ namespace SabreTools.Serialization if (item.Configuration != null && item.Configuration.Any()) { - machine[Models.Internal.Machine.ConfigurationKey] = item.Configuration + machine[Models.Metadata.Machine.ConfigurationKey] = item.Configuration .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -194,7 +194,7 @@ namespace SabreTools.Serialization if (item.Port != null && item.Port.Any()) { - machine[Models.Internal.Machine.PortKey] = item.Port + machine[Models.Metadata.Machine.PortKey] = item.Port .Where(p => p != null) .Select(ConvertToInternalModel) .ToArray(); @@ -202,18 +202,18 @@ namespace SabreTools.Serialization if (item.Adjuster != null && item.Adjuster.Any()) { - machine[Models.Internal.Machine.AdjusterKey] = item.Adjuster + machine[Models.Metadata.Machine.AdjusterKey] = item.Adjuster .Where(a => a != null) .Select(ConvertToInternalModel) .ToArray(); } if (item.Driver != null) - machine[Models.Internal.Machine.DriverKey] = ConvertToInternalModel(item.Driver); + machine[Models.Metadata.Machine.DriverKey] = ConvertToInternalModel(item.Driver); if (item.Feature != null && item.Feature.Any()) { - machine[Models.Internal.Machine.FeatureKey] = item.Feature + machine[Models.Metadata.Machine.FeatureKey] = item.Feature .Where(f => f != null) .Select(ConvertToInternalModel) .ToArray(); @@ -221,7 +221,7 @@ namespace SabreTools.Serialization if (item.Device != null && item.Device.Any()) { - machine[Models.Internal.Machine.DeviceKey] = item.Device + machine[Models.Metadata.Machine.DeviceKey] = item.Device .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -229,7 +229,7 @@ namespace SabreTools.Serialization if (item.Slot != null && item.Slot.Any()) { - machine[Models.Internal.Machine.SlotKey] = item.Slot + machine[Models.Metadata.Machine.SlotKey] = item.Slot .Where(s => s != null) .Select(ConvertToInternalModel) .ToArray(); @@ -237,7 +237,7 @@ namespace SabreTools.Serialization if (item.SoftwareList != null && item.SoftwareList.Any()) { - machine[Models.Internal.Machine.SoftwareListKey] = item.SoftwareList + machine[Models.Metadata.Machine.SoftwareListKey] = item.SoftwareList .Where(s => s != null) .Select(ConvertToInternalModel) .ToArray(); @@ -245,7 +245,7 @@ namespace SabreTools.Serialization if (item.RamOption != null && item.RamOption.Any()) { - machine[Models.Internal.Machine.RamOptionKey] = item.RamOption + machine[Models.Metadata.Machine.RamOptionKey] = item.RamOption .Where(r => r != null) .Select(ConvertToInternalModel) .ToArray(); @@ -255,97 +255,97 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Adjuster ConvertToInternalModel(Adjuster item) + private static Models.Metadata.Adjuster ConvertToInternalModel(Adjuster item) { - var adjuster = new Models.Internal.Adjuster + var adjuster = new Models.Metadata.Adjuster { - [Models.Internal.Adjuster.NameKey] = item.Name, - [Models.Internal.Adjuster.DefaultKey] = item.Default, + [Models.Metadata.Adjuster.NameKey] = item.Name, + [Models.Metadata.Adjuster.DefaultKey] = item.Default, }; if (item.Condition != null) - adjuster[Models.Internal.Adjuster.ConditionKey] = ConvertToInternalModel(item.Condition); + adjuster[Models.Metadata.Adjuster.ConditionKey] = ConvertToInternalModel(item.Condition); return adjuster; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Analog ConvertToInternalModel(Analog item) + private static Models.Metadata.Analog ConvertToInternalModel(Analog item) { - var analog = new Models.Internal.Analog + var analog = new Models.Metadata.Analog { - [Models.Internal.Analog.MaskKey] = item.Mask, + [Models.Metadata.Analog.MaskKey] = item.Mask, }; return analog; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.BiosSet ConvertToInternalModel(BiosSet item) + private static Models.Metadata.BiosSet ConvertToInternalModel(BiosSet item) { - var biosset = new Models.Internal.BiosSet + var biosset = new Models.Metadata.BiosSet { - [Models.Internal.BiosSet.NameKey] = item.Name, - [Models.Internal.BiosSet.DescriptionKey] = item.Description, - [Models.Internal.BiosSet.DefaultKey] = item.Default, + [Models.Metadata.BiosSet.NameKey] = item.Name, + [Models.Metadata.BiosSet.DescriptionKey] = item.Description, + [Models.Metadata.BiosSet.DefaultKey] = item.Default, }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Chip ConvertToInternalModel(Chip item) + private static Models.Metadata.Chip ConvertToInternalModel(Chip item) { - var chip = new Models.Internal.Chip + var chip = new Models.Metadata.Chip { - [Models.Internal.Chip.NameKey] = item.Name, - [Models.Internal.Chip.TagKey] = item.Tag, - [Models.Internal.Chip.TypeKey] = item.Type, - [Models.Internal.Chip.SoundOnlyKey] = item.SoundOnly, - [Models.Internal.Chip.ClockKey] = item.Clock, + [Models.Metadata.Chip.NameKey] = item.Name, + [Models.Metadata.Chip.TagKey] = item.Tag, + [Models.Metadata.Chip.TypeKey] = item.Type, + [Models.Metadata.Chip.SoundOnlyKey] = item.SoundOnly, + [Models.Metadata.Chip.ClockKey] = item.Clock, }; return chip; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Condition ConvertToInternalModel(Condition item) + private static Models.Metadata.Condition ConvertToInternalModel(Condition item) { - var condition = new Models.Internal.Condition + var condition = new Models.Metadata.Condition { - [Models.Internal.Condition.TagKey] = item.Tag, - [Models.Internal.Condition.MaskKey] = item.Mask, - [Models.Internal.Condition.RelationKey] = item.Relation, - [Models.Internal.Condition.ValueKey] = item.Value, + [Models.Metadata.Condition.TagKey] = item.Tag, + [Models.Metadata.Condition.MaskKey] = item.Mask, + [Models.Metadata.Condition.RelationKey] = item.Relation, + [Models.Metadata.Condition.ValueKey] = item.Value, }; return condition; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Configuration ConvertToInternalModel(Configuration item) + private static Models.Metadata.Configuration ConvertToInternalModel(Configuration item) { - var configuration = new Models.Internal.Configuration + var configuration = new Models.Metadata.Configuration { - [Models.Internal.Configuration.NameKey] = item.Name, - [Models.Internal.Configuration.TagKey] = item.Tag, - [Models.Internal.Configuration.MaskKey] = item.Mask, + [Models.Metadata.Configuration.NameKey] = item.Name, + [Models.Metadata.Configuration.TagKey] = item.Tag, + [Models.Metadata.Configuration.MaskKey] = item.Mask, }; if (item.Condition != null) - configuration[Models.Internal.Configuration.ConditionKey] = ConvertToInternalModel(item.Condition); + configuration[Models.Metadata.Configuration.ConditionKey] = ConvertToInternalModel(item.Condition); if (item.ConfLocation != null && item.ConfLocation.Any()) { - configuration[Models.Internal.Configuration.ConfLocationKey] = item.ConfLocation + configuration[Models.Metadata.Configuration.ConfLocationKey] = item.ConfLocation .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -353,7 +353,7 @@ namespace SabreTools.Serialization if (item.ConfSetting != null && item.ConfSetting.Any()) { - configuration[Models.Internal.Configuration.ConfSettingKey] = item.ConfSetting + configuration[Models.Metadata.Configuration.ConfSettingKey] = item.ConfSetting .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -363,80 +363,80 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.ConfLocation ConvertToInternalModel(ConfLocation item) + private static Models.Metadata.ConfLocation ConvertToInternalModel(ConfLocation item) { - var confLocation = new Models.Internal.ConfLocation + var confLocation = new Models.Metadata.ConfLocation { - [Models.Internal.ConfLocation.NameKey] = item.Name, - [Models.Internal.ConfLocation.NumberKey] = item.Number, - [Models.Internal.ConfLocation.InvertedKey] = item.Inverted, + [Models.Metadata.ConfLocation.NameKey] = item.Name, + [Models.Metadata.ConfLocation.NumberKey] = item.Number, + [Models.Metadata.ConfLocation.InvertedKey] = item.Inverted, }; return confLocation; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.ConfSetting ConvertToInternalModel(ConfSetting item) + private static Models.Metadata.ConfSetting ConvertToInternalModel(ConfSetting item) { - var confSetting = new Models.Internal.ConfSetting + var confSetting = new Models.Metadata.ConfSetting { - [Models.Internal.ConfSetting.NameKey] = item.Name, - [Models.Internal.ConfSetting.ValueKey] = item.Value, - [Models.Internal.ConfSetting.DefaultKey] = item.Default, + [Models.Metadata.ConfSetting.NameKey] = item.Name, + [Models.Metadata.ConfSetting.ValueKey] = item.Value, + [Models.Metadata.ConfSetting.DefaultKey] = item.Default, }; if (item.Condition != null) - confSetting[Models.Internal.ConfSetting.ConditionKey] = ConvertToInternalModel(item.Condition); + confSetting[Models.Metadata.ConfSetting.ConditionKey] = ConvertToInternalModel(item.Condition); return confSetting; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Control ConvertToInternalModel(Control item) + private static Models.Metadata.Control ConvertToInternalModel(Control item) { - var control = new Models.Internal.Control + var control = new Models.Metadata.Control { - [Models.Internal.Control.TypeKey] = item.Type, - [Models.Internal.Control.PlayerKey] = item.Player, - [Models.Internal.Control.ButtonsKey] = item.Buttons, - [Models.Internal.Control.ReqButtonsKey] = item.ReqButtons, - [Models.Internal.Control.MinimumKey] = item.Minimum, - [Models.Internal.Control.MaximumKey] = item.Maximum, - [Models.Internal.Control.SensitivityKey] = item.Sensitivity, - [Models.Internal.Control.KeyDeltaKey] = item.KeyDelta, - [Models.Internal.Control.ReverseKey] = item.Reverse, - [Models.Internal.Control.WaysKey] = item.Ways, - [Models.Internal.Control.Ways2Key] = item.Ways2, - [Models.Internal.Control.Ways3Key] = item.Ways3, + [Models.Metadata.Control.TypeKey] = item.Type, + [Models.Metadata.Control.PlayerKey] = item.Player, + [Models.Metadata.Control.ButtonsKey] = item.Buttons, + [Models.Metadata.Control.ReqButtonsKey] = item.ReqButtons, + [Models.Metadata.Control.MinimumKey] = item.Minimum, + [Models.Metadata.Control.MaximumKey] = item.Maximum, + [Models.Metadata.Control.SensitivityKey] = item.Sensitivity, + [Models.Metadata.Control.KeyDeltaKey] = item.KeyDelta, + [Models.Metadata.Control.ReverseKey] = item.Reverse, + [Models.Metadata.Control.WaysKey] = item.Ways, + [Models.Metadata.Control.Ways2Key] = item.Ways2, + [Models.Metadata.Control.Ways3Key] = item.Ways3, }; return control; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Device ConvertToInternalModel(Device item) + private static Models.Metadata.Device ConvertToInternalModel(Device item) { - var device = new Models.Internal.Device + var device = new Models.Metadata.Device { - [Models.Internal.Device.TypeKey] = item.Type, - [Models.Internal.Device.TagKey] = item.Tag, - [Models.Internal.Device.FixedImageKey] = item.FixedImage, - [Models.Internal.Device.MandatoryKey] = item.Mandatory, - [Models.Internal.Device.InterfaceKey] = item.Interface, + [Models.Metadata.Device.TypeKey] = item.Type, + [Models.Metadata.Device.TagKey] = item.Tag, + [Models.Metadata.Device.FixedImageKey] = item.FixedImage, + [Models.Metadata.Device.MandatoryKey] = item.Mandatory, + [Models.Metadata.Device.InterfaceKey] = item.Interface, }; if (item.Instance != null) - device[Models.Internal.Device.InstanceKey] = ConvertToInternalModel(item.Instance); + device[Models.Metadata.Device.InstanceKey] = ConvertToInternalModel(item.Instance); if (item.Extension != null && item.Extension.Any()) { - device[Models.Internal.Device.ExtensionKey] = item.Extension + device[Models.Metadata.Device.ExtensionKey] = item.Extension .Where(e => e != null) .Select(ConvertToInternalModel) .ToArray(); @@ -446,49 +446,49 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DeviceRef ConvertToInternalModel(DeviceRef item) + private static Models.Metadata.DeviceRef ConvertToInternalModel(DeviceRef item) { - var deviceRef = new Models.Internal.DeviceRef + var deviceRef = new Models.Metadata.DeviceRef { - [Models.Internal.DeviceRef.NameKey] = item.Name, + [Models.Metadata.DeviceRef.NameKey] = item.Name, }; return deviceRef; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipLocation ConvertToInternalModel(DipLocation item) + private static Models.Metadata.DipLocation ConvertToInternalModel(DipLocation item) { - var dipLocation = new Models.Internal.DipLocation + var dipLocation = new Models.Metadata.DipLocation { - [Models.Internal.DipLocation.NameKey] = item.Name, - [Models.Internal.DipLocation.NumberKey] = item.Number, - [Models.Internal.DipLocation.InvertedKey] = item.Inverted, + [Models.Metadata.DipLocation.NameKey] = item.Name, + [Models.Metadata.DipLocation.NumberKey] = item.Number, + [Models.Metadata.DipLocation.InvertedKey] = item.Inverted, }; return dipLocation; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipSwitch ConvertToInternalModel(DipSwitch item) + private static Models.Metadata.DipSwitch ConvertToInternalModel(DipSwitch item) { - var dipSwitch = new Models.Internal.DipSwitch + var dipSwitch = new Models.Metadata.DipSwitch { - [Models.Internal.DipSwitch.NameKey] = item.Name, - [Models.Internal.DipSwitch.TagKey] = item.Tag, - [Models.Internal.DipSwitch.MaskKey] = item.Mask, + [Models.Metadata.DipSwitch.NameKey] = item.Name, + [Models.Metadata.DipSwitch.TagKey] = item.Tag, + [Models.Metadata.DipSwitch.MaskKey] = item.Mask, }; if (item.Condition != null) - dipSwitch[Models.Internal.DipSwitch.ConditionKey] = ConvertToInternalModel(item.Condition); + dipSwitch[Models.Metadata.DipSwitch.ConditionKey] = ConvertToInternalModel(item.Condition); if (item.DipLocation != null && item.DipLocation.Any()) { - dipSwitch[Models.Internal.DipSwitch.DipLocationKey] = item.DipLocation + dipSwitch[Models.Metadata.DipSwitch.DipLocationKey] = item.DipLocation .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -496,7 +496,7 @@ namespace SabreTools.Serialization if (item.DipValue != null && item.DipValue.Any()) { - dipSwitch[Models.Internal.DipSwitch.DipValueKey] = item.DipValue + dipSwitch[Models.Metadata.DipSwitch.DipValueKey] = item.DipValue .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -506,134 +506,134 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipValue ConvertToInternalModel(DipValue item) + private static Models.Metadata.DipValue ConvertToInternalModel(DipValue item) { - var dipValue = new Models.Internal.DipValue + var dipValue = new Models.Metadata.DipValue { - [Models.Internal.DipValue.NameKey] = item.Name, - [Models.Internal.DipValue.ValueKey] = item.Value, - [Models.Internal.DipValue.DefaultKey] = item.Default, + [Models.Metadata.DipValue.NameKey] = item.Name, + [Models.Metadata.DipValue.ValueKey] = item.Value, + [Models.Metadata.DipValue.DefaultKey] = item.Default, }; if (item.Condition != null) - dipValue[Models.Internal.DipValue.ConditionKey] = ConvertToInternalModel(item.Condition); + dipValue[Models.Metadata.DipValue.ConditionKey] = ConvertToInternalModel(item.Condition); return dipValue; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Disk ConvertToInternalModel(Disk item) + private static Models.Metadata.Disk ConvertToInternalModel(Disk item) { - var disk = new Models.Internal.Disk + var disk = new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.Name, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, - [Models.Internal.Disk.MergeKey] = item.Merge, - [Models.Internal.Disk.RegionKey] = item.Region, - [Models.Internal.Disk.IndexKey] = item.Index, - [Models.Internal.Disk.WritableKey] = item.Writable, - [Models.Internal.Disk.StatusKey] = item.Status, - [Models.Internal.Disk.OptionalKey] = item.Optional, + [Models.Metadata.Disk.NameKey] = item.Name, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.MergeKey] = item.Merge, + [Models.Metadata.Disk.RegionKey] = item.Region, + [Models.Metadata.Disk.IndexKey] = item.Index, + [Models.Metadata.Disk.WritableKey] = item.Writable, + [Models.Metadata.Disk.StatusKey] = item.Status, + [Models.Metadata.Disk.OptionalKey] = item.Optional, }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Display ConvertToInternalModel(Display item) + private static Models.Metadata.Display ConvertToInternalModel(Display item) { - var display = new Models.Internal.Display + var display = new Models.Metadata.Display { - [Models.Internal.Display.TagKey] = item.Tag, - [Models.Internal.Display.TypeKey] = item.Type, - [Models.Internal.Display.RotateKey] = item.Rotate, - [Models.Internal.Display.FlipXKey] = item.FlipX, - [Models.Internal.Display.WidthKey] = item.Width, - [Models.Internal.Display.HeightKey] = item.Height, - [Models.Internal.Display.RefreshKey] = item.Refresh, - [Models.Internal.Display.PixClockKey] = item.PixClock, - [Models.Internal.Display.HTotalKey] = item.HTotal, - [Models.Internal.Display.HBEndKey] = item.HBEnd, - [Models.Internal.Display.HBStartKey] = item.HBStart, - [Models.Internal.Display.VTotalKey] = item.VTotal, - [Models.Internal.Display.VBEndKey] = item.VBEnd, - [Models.Internal.Display.VBStartKey] = item.VBStart, + [Models.Metadata.Display.TagKey] = item.Tag, + [Models.Metadata.Display.TypeKey] = item.Type, + [Models.Metadata.Display.RotateKey] = item.Rotate, + [Models.Metadata.Display.FlipXKey] = item.FlipX, + [Models.Metadata.Display.WidthKey] = item.Width, + [Models.Metadata.Display.HeightKey] = item.Height, + [Models.Metadata.Display.RefreshKey] = item.Refresh, + [Models.Metadata.Display.PixClockKey] = item.PixClock, + [Models.Metadata.Display.HTotalKey] = item.HTotal, + [Models.Metadata.Display.HBEndKey] = item.HBEnd, + [Models.Metadata.Display.HBStartKey] = item.HBStart, + [Models.Metadata.Display.VTotalKey] = item.VTotal, + [Models.Metadata.Display.VBEndKey] = item.VBEnd, + [Models.Metadata.Display.VBStartKey] = item.VBStart, }; return display; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Driver ConvertToInternalModel(Driver item) + private static Models.Metadata.Driver ConvertToInternalModel(Driver item) { - var driver = new Models.Internal.Driver + var driver = new Models.Metadata.Driver { - [Models.Internal.Driver.StatusKey] = item.Status, - [Models.Internal.Driver.ColorKey] = item.Color, - [Models.Internal.Driver.SoundKey] = item.Sound, - [Models.Internal.Driver.PaletteSizeKey] = item.PaletteSize, - [Models.Internal.Driver.EmulationKey] = item.Emulation, - [Models.Internal.Driver.CocktailKey] = item.Cocktail, - [Models.Internal.Driver.SaveStateKey] = item.SaveState, - [Models.Internal.Driver.RequiresArtworkKey] = item.RequiresArtwork, - [Models.Internal.Driver.UnofficialKey] = item.Unofficial, - [Models.Internal.Driver.NoSoundHardwareKey] = item.NoSoundHardware, - [Models.Internal.Driver.IncompleteKey] = item.Incomplete, + [Models.Metadata.Driver.StatusKey] = item.Status, + [Models.Metadata.Driver.ColorKey] = item.Color, + [Models.Metadata.Driver.SoundKey] = item.Sound, + [Models.Metadata.Driver.PaletteSizeKey] = item.PaletteSize, + [Models.Metadata.Driver.EmulationKey] = item.Emulation, + [Models.Metadata.Driver.CocktailKey] = item.Cocktail, + [Models.Metadata.Driver.SaveStateKey] = item.SaveState, + [Models.Metadata.Driver.RequiresArtworkKey] = item.RequiresArtwork, + [Models.Metadata.Driver.UnofficialKey] = item.Unofficial, + [Models.Metadata.Driver.NoSoundHardwareKey] = item.NoSoundHardware, + [Models.Metadata.Driver.IncompleteKey] = item.Incomplete, }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Extension ConvertToInternalModel(Extension item) + private static Models.Metadata.Extension ConvertToInternalModel(Extension item) { - var extension = new Models.Internal.Extension + var extension = new Models.Metadata.Extension { - [Models.Internal.Extension.NameKey] = item.Name, + [Models.Metadata.Extension.NameKey] = item.Name, }; return extension; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Feature ConvertToInternalModel(Feature item) + private static Models.Metadata.Feature ConvertToInternalModel(Feature item) { - var feature = new Models.Internal.Feature + var feature = new Models.Metadata.Feature { - [Models.Internal.Feature.TypeKey] = item.Type, - [Models.Internal.Feature.StatusKey] = item.Status, - [Models.Internal.Feature.OverallKey] = item.Overall, + [Models.Metadata.Feature.TypeKey] = item.Type, + [Models.Metadata.Feature.StatusKey] = item.Status, + [Models.Metadata.Feature.OverallKey] = item.Overall, }; return feature; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Input ConvertToInternalModel(Input item) + private static Models.Metadata.Input ConvertToInternalModel(Input item) { - var input = new Models.Internal.Input + var input = new Models.Metadata.Input { - [Models.Internal.Input.ServiceKey] = item.Service, - [Models.Internal.Input.TiltKey] = item.Tilt, - [Models.Internal.Input.PlayersKey] = item.Players, - [Models.Internal.Input.ControlKey] = item.ControlAttr, - [Models.Internal.Input.ButtonsKey] = item.Buttons, - [Models.Internal.Input.CoinsKey] = item.Coins, + [Models.Metadata.Input.ServiceKey] = item.Service, + [Models.Metadata.Input.TiltKey] = item.Tilt, + [Models.Metadata.Input.PlayersKey] = item.Players, + [Models.Metadata.Input.ControlKey] = item.ControlAttr, + [Models.Metadata.Input.ButtonsKey] = item.Buttons, + [Models.Metadata.Input.CoinsKey] = item.Coins, }; if (item.Control != null && item.Control.Any()) { - input[Models.Internal.Input.ControlKey] = item.Control + input[Models.Metadata.Input.ControlKey] = item.Control .Where(c => c != null) .Select(ConvertToInternalModel) .ToArray(); @@ -643,31 +643,31 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Instance ConvertToInternalModel(Instance item) + private static Models.Metadata.Instance ConvertToInternalModel(Instance item) { - var instance = new Models.Internal.Instance + var instance = new Models.Metadata.Instance { - [Models.Internal.Instance.NameKey] = item.Name, - [Models.Internal.Instance.BriefNameKey] = item.BriefName, + [Models.Metadata.Instance.NameKey] = item.Name, + [Models.Metadata.Instance.BriefNameKey] = item.BriefName, }; return instance; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Port ConvertToInternalModel(Port item) + private static Models.Metadata.Port ConvertToInternalModel(Port item) { - var port = new Models.Internal.Port + var port = new Models.Metadata.Port { - [Models.Internal.Port.TagKey] = item.Tag, + [Models.Metadata.Port.TagKey] = item.Tag, }; if (item.Analog != null && item.Analog.Any()) { - port[Models.Internal.Port.AnalogKey] = item.Analog + port[Models.Metadata.Port.AnalogKey] = item.Analog .Where(a => a != null) .Select(ConvertToInternalModel) .ToArray(); @@ -677,67 +677,67 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.RamOption ConvertToInternalModel(RamOption item) + private static Models.Metadata.RamOption ConvertToInternalModel(RamOption item) { - var ramOption = new Models.Internal.RamOption + var ramOption = new Models.Metadata.RamOption { - [Models.Internal.RamOption.NameKey] = item.Name, - [Models.Internal.RamOption.DefaultKey] = item.Default, - [Models.Internal.RamOption.ContentKey] = item.Content, + [Models.Metadata.RamOption.NameKey] = item.Name, + [Models.Metadata.RamOption.DefaultKey] = item.Default, + [Models.Metadata.RamOption.ContentKey] = item.Content, }; return ramOption; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Rom item) + private static Models.Metadata.Rom ConvertToInternalModel(Rom item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.BiosKey] = item.Bios, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.MergeKey] = item.Merge, - [Models.Internal.Rom.RegionKey] = item.Region, - [Models.Internal.Rom.OffsetKey] = item.Offset, - [Models.Internal.Rom.StatusKey] = item.Status, - [Models.Internal.Rom.OptionalKey] = item.Optional, - [Models.Internal.Rom.DisposeKey] = item.Dispose, - [Models.Internal.Rom.SoundOnlyKey] = item.SoundOnly, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.BiosKey] = item.Bios, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.MergeKey] = item.Merge, + [Models.Metadata.Rom.RegionKey] = item.Region, + [Models.Metadata.Rom.OffsetKey] = item.Offset, + [Models.Metadata.Rom.StatusKey] = item.Status, + [Models.Metadata.Rom.OptionalKey] = item.Optional, + [Models.Metadata.Rom.DisposeKey] = item.Dispose, + [Models.Metadata.Rom.SoundOnlyKey] = item.SoundOnly, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Sample ConvertToInternalModel(Sample item) + private static Models.Metadata.Sample ConvertToInternalModel(Sample item) { - var sample = new Models.Internal.Sample + var sample = new Models.Metadata.Sample { - [Models.Internal.Sample.NameKey] = item.Name, + [Models.Metadata.Sample.NameKey] = item.Name, }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Slot ConvertToInternalModel(Slot item) + private static Models.Metadata.Slot ConvertToInternalModel(Slot item) { - var slot = new Models.Internal.Slot + var slot = new Models.Metadata.Slot { - [Models.Internal.Slot.NameKey] = item.Name, + [Models.Metadata.Slot.NameKey] = item.Name, }; if (item.SlotOption != null && item.SlotOption.Any()) { - slot[Models.Internal.Slot.SlotOptionKey] = item.SlotOption + slot[Models.Metadata.Slot.SlotOptionKey] = item.SlotOption .Where(s => s != null) .Select(ConvertToInternalModel) .ToArray(); @@ -747,60 +747,60 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.SlotOption ConvertToInternalModel(SlotOption item) + private static Models.Metadata.SlotOption ConvertToInternalModel(SlotOption item) { - var slotOption = new Models.Internal.SlotOption + var slotOption = new Models.Metadata.SlotOption { - [Models.Internal.SlotOption.NameKey] = item.Name, - [Models.Internal.SlotOption.DevNameKey] = item.DevName, - [Models.Internal.SlotOption.DefaultKey] = item.Default, + [Models.Metadata.SlotOption.NameKey] = item.Name, + [Models.Metadata.SlotOption.DevNameKey] = item.DevName, + [Models.Metadata.SlotOption.DefaultKey] = item.Default, }; return slotOption; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.SoftwareList ConvertToInternalModel(SoftwareList item) + private static Models.Metadata.SoftwareList ConvertToInternalModel(SoftwareList item) { - var softwareList = new Models.Internal.SoftwareList + var softwareList = new Models.Metadata.SoftwareList { - [Models.Internal.SoftwareList.TagKey] = item.Tag, - [Models.Internal.SoftwareList.NameKey] = item.Name, - [Models.Internal.SoftwareList.StatusKey] = item.Status, - [Models.Internal.SoftwareList.FilterKey] = item.Filter, + [Models.Metadata.SoftwareList.TagKey] = item.Tag, + [Models.Metadata.SoftwareList.NameKey] = item.Name, + [Models.Metadata.SoftwareList.StatusKey] = item.Status, + [Models.Metadata.SoftwareList.FilterKey] = item.Filter, }; return softwareList; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Sound ConvertToInternalModel(Sound item) + private static Models.Metadata.Sound ConvertToInternalModel(Sound item) { - var sound = new Models.Internal.Sound + var sound = new Models.Metadata.Sound { - [Models.Internal.Sound.ChannelsKey] = item.Channels, + [Models.Metadata.Sound.ChannelsKey] = item.Channels, }; return sound; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Video ConvertToInternalModel(Video item) + private static Models.Metadata.Video ConvertToInternalModel(Video item) { - var video = new Models.Internal.Video + var video = new Models.Metadata.Video { - [Models.Internal.Video.ScreenKey] = item.Screen, - [Models.Internal.Video.OrientationKey] = item.Orientation, - [Models.Internal.Video.WidthKey] = item.Width, - [Models.Internal.Video.HeightKey] = item.Height, - [Models.Internal.Video.AspectXKey] = item.AspectX, - [Models.Internal.Video.AspectYKey] = item.AspectY, - [Models.Internal.Video.RefreshKey] = item.Refresh, + [Models.Metadata.Video.ScreenKey] = item.Screen, + [Models.Metadata.Video.OrientationKey] = item.Orientation, + [Models.Metadata.Video.WidthKey] = item.Width, + [Models.Metadata.Video.HeightKey] = item.Height, + [Models.Metadata.Video.AspectXKey] = item.AspectX, + [Models.Metadata.Video.AspectYKey] = item.AspectY, + [Models.Metadata.Video.RefreshKey] = item.Refresh, }; return video; } diff --git a/SabreTools.Serialization/Logiqx.Deserializer.cs b/SabreTools.Serialization/Logiqx.Deserializer.cs index abebbd67..8f97d2ba 100644 --- a/SabreTools.Serialization/Logiqx.Deserializer.cs +++ b/SabreTools.Serialization/Logiqx.Deserializer.cs @@ -11,26 +11,26 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Datafile? ConvertFromInternalModel(Models.Internal.MetadataFile? item, bool game = false) + public static Datafile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item, bool game = false) { if (item == null) return null; var datafile = new Datafile { - Build = item.ReadString(Models.Internal.Header.BuildKey), - Debug = item.ReadString(Models.Internal.Header.DebugKey), - SchemaLocation = item.ReadString(Models.Internal.Header.SchemaLocationKey), + Build = item.ReadString(Models.Metadata.Header.BuildKey), + Debug = item.ReadString(Models.Metadata.Header.DebugKey), + SchemaLocation = item.ReadString(Models.Metadata.Header.SchemaLocationKey), }; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); if (header != null) datafile.Header = ConvertHeaderFromInternalModel(header); // TODO: Handle Dir items - Currently need to be generated from the machines - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { datafile.Game = machines @@ -43,58 +43,58 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Header ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static Header ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var header = new Header { - Id = item.ReadString(Models.Internal.Header.IdKey), - Name = item.ReadString(Models.Internal.Header.NameKey), - Description = item.ReadString(Models.Internal.Header.DescriptionKey), - RootDir = item.ReadString(Models.Internal.Header.RootDirKey), - Category = item.ReadString(Models.Internal.Header.CategoryKey), - Version = item.ReadString(Models.Internal.Header.VersionKey), - Date = item.ReadString(Models.Internal.Header.DateKey), - Author = item.ReadString(Models.Internal.Header.AuthorKey), - Email = item.ReadString(Models.Internal.Header.EmailKey), - Homepage = item.ReadString(Models.Internal.Header.HomepageKey), - Url = item.ReadString(Models.Internal.Header.UrlKey), - Comment = item.ReadString(Models.Internal.Header.CommentKey), - Type = item.ReadString(Models.Internal.Header.TypeKey), + Id = item.ReadString(Models.Metadata.Header.IdKey), + Name = item.ReadString(Models.Metadata.Header.NameKey), + Description = item.ReadString(Models.Metadata.Header.DescriptionKey), + RootDir = item.ReadString(Models.Metadata.Header.RootDirKey), + Category = item.ReadString(Models.Metadata.Header.CategoryKey), + Version = item.ReadString(Models.Metadata.Header.VersionKey), + Date = item.ReadString(Models.Metadata.Header.DateKey), + Author = item.ReadString(Models.Metadata.Header.AuthorKey), + Email = item.ReadString(Models.Metadata.Header.EmailKey), + Homepage = item.ReadString(Models.Metadata.Header.HomepageKey), + Url = item.ReadString(Models.Metadata.Header.UrlKey), + Comment = item.ReadString(Models.Metadata.Header.CommentKey), + Type = item.ReadString(Models.Metadata.Header.TypeKey), }; - if (item.ContainsKey(Models.Internal.Header.HeaderKey) - || item.ContainsKey(Models.Internal.Header.ForceMergingKey) - || item.ContainsKey(Models.Internal.Header.ForceNodumpKey) - || item.ContainsKey(Models.Internal.Header.ForcePackingKey)) + if (item.ContainsKey(Models.Metadata.Header.HeaderKey) + || item.ContainsKey(Models.Metadata.Header.ForceMergingKey) + || item.ContainsKey(Models.Metadata.Header.ForceNodumpKey) + || item.ContainsKey(Models.Metadata.Header.ForcePackingKey)) { header.ClrMamePro = new Models.Logiqx.ClrMamePro { - Header = item.ReadString(Models.Internal.Header.HeaderKey), - ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey), - ForceNodump = item.ReadString(Models.Internal.Header.ForceNodumpKey), - ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey), + Header = item.ReadString(Models.Metadata.Header.HeaderKey), + ForceMerging = item.ReadString(Models.Metadata.Header.ForceMergingKey), + ForceNodump = item.ReadString(Models.Metadata.Header.ForceNodumpKey), + ForcePacking = item.ReadString(Models.Metadata.Header.ForcePackingKey), }; } - if (item.ContainsKey(Models.Internal.Header.PluginKey) - || item.ContainsKey(Models.Internal.Header.RomModeKey) - || item.ContainsKey(Models.Internal.Header.BiosModeKey) - || item.ContainsKey(Models.Internal.Header.SampleModeKey) - || item.ContainsKey(Models.Internal.Header.LockRomModeKey) - || item.ContainsKey(Models.Internal.Header.LockBiosModeKey) - || item.ContainsKey(Models.Internal.Header.LockSampleModeKey)) + if (item.ContainsKey(Models.Metadata.Header.PluginKey) + || item.ContainsKey(Models.Metadata.Header.RomModeKey) + || item.ContainsKey(Models.Metadata.Header.BiosModeKey) + || item.ContainsKey(Models.Metadata.Header.SampleModeKey) + || item.ContainsKey(Models.Metadata.Header.LockRomModeKey) + || item.ContainsKey(Models.Metadata.Header.LockBiosModeKey) + || item.ContainsKey(Models.Metadata.Header.LockSampleModeKey)) { header.RomCenter = new Models.Logiqx.RomCenter { - Plugin = item.ReadString(Models.Internal.Header.PluginKey), - RomMode = item.ReadString(Models.Internal.Header.RomModeKey), - BiosMode = item.ReadString(Models.Internal.Header.BiosModeKey), - SampleMode = item.ReadString(Models.Internal.Header.SampleModeKey), - LockRomMode = item.ReadString(Models.Internal.Header.LockRomModeKey), - LockBiosMode = item.ReadString(Models.Internal.Header.LockBiosModeKey), - LockSampleMode = item.ReadString(Models.Internal.Header.LockSampleModeKey), + Plugin = item.ReadString(Models.Metadata.Header.PluginKey), + RomMode = item.ReadString(Models.Metadata.Header.RomModeKey), + BiosMode = item.ReadString(Models.Metadata.Header.BiosModeKey), + SampleMode = item.ReadString(Models.Metadata.Header.SampleModeKey), + LockRomMode = item.ReadString(Models.Metadata.Header.LockRomModeKey), + LockBiosMode = item.ReadString(Models.Metadata.Header.LockBiosModeKey), + LockSampleMode = item.ReadString(Models.Metadata.Header.LockSampleModeKey), }; } @@ -102,37 +102,37 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static GameBase ConvertMachineFromInternalModel(Models.Internal.Machine item, bool game = false) + private static GameBase ConvertMachineFromInternalModel(Models.Metadata.Machine item, bool game = false) { GameBase gameBase = game ? new Game() : new Machine(); - gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey); - gameBase.SourceFile = item.ReadString(Models.Internal.Machine.SourceFileKey); - gameBase.IsBios = item.ReadString(Models.Internal.Machine.IsBiosKey); - gameBase.IsDevice = item.ReadString(Models.Internal.Machine.IsDeviceKey); - gameBase.IsMechanical = item.ReadString(Models.Internal.Machine.IsMechanicalKey); - gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey); - gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey); - gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey); - gameBase.Board = item.ReadString(Models.Internal.Machine.BoardKey); - gameBase.RebuildTo = item.ReadString(Models.Internal.Machine.RebuildToKey); - gameBase.Id = item.ReadString(Models.Internal.Machine.IdKey); - gameBase.CloneOfId = item.ReadString(Models.Internal.Machine.CloneOfIdKey); - gameBase.Runnable = item.ReadString(Models.Internal.Machine.RunnableKey); - gameBase.Comment = item.ReadStringArray(Models.Internal.Machine.CommentKey); - gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey); - gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey); - gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey); - gameBase.Publisher = item.ReadString(Models.Internal.Machine.PublisherKey); - gameBase.Category = item.ReadStringArray(Models.Internal.Machine.CategoryKey); + gameBase.Name = item.ReadString(Models.Metadata.Machine.NameKey); + gameBase.SourceFile = item.ReadString(Models.Metadata.Machine.SourceFileKey); + gameBase.IsBios = item.ReadString(Models.Metadata.Machine.IsBiosKey); + gameBase.IsDevice = item.ReadString(Models.Metadata.Machine.IsDeviceKey); + gameBase.IsMechanical = item.ReadString(Models.Metadata.Machine.IsMechanicalKey); + gameBase.CloneOf = item.ReadString(Models.Metadata.Machine.CloneOfKey); + gameBase.RomOf = item.ReadString(Models.Metadata.Machine.RomOfKey); + gameBase.SampleOf = item.ReadString(Models.Metadata.Machine.SampleOfKey); + gameBase.Board = item.ReadString(Models.Metadata.Machine.BoardKey); + gameBase.RebuildTo = item.ReadString(Models.Metadata.Machine.RebuildToKey); + gameBase.Id = item.ReadString(Models.Metadata.Machine.IdKey); + gameBase.CloneOfId = item.ReadString(Models.Metadata.Machine.CloneOfIdKey); + gameBase.Runnable = item.ReadString(Models.Metadata.Machine.RunnableKey); + gameBase.Comment = item.ReadStringArray(Models.Metadata.Machine.CommentKey); + gameBase.Description = item.ReadString(Models.Metadata.Machine.DescriptionKey); + gameBase.Year = item.ReadString(Models.Metadata.Machine.YearKey); + gameBase.Manufacturer = item.ReadString(Models.Metadata.Machine.ManufacturerKey); + gameBase.Publisher = item.ReadString(Models.Metadata.Machine.PublisherKey); + gameBase.Category = item.ReadStringArray(Models.Metadata.Machine.CategoryKey); - var trurip = item.Read(Models.Internal.Machine.TruripKey); + var trurip = item.Read(Models.Metadata.Machine.TruripKey); if (trurip != null) gameBase.Trurip = trurip; - var releases = item.Read(Models.Internal.Machine.ReleaseKey); + var releases = item.Read(Models.Metadata.Machine.ReleaseKey); if (releases != null && releases.Any()) { gameBase.Release = releases @@ -141,7 +141,7 @@ namespace SabreTools.Serialization .ToArray(); } - var biosSets = item.Read(Models.Internal.Machine.BiosSetKey); + var biosSets = item.Read(Models.Metadata.Machine.BiosSetKey); if (biosSets != null && biosSets.Any()) { gameBase.BiosSet = biosSets @@ -150,7 +150,7 @@ namespace SabreTools.Serialization .ToArray(); } - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { gameBase.Rom = roms @@ -159,7 +159,7 @@ namespace SabreTools.Serialization .ToArray(); } - var disks = item.Read(Models.Internal.Machine.DiskKey); + var disks = item.Read(Models.Metadata.Machine.DiskKey); if (disks != null && disks.Any()) { gameBase.Disk = disks @@ -168,7 +168,7 @@ namespace SabreTools.Serialization .ToArray(); } - var medias = item.Read(Models.Internal.Machine.MediaKey); + var medias = item.Read(Models.Metadata.Machine.MediaKey); if (medias != null && medias.Any()) { gameBase.Media = medias @@ -177,7 +177,7 @@ namespace SabreTools.Serialization .ToArray(); } - var deviceRefs = item.Read(Models.Internal.Machine.DeviceRefKey); + var deviceRefs = item.Read(Models.Metadata.Machine.DeviceRefKey); if (deviceRefs != null && deviceRefs.Any()) { gameBase.DeviceRef = deviceRefs @@ -186,7 +186,7 @@ namespace SabreTools.Serialization .ToArray(); } - var samples = item.Read(Models.Internal.Machine.SampleKey); + var samples = item.Read(Models.Metadata.Machine.SampleKey); if (samples != null && samples.Any()) { gameBase.Sample = samples @@ -195,7 +195,7 @@ namespace SabreTools.Serialization .ToArray(); } - var archives = item.Read(Models.Internal.Machine.ArchiveKey); + var archives = item.Read(Models.Metadata.Machine.ArchiveKey); if (archives != null && archives.Any()) { gameBase.Archive = archives @@ -204,11 +204,11 @@ namespace SabreTools.Serialization .ToArray(); } - var driver = item.Read(Models.Internal.Machine.DriverKey); + var driver = item.Read(Models.Metadata.Machine.DriverKey); if (driver != null) gameBase.Driver = ConvertFromInternalModel(driver); - var softwareLists = item.Read(Models.Internal.Machine.SoftwareListKey); + var softwareLists = item.Read(Models.Metadata.Machine.SoftwareListKey); if (softwareLists != null && softwareLists.Any()) { gameBase.SoftwareList = softwareLists @@ -221,163 +221,163 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Archive ConvertFromInternalModel(Models.Internal.Archive item) + private static Archive ConvertFromInternalModel(Models.Metadata.Archive item) { var archive = new Archive { - Name = item.ReadString(Models.Internal.Archive.NameKey), + Name = item.ReadString(Models.Metadata.Archive.NameKey), }; return archive; } /// - /// Convert from to + /// Convert from to /// - private static BiosSet ConvertFromInternalModel(Models.Internal.BiosSet item) + private static BiosSet ConvertFromInternalModel(Models.Metadata.BiosSet item) { var biosset = new BiosSet { - Name = item.ReadString(Models.Internal.BiosSet.NameKey), - Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey), - Default = item.ReadString(Models.Internal.BiosSet.DefaultKey), + Name = item.ReadString(Models.Metadata.BiosSet.NameKey), + Description = item.ReadString(Models.Metadata.BiosSet.DescriptionKey), + Default = item.ReadString(Models.Metadata.BiosSet.DefaultKey), }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static DeviceRef ConvertFromInternalModel(Models.Internal.DeviceRef item) + private static DeviceRef ConvertFromInternalModel(Models.Metadata.DeviceRef item) { var deviceRef = new DeviceRef { - Name = item.ReadString(Models.Internal.DipSwitch.NameKey), + Name = item.ReadString(Models.Metadata.DipSwitch.NameKey), }; return deviceRef; } /// - /// Convert from to + /// Convert from to /// - private static Disk ConvertFromInternalModel(Models.Internal.Disk item) + private static Disk ConvertFromInternalModel(Models.Metadata.Disk item) { var disk = new Disk { - Name = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), - Merge = item.ReadString(Models.Internal.Disk.MergeKey), - Status = item.ReadString(Models.Internal.Disk.StatusKey), - Region = item.ReadString(Models.Internal.Disk.RegionKey), + Name = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), + Merge = item.ReadString(Models.Metadata.Disk.MergeKey), + Status = item.ReadString(Models.Metadata.Disk.StatusKey), + Region = item.ReadString(Models.Metadata.Disk.RegionKey), }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Driver ConvertFromInternalModel(Models.Internal.Driver item) + private static Driver ConvertFromInternalModel(Models.Metadata.Driver item) { var driver = new Driver { - Status = item.ReadString(Models.Internal.Driver.StatusKey), - Emulation = item.ReadString(Models.Internal.Driver.EmulationKey), - Cocktail = item.ReadString(Models.Internal.Driver.CocktailKey), - SaveState = item.ReadString(Models.Internal.Driver.SaveStateKey), - RequiresArtwork = item.ReadString(Models.Internal.Driver.RequiresArtworkKey), - Unofficial = item.ReadString(Models.Internal.Driver.UnofficialKey), - NoSoundHardware = item.ReadString(Models.Internal.Driver.NoSoundHardwareKey), - Incomplete = item.ReadString(Models.Internal.Driver.IncompleteKey), + Status = item.ReadString(Models.Metadata.Driver.StatusKey), + Emulation = item.ReadString(Models.Metadata.Driver.EmulationKey), + Cocktail = item.ReadString(Models.Metadata.Driver.CocktailKey), + SaveState = item.ReadString(Models.Metadata.Driver.SaveStateKey), + RequiresArtwork = item.ReadString(Models.Metadata.Driver.RequiresArtworkKey), + Unofficial = item.ReadString(Models.Metadata.Driver.UnofficialKey), + NoSoundHardware = item.ReadString(Models.Metadata.Driver.NoSoundHardwareKey), + Incomplete = item.ReadString(Models.Metadata.Driver.IncompleteKey), }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Media ConvertFromInternalModel(Models.Internal.Media item) + private static Media ConvertFromInternalModel(Models.Metadata.Media item) { var media = new Media { - Name = item.ReadString(Models.Internal.Media.NameKey), - MD5 = item.ReadString(Models.Internal.Media.MD5Key), - SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), - SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), + Name = item.ReadString(Models.Metadata.Media.NameKey), + MD5 = item.ReadString(Models.Metadata.Media.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Media.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Media.SHA256Key), + SpamSum = item.ReadString(Models.Metadata.Media.SpamSumKey), }; return media; } /// - /// Convert from to + /// Convert from to /// - private static Release ConvertFromInternalModel(Models.Internal.Release item) + private static Release ConvertFromInternalModel(Models.Metadata.Release item) { var release = new Release { - Name = item.ReadString(Models.Internal.Release.NameKey), - Region = item.ReadString(Models.Internal.Release.RegionKey), - Language = item.ReadString(Models.Internal.Release.LanguageKey), - Date = item.ReadString(Models.Internal.Release.DateKey), - Default = item.ReadString(Models.Internal.Release.DefaultKey), + Name = item.ReadString(Models.Metadata.Release.NameKey), + Region = item.ReadString(Models.Metadata.Release.RegionKey), + Language = item.ReadString(Models.Metadata.Release.LanguageKey), + Date = item.ReadString(Models.Metadata.Release.DateKey), + Default = item.ReadString(Models.Metadata.Release.DefaultKey), }; return release; } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertFromInternalModel(Models.Internal.Rom item) + private static Rom ConvertFromInternalModel(Models.Metadata.Rom item) { var rom = new Rom { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - MD5 = item.ReadString(Models.Internal.Rom.MD5Key), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), - SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), - SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), - SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), - xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key), - xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key), - Merge = item.ReadString(Models.Internal.Rom.MergeKey), - Status = item.ReadString(Models.Internal.Rom.StatusKey), - Serial = item.ReadString(Models.Internal.Rom.SerialKey), - Header = item.ReadString(Models.Internal.Rom.HeaderKey), - Date = item.ReadString(Models.Internal.Rom.DateKey), - Inverted = item.ReadString(Models.Internal.Rom.InvertedKey), - MIA = item.ReadString(Models.Internal.Rom.MIAKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + MD5 = item.ReadString(Models.Metadata.Rom.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Rom.SHA256Key), + SHA384 = item.ReadString(Models.Metadata.Rom.SHA384Key), + SHA512 = item.ReadString(Models.Metadata.Rom.SHA512Key), + SpamSum = item.ReadString(Models.Metadata.Rom.SpamSumKey), + xxHash364 = item.ReadString(Models.Metadata.Rom.xxHash364Key), + xxHash3128 = item.ReadString(Models.Metadata.Rom.xxHash3128Key), + Merge = item.ReadString(Models.Metadata.Rom.MergeKey), + Status = item.ReadString(Models.Metadata.Rom.StatusKey), + Serial = item.ReadString(Models.Metadata.Rom.SerialKey), + Header = item.ReadString(Models.Metadata.Rom.HeaderKey), + Date = item.ReadString(Models.Metadata.Rom.DateKey), + Inverted = item.ReadString(Models.Metadata.Rom.InvertedKey), + MIA = item.ReadString(Models.Metadata.Rom.MIAKey), }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Sample ConvertFromInternalModel(Models.Internal.Sample item) + private static Sample ConvertFromInternalModel(Models.Metadata.Sample item) { var sample = new Sample { - Name = item.ReadString(Models.Internal.Sample.NameKey), + Name = item.ReadString(Models.Metadata.Sample.NameKey), }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static SoftwareList ConvertFromInternalModel(Models.Internal.SoftwareList item) + private static SoftwareList ConvertFromInternalModel(Models.Metadata.SoftwareList item) { var softwareList = new SoftwareList { - Tag = item.ReadString(Models.Internal.SoftwareList.TagKey), - Name = item.ReadString(Models.Internal.SoftwareList.NameKey), - Status = item.ReadString(Models.Internal.SoftwareList.StatusKey), - Filter = item.ReadString(Models.Internal.SoftwareList.FilterKey), + Tag = item.ReadString(Models.Metadata.SoftwareList.TagKey), + Name = item.ReadString(Models.Metadata.SoftwareList.NameKey), + Status = item.ReadString(Models.Metadata.SoftwareList.StatusKey), + Filter = item.ReadString(Models.Metadata.SoftwareList.FilterKey), }; return softwareList; } diff --git a/SabreTools.Serialization/Logiqx.Serializer.cs b/SabreTools.Serialization/Logiqx.Serializer.cs index ede38737..1883b884 100644 --- a/SabreTools.Serialization/Logiqx.Serializer.cs +++ b/SabreTools.Serialization/Logiqx.Serializer.cs @@ -22,19 +22,19 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(Datafile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(Datafile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; - var machines = new List(); + var machines = new List(); if (item.Game != null && item.Game.Any()) { @@ -51,308 +51,308 @@ namespace SabreTools.Serialization } if (machines.Any()) - metadataFile[Models.Internal.MetadataFile.MachineKey] = machines.ToArray(); + metadataFile[Models.Metadata.MetadataFile.MachineKey] = machines.ToArray(); return metadataFile; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Datafile item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Datafile item) { - var header = item.Header != null ? ConvertHeaderToInternalModel(item.Header) : new Models.Internal.Header(); + var header = item.Header != null ? ConvertHeaderToInternalModel(item.Header) : new Models.Metadata.Header(); - header[Models.Internal.Header.BuildKey] = item.Build; - header[Models.Internal.Header.DebugKey] = item.Debug; - header[Models.Internal.Header.SchemaLocationKey] = item.SchemaLocation; + header[Models.Metadata.Header.BuildKey] = item.Build; + header[Models.Metadata.Header.DebugKey] = item.Debug; + header[Models.Metadata.Header.SchemaLocationKey] = item.SchemaLocation; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Header item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Header item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.IdKey] = item.Id, - [Models.Internal.Header.NameKey] = item.Name, - [Models.Internal.Header.DescriptionKey] = item.Description, - [Models.Internal.Header.RootDirKey] = item.RootDir, - [Models.Internal.Header.CategoryKey] = item.Category, - [Models.Internal.Header.VersionKey] = item.Version, - [Models.Internal.Header.DateKey] = item.Date, - [Models.Internal.Header.AuthorKey] = item.Author, - [Models.Internal.Header.EmailKey] = item.Email, - [Models.Internal.Header.HomepageKey] = item.Homepage, - [Models.Internal.Header.UrlKey] = item.Url, - [Models.Internal.Header.CommentKey] = item.Comment, - [Models.Internal.Header.TypeKey] = item.Type, + [Models.Metadata.Header.IdKey] = item.Id, + [Models.Metadata.Header.NameKey] = item.Name, + [Models.Metadata.Header.DescriptionKey] = item.Description, + [Models.Metadata.Header.RootDirKey] = item.RootDir, + [Models.Metadata.Header.CategoryKey] = item.Category, + [Models.Metadata.Header.VersionKey] = item.Version, + [Models.Metadata.Header.DateKey] = item.Date, + [Models.Metadata.Header.AuthorKey] = item.Author, + [Models.Metadata.Header.EmailKey] = item.Email, + [Models.Metadata.Header.HomepageKey] = item.Homepage, + [Models.Metadata.Header.UrlKey] = item.Url, + [Models.Metadata.Header.CommentKey] = item.Comment, + [Models.Metadata.Header.TypeKey] = item.Type, }; if (item.ClrMamePro != null) { - header[Models.Internal.Header.HeaderKey] = item.ClrMamePro.Header; - header[Models.Internal.Header.ForceMergingKey] = item.ClrMamePro.ForceMerging; - header[Models.Internal.Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump; - header[Models.Internal.Header.ForcePackingKey] = item.ClrMamePro.ForcePacking; + header[Models.Metadata.Header.HeaderKey] = item.ClrMamePro.Header; + header[Models.Metadata.Header.ForceMergingKey] = item.ClrMamePro.ForceMerging; + header[Models.Metadata.Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump; + header[Models.Metadata.Header.ForcePackingKey] = item.ClrMamePro.ForcePacking; } if (item.RomCenter != null) { - header[Models.Internal.Header.PluginKey] = item.RomCenter.Plugin; - header[Models.Internal.Header.RomModeKey] = item.RomCenter.RomMode; - header[Models.Internal.Header.BiosModeKey] = item.RomCenter.BiosMode; - header[Models.Internal.Header.SampleModeKey] = item.RomCenter.SampleMode; - header[Models.Internal.Header.LockRomModeKey] = item.RomCenter.LockRomMode; - header[Models.Internal.Header.LockBiosModeKey] = item.RomCenter.LockBiosMode; - header[Models.Internal.Header.LockSampleModeKey] = item.RomCenter.LockSampleMode; + header[Models.Metadata.Header.PluginKey] = item.RomCenter.Plugin; + header[Models.Metadata.Header.RomModeKey] = item.RomCenter.RomMode; + header[Models.Metadata.Header.BiosModeKey] = item.RomCenter.BiosMode; + header[Models.Metadata.Header.SampleModeKey] = item.RomCenter.SampleMode; + header[Models.Metadata.Header.LockRomModeKey] = item.RomCenter.LockRomMode; + header[Models.Metadata.Header.LockBiosModeKey] = item.RomCenter.LockBiosMode; + header[Models.Metadata.Header.LockSampleModeKey] = item.RomCenter.LockSampleMode; } return header; } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static Models.Internal.Machine[] ConvertDirToInternalModel(Dir item) + private static Models.Metadata.Machine[] ConvertDirToInternalModel(Dir item) { if (item.Game == null || !item.Game.Any()) - return Array.Empty(); + return Array.Empty(); return item.Game .Where(g => g != null) .Select(game => { var machine = ConvertMachineToInternalModel(game); - machine[Models.Internal.Machine.DirNameKey] = item.Name; + machine[Models.Metadata.Machine.DirNameKey] = item.Name; return machine; }) .ToArray(); } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(GameBase item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(GameBase item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, - [Models.Internal.Machine.SourceFileKey] = item.SourceFile, - [Models.Internal.Machine.IsBiosKey] = item.IsBios, - [Models.Internal.Machine.IsDeviceKey] = item.IsDevice, - [Models.Internal.Machine.IsMechanicalKey] = item.IsMechanical, - [Models.Internal.Machine.CloneOfKey] = item.CloneOf, - [Models.Internal.Machine.RomOfKey] = item.RomOf, - [Models.Internal.Machine.SampleOfKey] = item.SampleOf, - [Models.Internal.Machine.BoardKey] = item.Board, - [Models.Internal.Machine.RebuildToKey] = item.RebuildTo, - [Models.Internal.Machine.IdKey] = item.Id, - [Models.Internal.Machine.CloneOfIdKey] = item.CloneOfId, - [Models.Internal.Machine.RunnableKey] = item.Runnable, - [Models.Internal.Machine.CommentKey] = item.Comment, - [Models.Internal.Machine.DescriptionKey] = item.Description, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, - [Models.Internal.Machine.PublisherKey] = item.Publisher, - [Models.Internal.Machine.CategoryKey] = item.Category, - [Models.Internal.Machine.TruripKey] = item.Trurip, + [Models.Metadata.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.SourceFileKey] = item.SourceFile, + [Models.Metadata.Machine.IsBiosKey] = item.IsBios, + [Models.Metadata.Machine.IsDeviceKey] = item.IsDevice, + [Models.Metadata.Machine.IsMechanicalKey] = item.IsMechanical, + [Models.Metadata.Machine.CloneOfKey] = item.CloneOf, + [Models.Metadata.Machine.RomOfKey] = item.RomOf, + [Models.Metadata.Machine.SampleOfKey] = item.SampleOf, + [Models.Metadata.Machine.BoardKey] = item.Board, + [Models.Metadata.Machine.RebuildToKey] = item.RebuildTo, + [Models.Metadata.Machine.IdKey] = item.Id, + [Models.Metadata.Machine.CloneOfIdKey] = item.CloneOfId, + [Models.Metadata.Machine.RunnableKey] = item.Runnable, + [Models.Metadata.Machine.CommentKey] = item.Comment, + [Models.Metadata.Machine.DescriptionKey] = item.Description, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.ManufacturerKey] = item.Manufacturer, + [Models.Metadata.Machine.PublisherKey] = item.Publisher, + [Models.Metadata.Machine.CategoryKey] = item.Category, + [Models.Metadata.Machine.TruripKey] = item.Trurip, }; if (item.Release != null && item.Release.Any()) - machine[Models.Internal.Machine.ReleaseKey] = item.Release.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.ReleaseKey] = item.Release.Select(ConvertToInternalModel).ToArray(); if (item.BiosSet != null && item.BiosSet.Any()) - machine[Models.Internal.Machine.BiosSetKey] = item.BiosSet.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.BiosSetKey] = item.BiosSet.Select(ConvertToInternalModel).ToArray(); if (item.Rom != null && item.Rom.Any()) - machine[Models.Internal.Machine.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray(); if (item.Disk != null && item.Disk.Any()) - machine[Models.Internal.Machine.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray(); if (item.Media != null && item.Media.Any()) - machine[Models.Internal.Machine.MediaKey] = item.Media.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.MediaKey] = item.Media.Select(ConvertToInternalModel).ToArray(); if (item.DeviceRef != null && item.DeviceRef.Any()) - machine[Models.Internal.Machine.DeviceRefKey] = item.DeviceRef.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.DeviceRefKey] = item.DeviceRef.Select(ConvertToInternalModel).ToArray(); if (item.Sample != null && item.Sample.Any()) - machine[Models.Internal.Machine.SampleKey] = item.Sample.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.SampleKey] = item.Sample.Select(ConvertToInternalModel).ToArray(); if (item.Archive != null && item.Archive.Any()) - machine[Models.Internal.Machine.ArchiveKey] = item.Archive.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.ArchiveKey] = item.Archive.Select(ConvertToInternalModel).ToArray(); if (item.Driver != null) - machine[Models.Internal.Machine.DriverKey] = ConvertToInternalModel(item.Driver); + machine[Models.Metadata.Machine.DriverKey] = ConvertToInternalModel(item.Driver); if (item.SoftwareList != null && item.SoftwareList.Any()) - machine[Models.Internal.Machine.SoftwareListKey] = item.SoftwareList.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.SoftwareListKey] = item.SoftwareList.Select(ConvertToInternalModel).ToArray(); return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Archive ConvertToInternalModel(Archive item) + private static Models.Metadata.Archive ConvertToInternalModel(Archive item) { - var archive = new Models.Internal.Archive + var archive = new Models.Metadata.Archive { - [Models.Internal.Archive.NameKey] = item.Name, + [Models.Metadata.Archive.NameKey] = item.Name, }; return archive; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.BiosSet ConvertToInternalModel(BiosSet item) + private static Models.Metadata.BiosSet ConvertToInternalModel(BiosSet item) { - var biosset = new Models.Internal.BiosSet + var biosset = new Models.Metadata.BiosSet { - [Models.Internal.BiosSet.NameKey] = item.Name, - [Models.Internal.BiosSet.DescriptionKey] = item.Description, - [Models.Internal.BiosSet.DefaultKey] = item.Default, + [Models.Metadata.BiosSet.NameKey] = item.Name, + [Models.Metadata.BiosSet.DescriptionKey] = item.Description, + [Models.Metadata.BiosSet.DefaultKey] = item.Default, }; return biosset; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DeviceRef ConvertToInternalModel(DeviceRef item) + private static Models.Metadata.DeviceRef ConvertToInternalModel(DeviceRef item) { - var deviceRef = new Models.Internal.DeviceRef + var deviceRef = new Models.Metadata.DeviceRef { - [Models.Internal.DeviceRef.NameKey] = item.Name, + [Models.Metadata.DeviceRef.NameKey] = item.Name, }; return deviceRef; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Disk ConvertToInternalModel(Disk item) + private static Models.Metadata.Disk ConvertToInternalModel(Disk item) { - var disk = new Models.Internal.Disk + var disk = new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.Name, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, - [Models.Internal.Disk.MergeKey] = item.Merge, - [Models.Internal.Disk.StatusKey] = item.Status, - [Models.Internal.Disk.RegionKey] = item.Region, + [Models.Metadata.Disk.NameKey] = item.Name, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.MergeKey] = item.Merge, + [Models.Metadata.Disk.StatusKey] = item.Status, + [Models.Metadata.Disk.RegionKey] = item.Region, }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Driver ConvertToInternalModel(Driver item) + private static Models.Metadata.Driver ConvertToInternalModel(Driver item) { - var driver = new Models.Internal.Driver + var driver = new Models.Metadata.Driver { - [Models.Internal.Driver.StatusKey] = item.Status, - [Models.Internal.Driver.EmulationKey] = item.Emulation, - [Models.Internal.Driver.CocktailKey] = item.Cocktail, - [Models.Internal.Driver.SaveStateKey] = item.SaveState, - [Models.Internal.Driver.RequiresArtworkKey] = item.RequiresArtwork, - [Models.Internal.Driver.UnofficialKey] = item.Unofficial, - [Models.Internal.Driver.NoSoundHardwareKey] = item.NoSoundHardware, - [Models.Internal.Driver.IncompleteKey] = item.Incomplete, + [Models.Metadata.Driver.StatusKey] = item.Status, + [Models.Metadata.Driver.EmulationKey] = item.Emulation, + [Models.Metadata.Driver.CocktailKey] = item.Cocktail, + [Models.Metadata.Driver.SaveStateKey] = item.SaveState, + [Models.Metadata.Driver.RequiresArtworkKey] = item.RequiresArtwork, + [Models.Metadata.Driver.UnofficialKey] = item.Unofficial, + [Models.Metadata.Driver.NoSoundHardwareKey] = item.NoSoundHardware, + [Models.Metadata.Driver.IncompleteKey] = item.Incomplete, }; return driver; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Media ConvertToInternalModel(Media item) + private static Models.Metadata.Media ConvertToInternalModel(Media item) { - var media = new Models.Internal.Media + var media = new Models.Metadata.Media { - [Models.Internal.Media.NameKey] = item.Name, - [Models.Internal.Media.MD5Key] = item.MD5, - [Models.Internal.Media.SHA1Key] = item.SHA1, - [Models.Internal.Media.SHA256Key] = item.SHA256, - [Models.Internal.Media.SpamSumKey] = item.SpamSum, + [Models.Metadata.Media.NameKey] = item.Name, + [Models.Metadata.Media.MD5Key] = item.MD5, + [Models.Metadata.Media.SHA1Key] = item.SHA1, + [Models.Metadata.Media.SHA256Key] = item.SHA256, + [Models.Metadata.Media.SpamSumKey] = item.SpamSum, }; return media; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Release ConvertToInternalModel(Release item) + private static Models.Metadata.Release ConvertToInternalModel(Release item) { - var release = new Models.Internal.Release + var release = new Models.Metadata.Release { - [Models.Internal.Release.NameKey] = item.Name, - [Models.Internal.Release.RegionKey] = item.Region, - [Models.Internal.Release.LanguageKey] = item.Language, - [Models.Internal.Release.DateKey] = item.Date, - [Models.Internal.Release.DefaultKey] = item.Default, + [Models.Metadata.Release.NameKey] = item.Name, + [Models.Metadata.Release.RegionKey] = item.Region, + [Models.Metadata.Release.LanguageKey] = item.Language, + [Models.Metadata.Release.DateKey] = item.Date, + [Models.Metadata.Release.DefaultKey] = item.Default, }; return release; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Rom item) + private static Models.Metadata.Rom ConvertToInternalModel(Rom item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.MD5Key] = item.MD5, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.SHA256Key] = item.SHA256, - [Models.Internal.Rom.SHA384Key] = item.SHA384, - [Models.Internal.Rom.SHA512Key] = item.SHA512, - [Models.Internal.Rom.SpamSumKey] = item.SpamSum, - [Models.Internal.Rom.xxHash364Key] = item.xxHash364, - [Models.Internal.Rom.xxHash3128Key] = item.xxHash3128, - [Models.Internal.Rom.MergeKey] = item.Merge, - [Models.Internal.Rom.StatusKey] = item.Status, - [Models.Internal.Rom.SerialKey] = item.Serial, - [Models.Internal.Rom.HeaderKey] = item.Header, - [Models.Internal.Rom.DateKey] = item.Date, - [Models.Internal.Rom.InvertedKey] = item.Inverted, - [Models.Internal.Rom.MIAKey] = item.MIA, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.MD5Key] = item.MD5, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.SHA256Key] = item.SHA256, + [Models.Metadata.Rom.SHA384Key] = item.SHA384, + [Models.Metadata.Rom.SHA512Key] = item.SHA512, + [Models.Metadata.Rom.SpamSumKey] = item.SpamSum, + [Models.Metadata.Rom.xxHash364Key] = item.xxHash364, + [Models.Metadata.Rom.xxHash3128Key] = item.xxHash3128, + [Models.Metadata.Rom.MergeKey] = item.Merge, + [Models.Metadata.Rom.StatusKey] = item.Status, + [Models.Metadata.Rom.SerialKey] = item.Serial, + [Models.Metadata.Rom.HeaderKey] = item.Header, + [Models.Metadata.Rom.DateKey] = item.Date, + [Models.Metadata.Rom.InvertedKey] = item.Inverted, + [Models.Metadata.Rom.MIAKey] = item.MIA, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Sample ConvertToInternalModel(Sample item) + private static Models.Metadata.Sample ConvertToInternalModel(Sample item) { - var sample = new Models.Internal.Sample + var sample = new Models.Metadata.Sample { - [Models.Internal.Sample.NameKey] = item.Name, + [Models.Metadata.Sample.NameKey] = item.Name, }; return sample; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.SoftwareList ConvertToInternalModel(SoftwareList item) + private static Models.Metadata.SoftwareList ConvertToInternalModel(SoftwareList item) { - var softwareList = new Models.Internal.SoftwareList + var softwareList = new Models.Metadata.SoftwareList { - [Models.Internal.SoftwareList.TagKey] = item.Tag, - [Models.Internal.SoftwareList.NameKey] = item.Name, - [Models.Internal.SoftwareList.StatusKey] = item.Status, - [Models.Internal.SoftwareList.FilterKey] = item.Filter, + [Models.Metadata.SoftwareList.TagKey] = item.Tag, + [Models.Metadata.SoftwareList.NameKey] = item.Name, + [Models.Metadata.SoftwareList.StatusKey] = item.Status, + [Models.Metadata.SoftwareList.FilterKey] = item.Filter, }; return softwareList; } diff --git a/SabreTools.Serialization/OfflineList.Deserializer.cs b/SabreTools.Serialization/OfflineList.Deserializer.cs index 69b19093..29a3e899 100644 --- a/SabreTools.Serialization/OfflineList.Deserializer.cs +++ b/SabreTools.Serialization/OfflineList.Deserializer.cs @@ -11,17 +11,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Dat? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static Dat? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var dat = header != null ? ConvertHeaderFromInternalModel(header) : new Dat(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { dat.Games = new Games @@ -37,48 +37,48 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Dat ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static Dat ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var dat = new Dat { - NoNamespaceSchemaLocation = item.ReadString(Models.Internal.Header.SchemaLocationKey), + NoNamespaceSchemaLocation = item.ReadString(Models.Metadata.Header.SchemaLocationKey), }; - if (item.ContainsKey(Models.Internal.Header.NameKey) - || item.ContainsKey(Models.Internal.Header.ImFolderKey) - || item.ContainsKey(Models.Internal.Header.DatVersionKey) - || item.ContainsKey(Models.Internal.Header.SystemKey) - || item.ContainsKey(Models.Internal.Header.ScreenshotsWidthKey) - || item.ContainsKey(Models.Internal.Header.ScreenshotsHeightKey) - || item.ContainsKey(Models.Internal.Header.InfosKey) - || item.ContainsKey(Models.Internal.Header.CanOpenKey) - || item.ContainsKey(Models.Internal.Header.NewDatKey) - || item.ContainsKey(Models.Internal.Header.SearchKey) - || item.ContainsKey(Models.Internal.Header.RomTitleKey)) + if (item.ContainsKey(Models.Metadata.Header.NameKey) + || item.ContainsKey(Models.Metadata.Header.ImFolderKey) + || item.ContainsKey(Models.Metadata.Header.DatVersionKey) + || item.ContainsKey(Models.Metadata.Header.SystemKey) + || item.ContainsKey(Models.Metadata.Header.ScreenshotsWidthKey) + || item.ContainsKey(Models.Metadata.Header.ScreenshotsHeightKey) + || item.ContainsKey(Models.Metadata.Header.InfosKey) + || item.ContainsKey(Models.Metadata.Header.CanOpenKey) + || item.ContainsKey(Models.Metadata.Header.NewDatKey) + || item.ContainsKey(Models.Metadata.Header.SearchKey) + || item.ContainsKey(Models.Metadata.Header.RomTitleKey)) { dat.Configuration = new Configuration { - DatName = item.ReadString(Models.Internal.Header.NameKey), - ImFolder = item.ReadString(Models.Internal.Header.ImFolderKey), - DatVersion = item.ReadString(Models.Internal.Header.DatVersionKey), - System = item.ReadString(Models.Internal.Header.SystemKey), - ScreenshotsWidth = item.ReadString(Models.Internal.Header.ScreenshotsWidthKey), - ScreenshotsHeight = item.ReadString(Models.Internal.Header.ScreenshotsHeightKey), - Infos = item.Read(Models.Internal.Header.InfosKey), - CanOpen = item.Read(Models.Internal.Header.CanOpenKey), - NewDat = item.Read(Models.Internal.Header.NewDatKey), - Search = item.Read(Models.Internal.Header.SearchKey), - RomTitle = item.ReadString(Models.Internal.Header.RomTitleKey), + DatName = item.ReadString(Models.Metadata.Header.NameKey), + ImFolder = item.ReadString(Models.Metadata.Header.ImFolderKey), + DatVersion = item.ReadString(Models.Metadata.Header.DatVersionKey), + System = item.ReadString(Models.Metadata.Header.SystemKey), + ScreenshotsWidth = item.ReadString(Models.Metadata.Header.ScreenshotsWidthKey), + ScreenshotsHeight = item.ReadString(Models.Metadata.Header.ScreenshotsHeightKey), + Infos = item.Read(Models.Metadata.Header.InfosKey), + CanOpen = item.Read(Models.Metadata.Header.CanOpenKey), + NewDat = item.Read(Models.Metadata.Header.NewDatKey), + Search = item.Read(Models.Metadata.Header.SearchKey), + RomTitle = item.ReadString(Models.Metadata.Header.RomTitleKey), }; } - if (item.ContainsKey(Models.Internal.Header.ImagesKey)) + if (item.ContainsKey(Models.Metadata.Header.ImagesKey)) { dat.GUI = new GUI { - Images = item.Read(Models.Internal.Header.ImagesKey), + Images = item.Read(Models.Metadata.Header.ImagesKey), }; } @@ -86,31 +86,31 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Game ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Game ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var game = new Game { - ImageNumber = item.ReadString(Models.Internal.Machine.ImageNumberKey), - ReleaseNumber = item.ReadString(Models.Internal.Machine.ReleaseNumberKey), - Title = item.ReadString(Models.Internal.Machine.NameKey), - SaveType = item.ReadString(Models.Internal.Machine.SaveTypeKey), - Publisher = item.ReadString(Models.Internal.Machine.PublisherKey), - Location = item.ReadString(Models.Internal.Machine.LocationKey), - SourceRom = item.ReadString(Models.Internal.Machine.SourceRomKey), - Language = item.ReadString(Models.Internal.Machine.LanguageKey), - Im1CRC = item.ReadString(Models.Internal.Machine.Im1CRCKey), - Im2CRC = item.ReadString(Models.Internal.Machine.Im2CRCKey), - Comment = item.ReadString(Models.Internal.Machine.CommentKey), - DuplicateID = item.ReadString(Models.Internal.Machine.DuplicateIDKey), + ImageNumber = item.ReadString(Models.Metadata.Machine.ImageNumberKey), + ReleaseNumber = item.ReadString(Models.Metadata.Machine.ReleaseNumberKey), + Title = item.ReadString(Models.Metadata.Machine.NameKey), + SaveType = item.ReadString(Models.Metadata.Machine.SaveTypeKey), + Publisher = item.ReadString(Models.Metadata.Machine.PublisherKey), + Location = item.ReadString(Models.Metadata.Machine.LocationKey), + SourceRom = item.ReadString(Models.Metadata.Machine.SourceRomKey), + Language = item.ReadString(Models.Metadata.Machine.LanguageKey), + Im1CRC = item.ReadString(Models.Metadata.Machine.Im1CRCKey), + Im2CRC = item.ReadString(Models.Metadata.Machine.Im2CRCKey), + Comment = item.ReadString(Models.Metadata.Machine.CommentKey), + DuplicateID = item.ReadString(Models.Metadata.Machine.DuplicateIDKey), }; - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { game.RomSize = roms - .Select(rom => rom.ReadString(Models.Internal.Rom.SizeKey)) + .Select(rom => rom.ReadString(Models.Metadata.Rom.SizeKey)) .FirstOrDefault(s => s != null); var romCRCs = roms @@ -125,14 +125,14 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static FileRomCRC ConvertFromInternalModel(Models.Internal.Rom item) + private static FileRomCRC ConvertFromInternalModel(Models.Metadata.Rom item) { var fileRomCRC = new FileRomCRC { - Extension = item.ReadString(Models.Internal.Rom.ExtensionKey), - Content = item.ReadString(Models.Internal.Rom.CRCKey), + Extension = item.ReadString(Models.Metadata.Rom.ExtensionKey), + Content = item.ReadString(Models.Metadata.Rom.CRCKey), }; return fileRomCRC; } diff --git a/SabreTools.Serialization/OfflineList.Serializer.cs b/SabreTools.Serialization/OfflineList.Serializer.cs index 9e909c7f..e992b514 100644 --- a/SabreTools.Serialization/OfflineList.Serializer.cs +++ b/SabreTools.Serialization/OfflineList.Serializer.cs @@ -11,21 +11,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(Dat? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(Dat? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Games?.Game != null && item.Games.Game.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Games.Game + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Games.Game .Where(g => g != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -35,67 +35,67 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(Dat item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(Dat item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.SchemaLocationKey] = item.NoNamespaceSchemaLocation, + [Models.Metadata.Header.SchemaLocationKey] = item.NoNamespaceSchemaLocation, }; if (item.Configuration != null) { - header[Models.Internal.Header.NameKey] = item.Configuration.DatName; - header[Models.Internal.Header.ImFolderKey] = item.Configuration.ImFolder; - header[Models.Internal.Header.DatVersionKey] = item.Configuration.DatVersion; - header[Models.Internal.Header.SystemKey] = item.Configuration.System; - header[Models.Internal.Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth; - header[Models.Internal.Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight; - header[Models.Internal.Header.InfosKey] = item.Configuration.Infos; - header[Models.Internal.Header.CanOpenKey] = item.Configuration.CanOpen; - header[Models.Internal.Header.NewDatKey] = item.Configuration.NewDat; - header[Models.Internal.Header.SearchKey] = item.Configuration.Search; - header[Models.Internal.Header.RomTitleKey] = item.Configuration.RomTitle; + header[Models.Metadata.Header.NameKey] = item.Configuration.DatName; + header[Models.Metadata.Header.ImFolderKey] = item.Configuration.ImFolder; + header[Models.Metadata.Header.DatVersionKey] = item.Configuration.DatVersion; + header[Models.Metadata.Header.SystemKey] = item.Configuration.System; + header[Models.Metadata.Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth; + header[Models.Metadata.Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight; + header[Models.Metadata.Header.InfosKey] = item.Configuration.Infos; + header[Models.Metadata.Header.CanOpenKey] = item.Configuration.CanOpen; + header[Models.Metadata.Header.NewDatKey] = item.Configuration.NewDat; + header[Models.Metadata.Header.SearchKey] = item.Configuration.Search; + header[Models.Metadata.Header.RomTitleKey] = item.Configuration.RomTitle; } if (item.GUI != null) { - header[Models.Internal.Header.ImagesKey] = item.GUI.Images; + header[Models.Metadata.Header.ImagesKey] = item.GUI.Images; } return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Game item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Game item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.ImageNumberKey] = item.ImageNumber, - [Models.Internal.Machine.ReleaseNumberKey] = item.ReleaseNumber, - [Models.Internal.Machine.NameKey] = item.Title, - [Models.Internal.Machine.SaveTypeKey] = item.SaveType, - [Models.Internal.Machine.PublisherKey] = item.Publisher, - [Models.Internal.Machine.LocationKey] = item.Location, - [Models.Internal.Machine.SourceRomKey] = item.SourceRom, - [Models.Internal.Machine.LanguageKey] = item.Language, - [Models.Internal.Machine.Im1CRCKey] = item.Im1CRC, - [Models.Internal.Machine.Im2CRCKey] = item.Im2CRC, - [Models.Internal.Machine.CommentKey] = item.Comment, - [Models.Internal.Machine.DuplicateIDKey] = item.DuplicateID, + [Models.Metadata.Machine.ImageNumberKey] = item.ImageNumber, + [Models.Metadata.Machine.ReleaseNumberKey] = item.ReleaseNumber, + [Models.Metadata.Machine.NameKey] = item.Title, + [Models.Metadata.Machine.SaveTypeKey] = item.SaveType, + [Models.Metadata.Machine.PublisherKey] = item.Publisher, + [Models.Metadata.Machine.LocationKey] = item.Location, + [Models.Metadata.Machine.SourceRomKey] = item.SourceRom, + [Models.Metadata.Machine.LanguageKey] = item.Language, + [Models.Metadata.Machine.Im1CRCKey] = item.Im1CRC, + [Models.Metadata.Machine.Im2CRCKey] = item.Im2CRC, + [Models.Metadata.Machine.CommentKey] = item.Comment, + [Models.Metadata.Machine.DuplicateIDKey] = item.DuplicateID, }; if (item.Files?.RomCRC != null && item.Files.RomCRC.Any()) { - machine[Models.Internal.Machine.RomKey] = item.Files.RomCRC + machine[Models.Metadata.Machine.RomKey] = item.Files.RomCRC .Where(r => r != null) .Select(romCRC => { var rom = ConvertToInternalModel(romCRC); - rom[Models.Internal.Rom.SizeKey] = item.RomSize; + rom[Models.Metadata.Rom.SizeKey] = item.RomSize; return rom; }) .ToArray(); @@ -105,14 +105,14 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(FileRomCRC item) + private static Models.Metadata.Rom ConvertToInternalModel(FileRomCRC item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.ExtensionKey] = item.Extension, - [Models.Internal.Rom.CRCKey] = item.Content, + [Models.Metadata.Rom.ExtensionKey] = item.Extension, + [Models.Metadata.Rom.CRCKey] = item.Content, }; return rom; } diff --git a/SabreTools.Serialization/OpenMSX.Deserializer.cs b/SabreTools.Serialization/OpenMSX.Deserializer.cs index 1baff448..af3cba9f 100644 --- a/SabreTools.Serialization/OpenMSX.Deserializer.cs +++ b/SabreTools.Serialization/OpenMSX.Deserializer.cs @@ -11,17 +11,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static SoftwareDb? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static SoftwareDb? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var softwareDb = header != null ? ConvertHeaderFromInternalModel(header) : new SoftwareDb(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { softwareDb.Software = machines @@ -34,33 +34,33 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static SoftwareDb ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static SoftwareDb ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var softwareDb = new SoftwareDb { - Timestamp = item.ReadString(Models.Internal.Header.TimestampKey), + Timestamp = item.ReadString(Models.Metadata.Header.TimestampKey), }; return softwareDb; } /// - /// Convert from to + /// Convert from to /// - private static Software ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Software ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var game = new Software { - Title = item.ReadString(Models.Internal.Machine.NameKey), - GenMSXID = item.ReadString(Models.Internal.Machine.GenMSXIDKey), - System = item.ReadString(Models.Internal.Machine.SystemKey), - Company = item.ReadString(Models.Internal.Machine.CompanyKey), - Year = item.ReadString(Models.Internal.Machine.YearKey), - Country = item.ReadString(Models.Internal.Machine.CountryKey), + Title = item.ReadString(Models.Metadata.Machine.NameKey), + GenMSXID = item.ReadString(Models.Metadata.Machine.GenMSXIDKey), + System = item.ReadString(Models.Metadata.Machine.SystemKey), + Company = item.ReadString(Models.Metadata.Machine.CompanyKey), + Year = item.ReadString(Models.Metadata.Machine.YearKey), + Country = item.ReadString(Models.Metadata.Machine.CountryKey), }; - var dumps = item.Read(Models.Internal.Machine.DumpKey); + var dumps = item.Read(Models.Metadata.Machine.DumpKey); if (dumps != null && dumps.Any()) { game.Dump = dumps @@ -73,25 +73,25 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Dump ConvertFromInternalModel(Models.Internal.Dump item) + private static Dump ConvertFromInternalModel(Models.Metadata.Dump item) { var dump = new Dump(); - var original = item.Read(Models.Internal.Dump.OriginalKey); + var original = item.Read(Models.Metadata.Dump.OriginalKey); if (original != null) dump.Original = ConvertFromInternalModel(original); - var rom = item.Read(Models.Internal.Dump.RomKey); + var rom = item.Read(Models.Metadata.Dump.RomKey); if (rom != null) dump.Rom = ConvertRomFromInternalModel(rom); - var megaRom = item.Read(Models.Internal.Dump.MegaRomKey); + var megaRom = item.Read(Models.Metadata.Dump.MegaRomKey); if (megaRom != null) dump.Rom = ConvertMegaRomFromInternalModel(megaRom); - var sccPlusCart = item.Read(Models.Internal.Dump.SCCPlusCartKey); + var sccPlusCart = item.Read(Models.Metadata.Dump.SCCPlusCartKey); if (sccPlusCart != null) dump.Rom = ConvertSCCPlusCartFromInternalModel(sccPlusCart); @@ -99,59 +99,59 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static MegaRom ConvertMegaRomFromInternalModel(Models.Internal.Rom item) + private static MegaRom ConvertMegaRomFromInternalModel(Models.Metadata.Rom item) { var megaRom = new MegaRom { - Start = item.ReadString(Models.Internal.Rom.StartKey), - Type = item.ReadString(Models.Internal.Rom.TypeKey), - Hash = item.ReadString(Models.Internal.Rom.SHA1Key), - Remark = item.ReadString(Models.Internal.Rom.RemarkKey), + Start = item.ReadString(Models.Metadata.Rom.StartKey), + Type = item.ReadString(Models.Metadata.Rom.TypeKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA1Key), + Remark = item.ReadString(Models.Metadata.Rom.RemarkKey), }; return megaRom; } /// - /// Convert from to + /// Convert from to /// - private static Original ConvertFromInternalModel(Models.Internal.Original item) + private static Original ConvertFromInternalModel(Models.Metadata.Original item) { var original = new Original { - Value = item.ReadString(Models.Internal.Original.ValueKey), - Content = item.ReadString(Models.Internal.Original.ContentKey), + Value = item.ReadString(Models.Metadata.Original.ValueKey), + Content = item.ReadString(Models.Metadata.Original.ContentKey), }; return original; } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertRomFromInternalModel(Models.Internal.Rom item) + private static Rom ConvertRomFromInternalModel(Models.Metadata.Rom item) { var rom = new Rom { - Start = item.ReadString(Models.Internal.Rom.StartKey), - Type = item.ReadString(Models.Internal.Rom.TypeKey), - Hash = item.ReadString(Models.Internal.Rom.SHA1Key), - Remark = item.ReadString(Models.Internal.Rom.RemarkKey), + Start = item.ReadString(Models.Metadata.Rom.StartKey), + Type = item.ReadString(Models.Metadata.Rom.TypeKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA1Key), + Remark = item.ReadString(Models.Metadata.Rom.RemarkKey), }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static SCCPlusCart ConvertSCCPlusCartFromInternalModel(Models.Internal.Rom item) + private static SCCPlusCart ConvertSCCPlusCartFromInternalModel(Models.Metadata.Rom item) { var sccPlusCart = new SCCPlusCart { - Start = item.ReadString(Models.Internal.Rom.StartKey), - Type = item.ReadString(Models.Internal.Rom.TypeKey), - Hash = item.ReadString(Models.Internal.Rom.SHA1Key), - Remark = item.ReadString(Models.Internal.Rom.RemarkKey), + Start = item.ReadString(Models.Metadata.Rom.StartKey), + Type = item.ReadString(Models.Metadata.Rom.TypeKey), + Hash = item.ReadString(Models.Metadata.Rom.SHA1Key), + Remark = item.ReadString(Models.Metadata.Rom.RemarkKey), }; return sccPlusCart; } diff --git a/SabreTools.Serialization/OpenMSX.Serializer.cs b/SabreTools.Serialization/OpenMSX.Serializer.cs index 9ba248dd..a1cd36b6 100644 --- a/SabreTools.Serialization/OpenMSX.Serializer.cs +++ b/SabreTools.Serialization/OpenMSX.Serializer.cs @@ -20,21 +20,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(SoftwareDb? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(SoftwareDb? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Software != null && item.Software.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Software + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Software .Where(s => s != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -44,35 +44,35 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.Header ConvertHeaderToInternalModel(SoftwareDb item) + public static Models.Metadata.Header ConvertHeaderToInternalModel(SoftwareDb item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.TimestampKey] = item.Timestamp, + [Models.Metadata.Header.TimestampKey] = item.Timestamp, }; return header; } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.Machine ConvertMachineToInternalModel(Software item) + public static Models.Metadata.Machine ConvertMachineToInternalModel(Software item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Title, - [Models.Internal.Machine.GenMSXIDKey] = item.GenMSXID, - [Models.Internal.Machine.SystemKey] = item.System, - [Models.Internal.Machine.CompanyKey] = item.Company, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.CountryKey] = item.Country, + [Models.Metadata.Machine.NameKey] = item.Title, + [Models.Metadata.Machine.GenMSXIDKey] = item.GenMSXID, + [Models.Metadata.Machine.SystemKey] = item.System, + [Models.Metadata.Machine.CompanyKey] = item.Company, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.CountryKey] = item.Country, }; if (item.Dump != null && item.Dump.Any()) { - machine[Models.Internal.Machine.DumpKey] = item.Dump + machine[Models.Metadata.Machine.DumpKey] = item.Dump .Where(d => d != null) .Select(ConvertToInternalModel) .ToArray(); @@ -82,29 +82,29 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.Dump ConvertToInternalModel(Dump item) + public static Models.Metadata.Dump ConvertToInternalModel(Dump item) { - var dump = new Models.Internal.Dump(); + var dump = new Models.Metadata.Dump(); if (item.Original != null) - dump[Models.Internal.Dump.OriginalKey] = ConvertToInternalModel(item.Original); + dump[Models.Metadata.Dump.OriginalKey] = ConvertToInternalModel(item.Original); if (item.Rom != null) { switch (item.Rom) { case Rom rom: - dump[Models.Internal.Dump.RomKey] = ConvertToInternalModel(rom); + dump[Models.Metadata.Dump.RomKey] = ConvertToInternalModel(rom); break; case MegaRom megaRom: - dump[Models.Internal.Dump.MegaRomKey] = ConvertToInternalModel(megaRom); + dump[Models.Metadata.Dump.MegaRomKey] = ConvertToInternalModel(megaRom); break; case SCCPlusCart sccPlusCart: - dump[Models.Internal.Dump.SCCPlusCartKey] = ConvertToInternalModel(sccPlusCart); + dump[Models.Metadata.Dump.SCCPlusCartKey] = ConvertToInternalModel(sccPlusCart); break; } } @@ -113,29 +113,29 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.Original ConvertToInternalModel(Original item) + public static Models.Metadata.Original ConvertToInternalModel(Original item) { - var original = new Models.Internal.Original + var original = new Models.Metadata.Original { - [Models.Internal.Original.ValueKey] = item.Value, - [Models.Internal.Original.ContentKey] = item.Content, + [Models.Metadata.Original.ValueKey] = item.Value, + [Models.Metadata.Original.ContentKey] = item.Content, }; return original; } /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.Rom ConvertToInternalModel(RomBase item) + public static Models.Metadata.Rom ConvertToInternalModel(RomBase item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.StartKey] = item.Start, - [Models.Internal.Rom.TypeKey] = item.Type, - [Models.Internal.Rom.SHA1Key] = item.Hash, - [Models.Internal.Rom.RemarkKey] = item.Remark, + [Models.Metadata.Rom.StartKey] = item.Start, + [Models.Metadata.Rom.TypeKey] = item.Type, + [Models.Metadata.Rom.SHA1Key] = item.Hash, + [Models.Metadata.Rom.RemarkKey] = item.Remark, }; return rom; } diff --git a/SabreTools.Serialization/RomCenter.Deserializer.cs b/SabreTools.Serialization/RomCenter.Deserializer.cs index bdc9ce62..494885a3 100644 --- a/SabreTools.Serialization/RomCenter.Deserializer.cs +++ b/SabreTools.Serialization/RomCenter.Deserializer.cs @@ -232,17 +232,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var metadataFile = header != null ? ConvertHeaderFromInternalModel(header) : new MetadataFile(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Games = new Games @@ -258,52 +258,52 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static MetadataFile ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static MetadataFile ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var metadataFile = new MetadataFile(); - if (item.ContainsKey(Models.Internal.Header.AuthorKey) - || item.ContainsKey(Models.Internal.Header.VersionKey) - || item.ContainsKey(Models.Internal.Header.EmailKey) - || item.ContainsKey(Models.Internal.Header.HomepageKey) - || item.ContainsKey(Models.Internal.Header.UrlKey) - || item.ContainsKey(Models.Internal.Header.DateKey) - || item.ContainsKey(Models.Internal.Header.CommentKey)) + if (item.ContainsKey(Models.Metadata.Header.AuthorKey) + || item.ContainsKey(Models.Metadata.Header.VersionKey) + || item.ContainsKey(Models.Metadata.Header.EmailKey) + || item.ContainsKey(Models.Metadata.Header.HomepageKey) + || item.ContainsKey(Models.Metadata.Header.UrlKey) + || item.ContainsKey(Models.Metadata.Header.DateKey) + || item.ContainsKey(Models.Metadata.Header.CommentKey)) { metadataFile.Credits = new Credits { - Author = item.ReadString(Models.Internal.Header.AuthorKey), - Version = item.ReadString(Models.Internal.Header.VersionKey), - Email = item.ReadString(Models.Internal.Header.EmailKey), - Homepage = item.ReadString(Models.Internal.Header.HomepageKey), - Url = item.ReadString(Models.Internal.Header.UrlKey), - Date = item.ReadString(Models.Internal.Header.DateKey), - Comment = item.ReadString(Models.Internal.Header.CommentKey), + Author = item.ReadString(Models.Metadata.Header.AuthorKey), + Version = item.ReadString(Models.Metadata.Header.VersionKey), + Email = item.ReadString(Models.Metadata.Header.EmailKey), + Homepage = item.ReadString(Models.Metadata.Header.HomepageKey), + Url = item.ReadString(Models.Metadata.Header.UrlKey), + Date = item.ReadString(Models.Metadata.Header.DateKey), + Comment = item.ReadString(Models.Metadata.Header.CommentKey), }; } - if (item.ContainsKey(Models.Internal.Header.DatVersionKey) - || item.ContainsKey(Models.Internal.Header.PluginKey) - || item.ContainsKey(Models.Internal.Header.ForceMergingKey)) + if (item.ContainsKey(Models.Metadata.Header.DatVersionKey) + || item.ContainsKey(Models.Metadata.Header.PluginKey) + || item.ContainsKey(Models.Metadata.Header.ForceMergingKey)) { metadataFile.Dat = new Dat { - Version = item.ReadString(Models.Internal.Header.DatVersionKey), - Plugin = item.ReadString(Models.Internal.Header.PluginKey), - Split = item.ReadString(Models.Internal.Header.ForceMergingKey) == "split" ? "yes" : "no", - Merge = item.ReadString(Models.Internal.Header.ForceMergingKey) == "merge" ? "yes" : "no", + Version = item.ReadString(Models.Metadata.Header.DatVersionKey), + Plugin = item.ReadString(Models.Metadata.Header.PluginKey), + Split = item.ReadString(Models.Metadata.Header.ForceMergingKey) == "split" ? "yes" : "no", + Merge = item.ReadString(Models.Metadata.Header.ForceMergingKey) == "merge" ? "yes" : "no", }; } - if (item.ContainsKey(Models.Internal.Header.RefNameKey) - || item.ContainsKey(Models.Internal.Header.EmulatorVersionKey)) + if (item.ContainsKey(Models.Metadata.Header.RefNameKey) + || item.ContainsKey(Models.Metadata.Header.EmulatorVersionKey)) { metadataFile.Emulator = new Emulator { - RefName = item.ReadString(Models.Internal.Header.RefNameKey), - Version = item.ReadString(Models.Internal.Header.EmulatorVersionKey), + RefName = item.ReadString(Models.Metadata.Header.RefNameKey), + Version = item.ReadString(Models.Metadata.Header.EmulatorVersionKey), }; } @@ -311,11 +311,11 @@ namespace SabreTools.Serialization } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static Rom[] ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Rom[] ConvertMachineFromInternalModel(Models.Metadata.Machine item) { - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms == null) return Array.Empty(); @@ -326,21 +326,21 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertFromInternalModel(Models.Internal.Rom item, Models.Internal.Machine parent) + private static Rom ConvertFromInternalModel(Models.Metadata.Rom item, Models.Metadata.Machine parent) { var row = new Rom { - RomName = item.ReadString(Models.Internal.Rom.NameKey), - RomCRC = item.ReadString(Models.Internal.Rom.CRCKey), - RomSize = item.ReadString(Models.Internal.Rom.SizeKey), - MergeName = item.ReadString(Models.Internal.Rom.MergeKey), + RomName = item.ReadString(Models.Metadata.Rom.NameKey), + RomCRC = item.ReadString(Models.Metadata.Rom.CRCKey), + RomSize = item.ReadString(Models.Metadata.Rom.SizeKey), + MergeName = item.ReadString(Models.Metadata.Rom.MergeKey), - ParentName = parent.ReadString(Models.Internal.Machine.RomOfKey), - //ParentDescription = parent.ReadString(Models.Internal.Machine.ParentDescriptionKey), // This is unmappable - GameName = parent.ReadString(Models.Internal.Machine.NameKey), - GameDescription = parent.ReadString(Models.Internal.Machine.DescriptionKey), + ParentName = parent.ReadString(Models.Metadata.Machine.RomOfKey), + //ParentDescription = parent.ReadString(Models.Metadata.Machine.ParentDescriptionKey), // This is unmappable + GameName = parent.ReadString(Models.Metadata.Machine.NameKey), + GameDescription = parent.ReadString(Models.Metadata.Machine.DescriptionKey), }; return row; } diff --git a/SabreTools.Serialization/RomCenter.Serializer.cs b/SabreTools.Serialization/RomCenter.Serializer.cs index 84796b6e..5412fade 100644 --- a/SabreTools.Serialization/RomCenter.Serializer.cs +++ b/SabreTools.Serialization/RomCenter.Serializer.cs @@ -176,21 +176,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Games?.Rom != null && item.Games.Rom.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Games.Rom + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Games.Rom .Where(r => r != null) .Select(ConvertMachineToInternalModel).ToArray(); } @@ -199,71 +199,71 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(MetadataFile item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(MetadataFile item) { - var header = new Models.Internal.Header(); + var header = new Models.Metadata.Header(); if (item.Credits != null) { - header[Models.Internal.Header.AuthorKey] = item.Credits.Author; - header[Models.Internal.Header.VersionKey] = item.Credits.Version; - header[Models.Internal.Header.EmailKey] = item.Credits.Email; - header[Models.Internal.Header.HomepageKey] = item.Credits.Homepage; - header[Models.Internal.Header.UrlKey] = item.Credits.Url; - header[Models.Internal.Header.DateKey] = item.Credits.Date; - header[Models.Internal.Header.CommentKey] = item.Credits.Comment; + header[Models.Metadata.Header.AuthorKey] = item.Credits.Author; + header[Models.Metadata.Header.VersionKey] = item.Credits.Version; + header[Models.Metadata.Header.EmailKey] = item.Credits.Email; + header[Models.Metadata.Header.HomepageKey] = item.Credits.Homepage; + header[Models.Metadata.Header.UrlKey] = item.Credits.Url; + header[Models.Metadata.Header.DateKey] = item.Credits.Date; + header[Models.Metadata.Header.CommentKey] = item.Credits.Comment; } if (item.Dat != null) { - header[Models.Internal.Header.DatVersionKey] = item.Dat.Version; - header[Models.Internal.Header.PluginKey] = item.Dat.Plugin; + header[Models.Metadata.Header.DatVersionKey] = item.Dat.Version; + header[Models.Metadata.Header.PluginKey] = item.Dat.Plugin; if (item.Dat.Split == "yes" || item.Dat.Split == "1") - header[Models.Internal.Header.ForceMergingKey] = "split"; + header[Models.Metadata.Header.ForceMergingKey] = "split"; else if (item.Dat.Merge == "yes" || item.Dat.Merge == "1") - header[Models.Internal.Header.ForceMergingKey] = "merge"; + header[Models.Metadata.Header.ForceMergingKey] = "merge"; } if (item.Emulator != null) { - header[Models.Internal.Header.RefNameKey] = item.Emulator.RefName; - header[Models.Internal.Header.EmulatorVersionKey] = item.Emulator.Version; + header[Models.Metadata.Header.RefNameKey] = item.Emulator.RefName; + header[Models.Metadata.Header.EmulatorVersionKey] = item.Emulator.Version; } return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Rom item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Rom item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.RomOfKey] = item.ParentName, - //[Models.Internal.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable - [Models.Internal.Machine.NameKey] = item.GameName, - [Models.Internal.Machine.DescriptionKey] = item.GameDescription, - [Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { ConvertToInternalModel(item) }, + [Models.Metadata.Machine.RomOfKey] = item.ParentName, + //[Models.Metadata.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable + [Models.Metadata.Machine.NameKey] = item.GameName, + [Models.Metadata.Machine.DescriptionKey] = item.GameDescription, + [Models.Metadata.Machine.RomKey] = new Models.Metadata.Rom[] { ConvertToInternalModel(item) }, }; return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Rom item) + private static Models.Metadata.Rom ConvertToInternalModel(Rom item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.RomName, - [Models.Internal.Rom.CRCKey] = item.RomCRC, - [Models.Internal.Rom.SizeKey] = item.RomSize, - [Models.Internal.Rom.MergeKey] = item.MergeName, + [Models.Metadata.Rom.NameKey] = item.RomName, + [Models.Metadata.Rom.CRCKey] = item.RomCRC, + [Models.Metadata.Rom.SizeKey] = item.RomSize, + [Models.Metadata.Rom.MergeKey] = item.MergeName, }; return rom; } diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj index cc4f6027..50ec20d9 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.csproj +++ b/SabreTools.Serialization/SabreTools.Serialization.csproj @@ -8,7 +8,10 @@ - + + + + diff --git a/SabreTools.Serialization/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/SeparatedValue.Deserializer.cs index 70e8638f..7a6bfb6b 100644 --- a/SabreTools.Serialization/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization/SeparatedValue.Deserializer.cs @@ -123,17 +123,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static MetadataFile? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static MetadataFile? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var metadataFile = header != null ? ConvertHeaderFromInternalModel(header) : new MetadataFile(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Row = machines @@ -146,25 +146,25 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static MetadataFile ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static MetadataFile ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var metadataFile = new MetadataFile { - Header = item.ReadStringArray(Models.Internal.Header.HeaderKey), + Header = item.ReadStringArray(Models.Metadata.Header.HeaderKey), }; return metadataFile; } /// - /// Convert from to an array of + /// Convert from to an array of /// - private static Row[] ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Row[] ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var rowItems = new List(); - var roms = item.Read(Models.Internal.Machine.RomKey); + var roms = item.Read(Models.Metadata.Machine.RomKey); if (roms != null && roms.Any()) { rowItems.AddRange(roms @@ -172,7 +172,7 @@ namespace SabreTools.Serialization .Select(rom => ConvertFromInternalModel(rom, item))); } - var disks = item.Read(Models.Internal.Machine.DiskKey); + var disks = item.Read(Models.Metadata.Machine.DiskKey); if (disks != null && disks.Any()) { rowItems.AddRange(disks @@ -180,7 +180,7 @@ namespace SabreTools.Serialization .Select(disk => ConvertFromInternalModel(disk, item))); } - var media = item.Read(Models.Internal.Machine.MediaKey); + var media = item.Read(Models.Metadata.Machine.MediaKey); if (media != null && media.Any()) { rowItems.AddRange(media @@ -192,62 +192,62 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Disk item, Models.Internal.Machine parent) + private static Row ConvertFromInternalModel(Models.Metadata.Disk item, Models.Metadata.Machine parent) { var row = new Row { - GameName = parent.ReadString(Models.Internal.Machine.NameKey), - Description = parent.ReadString(Models.Internal.Machine.DescriptionKey), + GameName = parent.ReadString(Models.Metadata.Machine.NameKey), + Description = parent.ReadString(Models.Metadata.Machine.DescriptionKey), Type = "disk", - DiskName = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), - Status = item.ReadString(Models.Internal.Disk.StatusKey), + DiskName = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), + Status = item.ReadString(Models.Metadata.Disk.StatusKey), }; return row; } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Media item, Models.Internal.Machine parent) + private static Row ConvertFromInternalModel(Models.Metadata.Media item, Models.Metadata.Machine parent) { var row = new Row { - GameName = parent.ReadString(Models.Internal.Machine.NameKey), - Description = parent.ReadString(Models.Internal.Machine.DescriptionKey), + GameName = parent.ReadString(Models.Metadata.Machine.NameKey), + Description = parent.ReadString(Models.Metadata.Machine.DescriptionKey), Type = "media", - DiskName = item.ReadString(Models.Internal.Media.NameKey), - MD5 = item.ReadString(Models.Internal.Media.MD5Key), - SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), - SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), + DiskName = item.ReadString(Models.Metadata.Media.NameKey), + MD5 = item.ReadString(Models.Metadata.Media.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Media.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Media.SHA256Key), + SpamSum = item.ReadString(Models.Metadata.Media.SpamSumKey), }; return row; } /// - /// Convert from to + /// Convert from to /// - private static Row ConvertFromInternalModel(Models.Internal.Rom item, Models.Internal.Machine parent) + private static Row ConvertFromInternalModel(Models.Metadata.Rom item, Models.Metadata.Machine parent) { var row = new Row { - GameName = parent?.ReadString(Models.Internal.Machine.NameKey), - Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey), + GameName = parent?.ReadString(Models.Metadata.Machine.NameKey), + Description = parent?.ReadString(Models.Metadata.Machine.DescriptionKey), Type = "rom", - RomName = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - MD5 = item.ReadString(Models.Internal.Rom.MD5Key), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), - SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), - SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), - SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), - Status = item.ReadString(Models.Internal.Rom.StatusKey), + RomName = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + MD5 = item.ReadString(Models.Metadata.Rom.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + SHA256 = item.ReadString(Models.Metadata.Rom.SHA256Key), + SHA384 = item.ReadString(Models.Metadata.Rom.SHA384Key), + SHA512 = item.ReadString(Models.Metadata.Rom.SHA512Key), + SpamSum = item.ReadString(Models.Metadata.Rom.SpamSumKey), + Status = item.ReadString(Models.Metadata.Rom.StatusKey), }; return row; } diff --git a/SabreTools.Serialization/SeparatedValue.Serializer.cs b/SabreTools.Serialization/SeparatedValue.Serializer.cs index 93e47d1f..a00de404 100644 --- a/SabreTools.Serialization/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization/SeparatedValue.Serializer.cs @@ -131,69 +131,69 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(MetadataFile? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(MetadataFile? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Row != null && item.Row.Any()) - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Row.Select(ConvertMachineToInternalModel).ToArray(); + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Row.Select(ConvertMachineToInternalModel).ToArray(); return metadataFile; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(MetadataFile item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(MetadataFile item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.HeaderKey] = item.Header, + [Models.Metadata.Header.HeaderKey] = item.Header, }; if (item.Row != null && item.Row.Any()) { var first = item.Row[0]; - //header[Models.Internal.Header.FileNameKey] = first.FileName; // Not possible to map - header[Models.Internal.Header.NameKey] = first.FileName; - header[Models.Internal.Header.DescriptionKey] = first.Description; + //header[Models.Metadata.Header.FileNameKey] = first.FileName; // Not possible to map + header[Models.Metadata.Header.NameKey] = first.FileName; + header[Models.Metadata.Header.DescriptionKey] = first.Description; } return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Row item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Row item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.GameName, - [Models.Internal.Machine.DescriptionKey] = item.GameDescription, + [Models.Metadata.Machine.NameKey] = item.GameName, + [Models.Metadata.Machine.DescriptionKey] = item.GameDescription, }; var datItem = ConvertToInternalModel(item); switch (datItem) { - case Models.Internal.Disk disk: - machine[Models.Internal.Machine.DiskKey] = new Models.Internal.Disk[] { disk }; + case Models.Metadata.Disk disk: + machine[Models.Metadata.Machine.DiskKey] = new Models.Metadata.Disk[] { disk }; break; - case Models.Internal.Media media: - machine[Models.Internal.Machine.MediaKey] = new Models.Internal.Media[] { media }; + case Models.Metadata.Media media: + machine[Models.Metadata.Machine.MediaKey] = new Models.Metadata.Media[] { media }; break; - case Models.Internal.Rom rom: - machine[Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { rom }; + case Models.Metadata.Rom rom: + machine[Models.Metadata.Machine.RomKey] = new Models.Metadata.Rom[] { rom }; break; } @@ -201,39 +201,39 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DatItem? ConvertToInternalModel(Row item) + private static Models.Metadata.DatItem? ConvertToInternalModel(Row item) { return item.Type switch { - "disk" => new Models.Internal.Disk + "disk" => new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.DiskName, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, - [Models.Internal.Disk.StatusKey] = item.Status, + [Models.Metadata.Disk.NameKey] = item.DiskName, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.StatusKey] = item.Status, }, - "media" => new Models.Internal.Media + "media" => new Models.Metadata.Media { - [Models.Internal.Media.NameKey] = item.DiskName, - [Models.Internal.Media.MD5Key] = item.MD5, - [Models.Internal.Media.SHA1Key] = item.SHA1, - [Models.Internal.Media.SHA256Key] = item.SHA256, - [Models.Internal.Media.SpamSumKey] = item.SpamSum, + [Models.Metadata.Media.NameKey] = item.DiskName, + [Models.Metadata.Media.MD5Key] = item.MD5, + [Models.Metadata.Media.SHA1Key] = item.SHA1, + [Models.Metadata.Media.SHA256Key] = item.SHA256, + [Models.Metadata.Media.SpamSumKey] = item.SpamSum, }, - "rom" => new Models.Internal.Rom + "rom" => new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.RomName, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.MD5Key] = item.MD5, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.SHA256Key] = item.SHA256, - [Models.Internal.Rom.SHA384Key] = item.SHA384, - [Models.Internal.Rom.SHA512Key] = item.SHA512, - [Models.Internal.Rom.SpamSumKey] = item.SpamSum, - [Models.Internal.Rom.StatusKey] = item.Status, + [Models.Metadata.Rom.NameKey] = item.RomName, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.MD5Key] = item.MD5, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.SHA256Key] = item.SHA256, + [Models.Metadata.Rom.SHA384Key] = item.SHA384, + [Models.Metadata.Rom.SHA512Key] = item.SHA512, + [Models.Metadata.Rom.SpamSumKey] = item.SpamSum, + [Models.Metadata.Rom.StatusKey] = item.Status, }, _ => null, }; diff --git a/SabreTools.Serialization/SoftwareList.Deserializer.cs b/SabreTools.Serialization/SoftwareList.Deserializer.cs index b7490308..44c8cef9 100644 --- a/SabreTools.Serialization/SoftwareList.Deserializer.cs +++ b/SabreTools.Serialization/SoftwareList.Deserializer.cs @@ -11,17 +11,17 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static SoftwareList? ConvertFromInternalModel(Models.Internal.MetadataFile? item) + public static SoftwareList? ConvertFromInternalModel(Models.Metadata.MetadataFile? item) { if (item == null) return null; - var header = item.Read(Models.Internal.MetadataFile.HeaderKey); + var header = item.Read(Models.Metadata.MetadataFile.HeaderKey); var metadataFile = header != null ? ConvertHeaderFromInternalModel(header) : new SoftwareList(); - var machines = item.Read(Models.Internal.MetadataFile.MachineKey); + var machines = item.Read(Models.Metadata.MetadataFile.MachineKey); if (machines != null && machines.Any()) { metadataFile.Software = machines @@ -34,36 +34,36 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static SoftwareList ConvertHeaderFromInternalModel(Models.Internal.Header item) + private static SoftwareList ConvertHeaderFromInternalModel(Models.Metadata.Header item) { var softwareList = new SoftwareList { - Name = item.ReadString(Models.Internal.Header.NameKey), - Description = item.ReadString(Models.Internal.Header.DescriptionKey), - Notes = item.ReadString(Models.Internal.Header.NotesKey), + Name = item.ReadString(Models.Metadata.Header.NameKey), + Description = item.ReadString(Models.Metadata.Header.DescriptionKey), + Notes = item.ReadString(Models.Metadata.Header.NotesKey), }; return softwareList; } /// - /// Convert from to + /// Convert from to /// - private static Software ConvertMachineFromInternalModel(Models.Internal.Machine item) + private static Software ConvertMachineFromInternalModel(Models.Metadata.Machine item) { var software = new Software { - Name = item.ReadString(Models.Internal.Machine.NameKey), - CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey), - Supported = item.ReadString(Models.Internal.Machine.SupportedKey), - Description = item.ReadString(Models.Internal.Machine.DescriptionKey), - Year = item.ReadString(Models.Internal.Machine.YearKey), - Publisher = item.ReadString(Models.Internal.Machine.PublisherKey), - Notes = item.ReadString(Models.Internal.Machine.NotesKey), + Name = item.ReadString(Models.Metadata.Machine.NameKey), + CloneOf = item.ReadString(Models.Metadata.Machine.CloneOfKey), + Supported = item.ReadString(Models.Metadata.Machine.SupportedKey), + Description = item.ReadString(Models.Metadata.Machine.DescriptionKey), + Year = item.ReadString(Models.Metadata.Machine.YearKey), + Publisher = item.ReadString(Models.Metadata.Machine.PublisherKey), + Notes = item.ReadString(Models.Metadata.Machine.NotesKey), }; - var infos = item.Read(Models.Internal.Machine.InfoKey); + var infos = item.Read(Models.Metadata.Machine.InfoKey); if (infos != null && infos.Any()) { software.Info = infos @@ -72,7 +72,7 @@ namespace SabreTools.Serialization .ToArray(); } - var sharedFeats = item.Read(Models.Internal.Machine.SharedFeatKey); + var sharedFeats = item.Read(Models.Metadata.Machine.SharedFeatKey); if (sharedFeats != null && sharedFeats.Any()) { software.SharedFeat = sharedFeats @@ -81,7 +81,7 @@ namespace SabreTools.Serialization .ToArray(); } - var parts = item.Read(Models.Internal.Machine.PartKey); + var parts = item.Read(Models.Metadata.Machine.PartKey); if (parts != null && parts.Any()) { software.Part = parts @@ -94,19 +94,19 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static DataArea ConvertFromInternalModel(Models.Internal.DataArea item) + private static DataArea ConvertFromInternalModel(Models.Metadata.DataArea item) { var dataArea = new DataArea { - Name = item.ReadString(Models.Internal.DataArea.NameKey), - Size = item.ReadString(Models.Internal.DataArea.SizeKey), - Width = item.ReadString(Models.Internal.DataArea.WidthKey), - Endianness = item.ReadString(Models.Internal.DataArea.EndiannessKey), + Name = item.ReadString(Models.Metadata.DataArea.NameKey), + Size = item.ReadString(Models.Metadata.DataArea.SizeKey), + Width = item.ReadString(Models.Metadata.DataArea.WidthKey), + Endianness = item.ReadString(Models.Metadata.DataArea.EndiannessKey), }; - var roms = item.Read(Models.Internal.DataArea.RomKey); + var roms = item.Read(Models.Metadata.DataArea.RomKey); if (roms != null && roms.Any()) { dataArea.Rom = roms @@ -119,18 +119,18 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static DipSwitch ConvertFromInternalModel(Models.Internal.DipSwitch item) + private static DipSwitch ConvertFromInternalModel(Models.Metadata.DipSwitch item) { var dipSwitch = new DipSwitch { - Name = item.ReadString(Models.Internal.DipSwitch.NameKey), - Tag = item.ReadString(Models.Internal.DipSwitch.TagKey), - Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey), + Name = item.ReadString(Models.Metadata.DipSwitch.NameKey), + Tag = item.ReadString(Models.Metadata.DipSwitch.TagKey), + Mask = item.ReadString(Models.Metadata.DipSwitch.MaskKey), }; - var dipValues = item.Read(Models.Internal.DipSwitch.DipValueKey); + var dipValues = item.Read(Models.Metadata.DipSwitch.DipValueKey); if (dipValues != null && dipValues.Any()) { dipSwitch.DipValue = dipValues @@ -143,46 +143,46 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static DipValue ConvertFromInternalModel(Models.Internal.DipValue item) + private static DipValue ConvertFromInternalModel(Models.Metadata.DipValue item) { var dipValue = new DipValue { - Name = item.ReadString(Models.Internal.DipValue.NameKey), - Value = item.ReadString(Models.Internal.DipValue.ValueKey), - Default = item.ReadString(Models.Internal.DipValue.DefaultKey), + Name = item.ReadString(Models.Metadata.DipValue.NameKey), + Value = item.ReadString(Models.Metadata.DipValue.ValueKey), + Default = item.ReadString(Models.Metadata.DipValue.DefaultKey), }; return dipValue; } /// - /// Convert from to + /// Convert from to /// - private static Disk ConvertFromInternalModel(Models.Internal.Disk item) + private static Disk ConvertFromInternalModel(Models.Metadata.Disk item) { var disk = new Disk { - Name = item.ReadString(Models.Internal.Disk.NameKey), - MD5 = item.ReadString(Models.Internal.Disk.MD5Key), - SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), - Status = item.ReadString(Models.Internal.Disk.StatusKey), - Writeable = item.ReadString(Models.Internal.Disk.WritableKey), + Name = item.ReadString(Models.Metadata.Disk.NameKey), + MD5 = item.ReadString(Models.Metadata.Disk.MD5Key), + SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key), + Status = item.ReadString(Models.Metadata.Disk.StatusKey), + Writeable = item.ReadString(Models.Metadata.Disk.WritableKey), }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static DiskArea ConvertFromInternalModel(Models.Internal.DiskArea item) + private static DiskArea ConvertFromInternalModel(Models.Metadata.DiskArea item) { var diskArea = new DiskArea { - Name = item.ReadString(Models.Internal.DiskArea.NameKey), + Name = item.ReadString(Models.Metadata.DiskArea.NameKey), }; - var disks = item.Read(Models.Internal.DiskArea.DiskKey); + var disks = item.Read(Models.Metadata.DiskArea.DiskKey); if (disks != null && disks.Any()) { diskArea.Disk = disks @@ -195,43 +195,43 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Feature ConvertFromInternalModel(Models.Internal.Feature item) + private static Feature ConvertFromInternalModel(Models.Metadata.Feature item) { var feature = new Feature { - Name = item.ReadString(Models.Internal.Feature.NameKey), - Value = item.ReadString(Models.Internal.Feature.ValueKey), + Name = item.ReadString(Models.Metadata.Feature.NameKey), + Value = item.ReadString(Models.Metadata.Feature.ValueKey), }; return feature; } /// - /// Convert from to + /// Convert from to /// - private static Info ConvertFromInternalModel(Models.Internal.Info item) + private static Info ConvertFromInternalModel(Models.Metadata.Info item) { var info = new Info { - Name = item.ReadString(Models.Internal.Info.NameKey), - Value = item.ReadString(Models.Internal.Info.ValueKey), + Name = item.ReadString(Models.Metadata.Info.NameKey), + Value = item.ReadString(Models.Metadata.Info.ValueKey), }; return info; } /// - /// Convert from to + /// Convert from to /// - private static Part ConvertFromInternalModel(Models.Internal.Part item) + private static Part ConvertFromInternalModel(Models.Metadata.Part item) { var part = new Part { - Name = item.ReadString(Models.Internal.Part.NameKey), - Interface = item.ReadString(Models.Internal.Part.InterfaceKey), + Name = item.ReadString(Models.Metadata.Part.NameKey), + Interface = item.ReadString(Models.Metadata.Part.InterfaceKey), }; - var features = item.Read(Models.Internal.Part.FeatureKey); + var features = item.Read(Models.Metadata.Part.FeatureKey); if (features != null && features.Any()) { part.Feature = features @@ -240,7 +240,7 @@ namespace SabreTools.Serialization .ToArray(); } - var dataAreas = item.Read(Models.Internal.Part.DataAreaKey); + var dataAreas = item.Read(Models.Metadata.Part.DataAreaKey); if (dataAreas != null && dataAreas.Any()) { part.DataArea = dataAreas @@ -249,7 +249,7 @@ namespace SabreTools.Serialization .ToArray(); } - var diskAreas = item.Read(Models.Internal.Part.DiskAreaKey); + var diskAreas = item.Read(Models.Metadata.Part.DiskAreaKey); if (diskAreas != null && diskAreas.Any()) { part.DiskArea = diskAreas @@ -258,7 +258,7 @@ namespace SabreTools.Serialization .ToArray(); } - var dipSwitches = item.Read(Models.Internal.Part.DipSwitchKey); + var dipSwitches = item.Read(Models.Metadata.Part.DipSwitchKey); if (dipSwitches != null && dipSwitches.Any()) { part.DipSwitch = dipSwitches @@ -271,34 +271,34 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Rom ConvertFromInternalModel(Models.Internal.Rom item) + private static Rom ConvertFromInternalModel(Models.Metadata.Rom item) { var rom = new Rom { - Name = item.ReadString(Models.Internal.Rom.NameKey), - Size = item.ReadString(Models.Internal.Rom.SizeKey), - Length = item.ReadString(Models.Internal.Rom.LengthKey), - CRC = item.ReadString(Models.Internal.Rom.CRCKey), - SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), - Offset = item.ReadString(Models.Internal.Rom.OffsetKey), - Value = item.ReadString(Models.Internal.Rom.ValueKey), - Status = item.ReadString(Models.Internal.Rom.StatusKey), - LoadFlag = item.ReadString(Models.Internal.Rom.LoadFlagKey), + Name = item.ReadString(Models.Metadata.Rom.NameKey), + Size = item.ReadString(Models.Metadata.Rom.SizeKey), + Length = item.ReadString(Models.Metadata.Rom.LengthKey), + CRC = item.ReadString(Models.Metadata.Rom.CRCKey), + SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key), + Offset = item.ReadString(Models.Metadata.Rom.OffsetKey), + Value = item.ReadString(Models.Metadata.Rom.ValueKey), + Status = item.ReadString(Models.Metadata.Rom.StatusKey), + LoadFlag = item.ReadString(Models.Metadata.Rom.LoadFlagKey), }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static SharedFeat ConvertFromInternalModel(Models.Internal.SharedFeat item) + private static SharedFeat ConvertFromInternalModel(Models.Metadata.SharedFeat item) { var sharedFeat = new SharedFeat { - Name = item.ReadString(Models.Internal.SharedFeat.NameKey), - Value = item.ReadString(Models.Internal.SharedFeat.ValueKey), + Name = item.ReadString(Models.Metadata.SharedFeat.NameKey), + Value = item.ReadString(Models.Metadata.SharedFeat.ValueKey), }; return sharedFeat; } diff --git a/SabreTools.Serialization/SoftwareList.Serializer.cs b/SabreTools.Serialization/SoftwareList.Serializer.cs index e9a44385..8ddddebb 100644 --- a/SabreTools.Serialization/SoftwareList.Serializer.cs +++ b/SabreTools.Serialization/SoftwareList.Serializer.cs @@ -20,21 +20,21 @@ namespace SabreTools.Serialization #region Internal /// - /// Convert from to + /// Convert from to /// - public static Models.Internal.MetadataFile? ConvertToInternalModel(SoftwareList? item) + public static Models.Metadata.MetadataFile? ConvertToInternalModel(SoftwareList? item) { if (item == null) return null; - var metadataFile = new Models.Internal.MetadataFile + var metadataFile = new Models.Metadata.MetadataFile { - [Models.Internal.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), }; if (item?.Software != null && item.Software.Any()) { - metadataFile[Models.Internal.MetadataFile.MachineKey] = item.Software + metadataFile[Models.Metadata.MetadataFile.MachineKey] = item.Software .Where(s => s != null) .Select(ConvertMachineToInternalModel) .ToArray(); @@ -44,211 +44,211 @@ namespace SabreTools.Serialization } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Header ConvertHeaderToInternalModel(SoftwareList item) + private static Models.Metadata.Header ConvertHeaderToInternalModel(SoftwareList item) { - var header = new Models.Internal.Header + var header = new Models.Metadata.Header { - [Models.Internal.Header.NameKey] = item.Name, - [Models.Internal.Header.DescriptionKey] = item.Description, - [Models.Internal.Header.NotesKey] = item.Notes, + [Models.Metadata.Header.NameKey] = item.Name, + [Models.Metadata.Header.DescriptionKey] = item.Description, + [Models.Metadata.Header.NotesKey] = item.Notes, }; return header; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Machine ConvertMachineToInternalModel(Software item) + private static Models.Metadata.Machine ConvertMachineToInternalModel(Software item) { - var machine = new Models.Internal.Machine + var machine = new Models.Metadata.Machine { - [Models.Internal.Machine.NameKey] = item.Name, - [Models.Internal.Machine.CloneOfKey] = item.CloneOf, - [Models.Internal.Machine.SupportedKey] = item.Supported, - [Models.Internal.Machine.DescriptionKey] = item.Description, - [Models.Internal.Machine.YearKey] = item.Year, - [Models.Internal.Machine.PublisherKey] = item.Publisher, - [Models.Internal.Machine.NotesKey] = item.Notes, + [Models.Metadata.Machine.NameKey] = item.Name, + [Models.Metadata.Machine.CloneOfKey] = item.CloneOf, + [Models.Metadata.Machine.SupportedKey] = item.Supported, + [Models.Metadata.Machine.DescriptionKey] = item.Description, + [Models.Metadata.Machine.YearKey] = item.Year, + [Models.Metadata.Machine.PublisherKey] = item.Publisher, + [Models.Metadata.Machine.NotesKey] = item.Notes, }; if (item.Info != null && item.Info.Any()) - machine[Models.Internal.Machine.InfoKey] = item.Info.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.InfoKey] = item.Info.Select(ConvertToInternalModel).ToArray(); if (item.SharedFeat != null && item.SharedFeat.Any()) - machine[Models.Internal.Machine.SharedFeatKey] = item.SharedFeat.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.SharedFeatKey] = item.SharedFeat.Select(ConvertToInternalModel).ToArray(); if (item.Part != null && item.Part.Any()) - machine[Models.Internal.Machine.PartKey] = item.Part.Select(ConvertToInternalModel).ToArray(); + machine[Models.Metadata.Machine.PartKey] = item.Part.Select(ConvertToInternalModel).ToArray(); return machine; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DataArea ConvertToInternalModel(DataArea item) + private static Models.Metadata.DataArea ConvertToInternalModel(DataArea item) { - var dataArea = new Models.Internal.DataArea + var dataArea = new Models.Metadata.DataArea { - [Models.Internal.DataArea.NameKey] = item.Name, - [Models.Internal.DataArea.SizeKey] = item.Size, - [Models.Internal.DataArea.WidthKey] = item.Width, - [Models.Internal.DataArea.EndiannessKey] = item.Endianness, + [Models.Metadata.DataArea.NameKey] = item.Name, + [Models.Metadata.DataArea.SizeKey] = item.Size, + [Models.Metadata.DataArea.WidthKey] = item.Width, + [Models.Metadata.DataArea.EndiannessKey] = item.Endianness, }; if (item.Rom != null && item.Rom.Any()) - dataArea[Models.Internal.DataArea.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray(); + dataArea[Models.Metadata.DataArea.RomKey] = item.Rom.Select(ConvertToInternalModel).ToArray(); return dataArea; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipSwitch ConvertToInternalModel(DipSwitch item) + private static Models.Metadata.DipSwitch ConvertToInternalModel(DipSwitch item) { - var dipSwitch = new Models.Internal.DipSwitch + var dipSwitch = new Models.Metadata.DipSwitch { - [Models.Internal.DipSwitch.NameKey] = item.Name, - [Models.Internal.DipSwitch.TagKey] = item.Tag, - [Models.Internal.DipSwitch.MaskKey] = item.Mask, + [Models.Metadata.DipSwitch.NameKey] = item.Name, + [Models.Metadata.DipSwitch.TagKey] = item.Tag, + [Models.Metadata.DipSwitch.MaskKey] = item.Mask, }; if (item.DipValue != null && item.DipValue.Any()) - dipSwitch[Models.Internal.DipSwitch.DipValueKey] = item.DipValue.Select(ConvertToInternalModel).ToArray(); + dipSwitch[Models.Metadata.DipSwitch.DipValueKey] = item.DipValue.Select(ConvertToInternalModel).ToArray(); return dipSwitch; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DipValue ConvertToInternalModel(DipValue item) + private static Models.Metadata.DipValue ConvertToInternalModel(DipValue item) { - var dipValue = new Models.Internal.DipValue + var dipValue = new Models.Metadata.DipValue { - [Models.Internal.DipValue.NameKey] = item.Name, - [Models.Internal.DipValue.ValueKey] = item.Value, - [Models.Internal.DipValue.DefaultKey] = item.Default, + [Models.Metadata.DipValue.NameKey] = item.Name, + [Models.Metadata.DipValue.ValueKey] = item.Value, + [Models.Metadata.DipValue.DefaultKey] = item.Default, }; return dipValue; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Disk ConvertToInternalModel(Disk item) + private static Models.Metadata.Disk ConvertToInternalModel(Disk item) { - var disk = new Models.Internal.Disk + var disk = new Models.Metadata.Disk { - [Models.Internal.Disk.NameKey] = item.Name, - [Models.Internal.Disk.MD5Key] = item.MD5, - [Models.Internal.Disk.SHA1Key] = item.SHA1, - [Models.Internal.Disk.StatusKey] = item.Status, - [Models.Internal.Disk.WritableKey] = item.Writeable, + [Models.Metadata.Disk.NameKey] = item.Name, + [Models.Metadata.Disk.MD5Key] = item.MD5, + [Models.Metadata.Disk.SHA1Key] = item.SHA1, + [Models.Metadata.Disk.StatusKey] = item.Status, + [Models.Metadata.Disk.WritableKey] = item.Writeable, }; return disk; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.DiskArea ConvertToInternalModel(DiskArea item) + private static Models.Metadata.DiskArea ConvertToInternalModel(DiskArea item) { - var diskArea = new Models.Internal.DiskArea + var diskArea = new Models.Metadata.DiskArea { - [Models.Internal.DiskArea.NameKey] = item.Name, + [Models.Metadata.DiskArea.NameKey] = item.Name, }; if (item.Disk != null && item.Disk.Any()) - diskArea[Models.Internal.DiskArea.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray(); + diskArea[Models.Metadata.DiskArea.DiskKey] = item.Disk.Select(ConvertToInternalModel).ToArray(); return diskArea; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Feature ConvertToInternalModel(Feature item) + private static Models.Metadata.Feature ConvertToInternalModel(Feature item) { - var feature = new Models.Internal.Feature + var feature = new Models.Metadata.Feature { - [Models.Internal.Feature.NameKey] = item.Name, - [Models.Internal.Feature.ValueKey] = item.Value, + [Models.Metadata.Feature.NameKey] = item.Name, + [Models.Metadata.Feature.ValueKey] = item.Value, }; return feature; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Info ConvertToInternalModel(Info item) + private static Models.Metadata.Info ConvertToInternalModel(Info item) { - var info = new Models.Internal.Info + var info = new Models.Metadata.Info { - [Models.Internal.Info.NameKey] = item.Name, - [Models.Internal.Info.ValueKey] = item.Value, + [Models.Metadata.Info.NameKey] = item.Name, + [Models.Metadata.Info.ValueKey] = item.Value, }; return info; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Part ConvertToInternalModel(Part item) + private static Models.Metadata.Part ConvertToInternalModel(Part item) { - var part = new Models.Internal.Part + var part = new Models.Metadata.Part { - [Models.Internal.Part.NameKey] = item.Name, - [Models.Internal.Part.InterfaceKey] = item.Interface, + [Models.Metadata.Part.NameKey] = item.Name, + [Models.Metadata.Part.InterfaceKey] = item.Interface, }; if (item.Feature != null && item.Feature.Any()) - part[Models.Internal.Part.FeatureKey] = item.Feature.Select(ConvertToInternalModel).ToArray(); + part[Models.Metadata.Part.FeatureKey] = item.Feature.Select(ConvertToInternalModel).ToArray(); if (item.DataArea != null && item.DataArea.Any()) - part[Models.Internal.Part.DataAreaKey] = item.DataArea.Select(ConvertToInternalModel).ToArray(); + part[Models.Metadata.Part.DataAreaKey] = item.DataArea.Select(ConvertToInternalModel).ToArray(); if (item.DiskArea != null && item.DiskArea.Any()) - part[Models.Internal.Part.DiskAreaKey] = item.DiskArea.Select(ConvertToInternalModel).ToArray(); + part[Models.Metadata.Part.DiskAreaKey] = item.DiskArea.Select(ConvertToInternalModel).ToArray(); if (item.DipSwitch != null && item.DipSwitch.Any()) - part[Models.Internal.Part.DipSwitchKey] = item.DipSwitch.Select(ConvertToInternalModel).ToArray(); + part[Models.Metadata.Part.DipSwitchKey] = item.DipSwitch.Select(ConvertToInternalModel).ToArray(); return part; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.Rom ConvertToInternalModel(Rom item) + private static Models.Metadata.Rom ConvertToInternalModel(Rom item) { - var rom = new Models.Internal.Rom + var rom = new Models.Metadata.Rom { - [Models.Internal.Rom.NameKey] = item.Name, - [Models.Internal.Rom.SizeKey] = item.Size, - [Models.Internal.Rom.LengthKey] = item.Length, - [Models.Internal.Rom.CRCKey] = item.CRC, - [Models.Internal.Rom.SHA1Key] = item.SHA1, - [Models.Internal.Rom.OffsetKey] = item.Offset, - [Models.Internal.Rom.ValueKey] = item.Value, - [Models.Internal.Rom.StatusKey] = item.Status, - [Models.Internal.Rom.LoadFlagKey] = item.LoadFlag, + [Models.Metadata.Rom.NameKey] = item.Name, + [Models.Metadata.Rom.SizeKey] = item.Size, + [Models.Metadata.Rom.LengthKey] = item.Length, + [Models.Metadata.Rom.CRCKey] = item.CRC, + [Models.Metadata.Rom.SHA1Key] = item.SHA1, + [Models.Metadata.Rom.OffsetKey] = item.Offset, + [Models.Metadata.Rom.ValueKey] = item.Value, + [Models.Metadata.Rom.StatusKey] = item.Status, + [Models.Metadata.Rom.LoadFlagKey] = item.LoadFlag, }; return rom; } /// - /// Convert from to + /// Convert from to /// - private static Models.Internal.SharedFeat ConvertToInternalModel(SharedFeat item) + private static Models.Metadata.SharedFeat ConvertToInternalModel(SharedFeat item) { - var sharedFeat = new Models.Internal.SharedFeat + var sharedFeat = new Models.Metadata.SharedFeat { - [Models.Internal.SharedFeat.NameKey] = item.Name, - [Models.Internal.SharedFeat.ValueKey] = item.Value, + [Models.Metadata.SharedFeat.NameKey] = item.Name, + [Models.Metadata.SharedFeat.ValueKey] = item.Value, }; return sharedFeat; } diff --git a/SabreTools.Test/Filtering/FilteringTests.cs b/SabreTools.Test/Filtering/FilteringTests.cs index a91bb89f..883d207c 100644 --- a/SabreTools.Test/Filtering/FilteringTests.cs +++ b/SabreTools.Test/Filtering/FilteringTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using SabreTools.DatItems; using SabreTools.DatItems.Formats; -using SabreTools.Filtering; using Xunit; namespace SabreTools.Test.Filtering @@ -13,7 +12,7 @@ namespace SabreTools.Test.Filtering public void PassesFiltersDatItemFilterPass() { // Setup filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(new List { "item.name:foo" }); // Setup DatItem @@ -28,7 +27,7 @@ namespace SabreTools.Test.Filtering public void PassesFiltersDatItemFilterFail() { // Setup filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(new List { "item.name:bar" }); // Setup DatItem @@ -43,7 +42,7 @@ namespace SabreTools.Test.Filtering public void PassesFiltersMachineFilterPass() { // Setup filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(new List { "machine.name:bar" }); // Setup DatItem @@ -58,7 +57,7 @@ namespace SabreTools.Test.Filtering public void PassesFiltersMachineFilterFail() { // Setup filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(new List { "machine.name:foo" }); // Setup DatItem diff --git a/SabreTools.Test/Filtering/PopulationTests.cs b/SabreTools.Test/Filtering/PopulationTests.cs index b9ba9211..721937bc 100644 --- a/SabreTools.Test/Filtering/PopulationTests.cs +++ b/SabreTools.Test/Filtering/PopulationTests.cs @@ -103,7 +103,7 @@ namespace SabreTools.Test.Filtering List filters = null; // Setup the filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(filters); // Check the filters @@ -118,7 +118,7 @@ namespace SabreTools.Test.Filtering List filters = new(); // Setup the filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(filters); // Check the filters @@ -137,7 +137,7 @@ namespace SabreTools.Test.Filtering }; // Setup the filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(filters); // Check the filters @@ -157,7 +157,7 @@ namespace SabreTools.Test.Filtering }; // Setup the filter - var filter = new Filter(); + var filter = new SabreTools.Filtering.Filter(); filter.PopulateFiltersFromList(filters); // Check the filters diff --git a/SabreTools.Test/SabreTools.Test.csproj b/SabreTools.Test/SabreTools.Test.csproj index 63052df6..bd06db69 100644 --- a/SabreTools.Test/SabreTools.Test.csproj +++ b/SabreTools.Test/SabreTools.Test.csproj @@ -13,7 +13,6 @@ - @@ -29,13 +28,14 @@ - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/SabreTools.sln b/SabreTools.sln index b024fb3c..adde32de 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -38,8 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Reports", "Sabre EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Test", "SabreTools.Test\SabreTools.Test.csproj", "{5B4E67D5-F4DA-4750-8FE2-04D08E343791}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Models", "SabreTools.Models\SabreTools.Models.csproj", "{EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", "SabreTools.Serialization\SabreTools.Serialization.csproj", "{E610285C-10E6-4724-B22C-4EADC11789B1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Filter", "SabreTools.Filter\SabreTools.Filter.csproj", "{2A7A27A9-5FB9-4F6D-88F3-67120668A029}" @@ -166,14 +164,6 @@ Global {5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|Any CPU.Build.0 = Release|Any CPU {5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|x64.ActiveCfg = Release|Any CPU {5B4E67D5-F4DA-4750-8FE2-04D08E343791}.Release|x64.Build.0 = Release|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Debug|x64.ActiveCfg = Debug|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Debug|x64.Build.0 = Debug|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Release|Any CPU.Build.0 = Release|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Release|x64.ActiveCfg = Release|Any CPU - {EF2EFD36-B6C4-4555-8604-2DDCA3AD6518}.Release|x64.Build.0 = Release|Any CPU {E610285C-10E6-4724-B22C-4EADC11789B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E610285C-10E6-4724-B22C-4EADC11789B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {E610285C-10E6-4724-B22C-4EADC11789B1}.Debug|x64.ActiveCfg = Debug|Any CPU diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs index 6456f765..f6040571 100644 --- a/SabreTools/Features/BaseFeature.cs +++ b/SabreTools/Features/BaseFeature.cs @@ -1783,7 +1783,7 @@ Some special strings that can be used: /// /// Preconfigured Filter /// - protected Filter Filter { get; set; } + protected Filtering.Filter Filter { get; set; } /// /// Pre-configured DatHeader @@ -2224,9 +2224,9 @@ Some special strings that can be used: /// /// Get Filter from feature list /// - private static Filter GetFilter(Dictionary features) + private static Filtering.Filter GetFilter(Dictionary features) { - Filter filter = new() + Filtering.Filter filter = new() { DatItemFilter = new DatItemFilter(), MachineFilter = new MachineFilter(), diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs index 3308a3da..400ec587 100644 --- a/SabreTools/Features/Batch.cs +++ b/SabreTools/Features/Batch.cs @@ -430,7 +430,7 @@ Reset the internal state: reset();"; filterPerMachine = Arguments[3].AsYesNo(); // Create filter to run filters from - Filter filter = new() + Filtering.Filter filter = new() { MachineFilter = new MachineFilter { HasFilters = true }, DatItemFilter = new DatItemFilter { HasFilters = true },