diff --git a/README.MD b/README.MD index 5bdad96b..b5edf963 100644 --- a/README.MD +++ b/README.MD @@ -8,7 +8,7 @@ Find the link to the Nuget package [here](https://www.nuget.org/packages/SabreTo ## Releases -For the most recent stable build, download the latest release here: [Releases Page](https://github.com/SabreTools/SabreTools.Serialization/releases) +For the most recent stable build, download the latest release where: [Releases Page](https://github.com/SabreTools/SabreTools.Serialization/releases) For the latest WIP build here: [Rolling Release](https://github.com/SabreTools/SabreTools.Serialization/releases/tag/rolling) diff --git a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs index e7c86d78..05672d49 100644 --- a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs +++ b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs @@ -23,9 +23,9 @@ namespace SabreTools.Data.Extensions.Test Rom? actual = self.ConvertToRom(); Assert.NotNull(actual); - Assert.Equal(7, actual.Count); + Assert.Equal(6, actual.Count); Assert.Equal(ItemType.Rom, actual.ItemType); - Assert.Null(actual[Rom.NameKey]); + Assert.Null(actual.Name); Assert.Null(actual[Rom.MergeKey]); Assert.Null(actual[Rom.RegionKey]); Assert.Null(actual[Rom.StatusKey]); @@ -39,7 +39,7 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase? self = new Disk { - [Disk.NameKey] = "XXXXXX", + Name = "XXXXXX", [Disk.MergeKey] = "XXXXXX", [Disk.RegionKey] = "XXXXXX", [Disk.StatusKey] = "XXXXXX", @@ -51,9 +51,9 @@ namespace SabreTools.Data.Extensions.Test Rom? actual = self.ConvertToRom(); Assert.NotNull(actual); - Assert.Equal(7, actual.Count); + Assert.Equal(6, actual.Count); Assert.Equal(ItemType.Rom, actual.ItemType); - Assert.Equal("XXXXXX.chd", actual[Rom.NameKey]); + Assert.Equal("XXXXXX.chd", actual.Name); Assert.Equal("XXXXXX", actual[Rom.MergeKey]); Assert.Equal("XXXXXX", actual[Rom.RegionKey]); Assert.Equal("XXXXXX", actual[Rom.StatusKey]); @@ -69,9 +69,9 @@ namespace SabreTools.Data.Extensions.Test Rom? actual = self.ConvertToRom(); Assert.NotNull(actual); - Assert.Equal(5, actual.Count); + Assert.Equal(4, actual.Count); Assert.Equal(ItemType.Rom, actual.ItemType); - Assert.Null(actual[Rom.NameKey]); + Assert.Null(actual.Name); Assert.Null(actual[Rom.MD5Key]); Assert.Null(actual[Rom.SHA1Key]); Assert.Null(actual[Rom.SHA256Key]); @@ -83,7 +83,7 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase? self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -93,9 +93,9 @@ namespace SabreTools.Data.Extensions.Test Rom? actual = self.ConvertToRom(); Assert.NotNull(actual); - Assert.Equal(5, actual.Count); + Assert.Equal(4, actual.Count); Assert.Equal(ItemType.Rom, actual.ItemType); - Assert.Equal("XXXXXX.aaruf", actual[Rom.NameKey]); + Assert.Equal("XXXXXX.aaruf", actual.Name); Assert.Equal("XXXXXX", actual[Rom.MD5Key]); Assert.Equal("XXXXXX", actual[Rom.SHA1Key]); Assert.Equal("XXXXXX", actual[Rom.SHA256Key]); @@ -1501,7 +1501,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase other = new Disk(); self.FillMissingHashes(other); - Assert.Single(self); + Assert.Empty(self); } [Fact] @@ -1523,7 +1523,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase self = new Media(); DictionaryBase other = new Media(); self.FillMissingHashes(other); - Assert.Single(self); + Assert.Empty(self); } [Fact] @@ -1547,7 +1547,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase self = new Rom(); DictionaryBase other = new Rom(); self.FillMissingHashes(other); - Assert.Single(self); + Assert.Empty(self); } [Fact] diff --git a/SabreTools.Data.Extensions/MetadataExtensions.cs b/SabreTools.Data.Extensions/MetadataExtensions.cs index c46fece7..36d8c2ca 100644 --- a/SabreTools.Data.Extensions/MetadataExtensions.cs +++ b/SabreTools.Data.Extensions/MetadataExtensions.cs @@ -20,46 +20,48 @@ namespace SabreTools.Data.Extensions return self switch { - Machine => self.ReadString(Machine.NameKey), + Header header => header.Name, - Adjuster => self.ReadString(Adjuster.NameKey), + Machine machine => machine.Name, + + Adjuster adjuster => adjuster.Name, Analog => null, - Archive => self.ReadString(Archive.NameKey), - BiosSet => self.ReadString(BiosSet.NameKey), - Chip => self.ReadString(Chip.NameKey), + Archive archive => archive.Name, + BiosSet biosSet => biosSet.Name, + Chip chip => chip.Name, Condition => null, - ConfLocation => self.ReadString(ConfLocation.NameKey), - ConfSetting => self.ReadString(ConfSetting.NameKey), - Configuration => self.ReadString(Configuration.NameKey), + ConfLocation confLocation => confLocation.Name, + ConfSetting confSetting => confSetting.Name, + Configuration configuration => configuration.Name, Control => null, - DataArea => self.ReadString(DataArea.NameKey), + DataArea dataArea => dataArea.Name, Device => null, - DeviceRef => self.ReadString(DeviceRef.NameKey), - DipLocation => self.ReadString(DipLocation.NameKey), - DipSwitch => self.ReadString(DipSwitch.NameKey), - DipValue => self.ReadString(DipValue.NameKey), - Disk => self.ReadString(Disk.NameKey), - DiskArea => self.ReadString(DiskArea.NameKey), + DeviceRef deviceRef => deviceRef.Name, + DipLocation dipLocation => dipLocation.Name, + DipSwitch dipSwitch => dipSwitch.Name, + DipValue dipValue => dipValue.Name, + Disk disk => disk.Name, + DiskArea diskArea => diskArea.Name, Display => null, Driver => null, - Extension => self.ReadString(Extension.NameKey), - Feature => self.ReadString(Feature.NameKey), - Info => self.ReadString(Info.NameKey), + Extension extension => extension.Name, + Feature feature => feature.Name, + Info info => info.Name, Input => null, - Instance => self.ReadString(Instance.NameKey), - Media => self.ReadString(Media.NameKey), - Part => self.ReadString(Part.NameKey), + Instance instance => instance.Name, + Media media => media.Name, + Part part => part.Name, Port => null, - RamOption => self.ReadString(RamOption.NameKey), - Release => self.ReadString(Release.NameKey), + RamOption ramOption => ramOption.Name, + Release release => release.Name, ReleaseDetails => null, - Rom => self.ReadString(Rom.NameKey), - Sample => self.ReadString(Sample.NameKey), + Rom rom => rom.Name, + Sample sample => sample.Name, Serials => null, - SharedFeat => self.ReadString(SharedFeat.NameKey), - Slot => self.ReadString(Slot.NameKey), - SlotOption => self.ReadString(SlotOption.NameKey), - SoftwareList => self.ReadString(SoftwareList.NameKey), + SharedFeat sharedFeat => sharedFeat.Name, + Slot slot => slot.Name, + SlotOption slotOption => slotOption.Name, + SoftwareList softwareList => softwareList.Name, Sound => null, SourceDetails => null, Video => null, @@ -78,46 +80,48 @@ namespace SabreTools.Data.Extensions switch (self) { - case Machine: self[Machine.NameKey] = name; break; + case Header header: header.Name = name; break; - case Adjuster: self[Adjuster.NameKey] = name; break; + case Machine machine: machine.Name = name; break; + + case Adjuster adjuster: adjuster.Name = name; break; case Analog: break; - case Archive: self[Archive.NameKey] = name; break; - case BiosSet: self[BiosSet.NameKey] = name; break; - case Chip: self[Chip.NameKey] = name; break; + case Archive archive: archive.Name = name; break; + case BiosSet biosSet: biosSet.Name = name; break; + case Chip chip: chip.Name = name; break; case Condition: break; - case ConfLocation: self[ConfLocation.NameKey] = name; break; - case ConfSetting: self[ConfSetting.NameKey] = name; break; - case Configuration: self[Configuration.NameKey] = name; break; + case ConfLocation confLocation: confLocation.Name = name; break; + case ConfSetting confSetting: confSetting.Name = name; break; + case Configuration configuration: configuration.Name = name; break; case Control: break; - case DataArea: self[DataArea.NameKey] = name; break; + case DataArea dataArea: dataArea.Name = name; break; case Device: break; - case DeviceRef: self[DeviceRef.NameKey] = name; break; - case DipLocation: self[DipLocation.NameKey] = name; break; - case DipSwitch: self[DipSwitch.NameKey] = name; break; - case DipValue: self[DipValue.NameKey] = name; break; - case Disk: self[Disk.NameKey] = name; break; - case DiskArea: self[DiskArea.NameKey] = name; break; + case DeviceRef deviceRef: deviceRef.Name = name; break; + case DipLocation dipLocation: dipLocation.Name = name; break; + case DipSwitch dipSwitch: dipSwitch.Name = name; break; + case DipValue dipValue: dipValue.Name = name; break; + case Disk disk: disk.Name = name; break; + case DiskArea diskArea: diskArea.Name = name; break; case Display: break; case Driver: break; - case Extension: self[Extension.NameKey] = name; break; - case Feature: self[Feature.NameKey] = name; break; - case Info: self[Info.NameKey] = name; break; + case Extension extension: extension.Name = name; break; + case Feature feature: feature.Name = name; break; + case Info info: info.Name = name; break; case Input: break; - case Instance: self[Instance.NameKey] = name; break; - case Media: self[Media.NameKey] = name; break; - case Part: self[Part.NameKey] = name; break; + case Instance instance: instance.Name = name; break; + case Media media: media.Name = name; break; + case Part part: part.Name = name; break; case Port: break; - case RamOption: self[RamOption.NameKey] = name; break; - case Release: self[Release.NameKey] = name; break; + case RamOption ramOption: ramOption.Name = name; break; + case Release release: release.Name = name; break; case ReleaseDetails: break; - case Rom: self[Rom.NameKey] = name; break; - case Sample: self[Sample.NameKey] = name; break; + case Rom rom: rom.Name = name; break; + case Sample sample: sample.Name = name; break; case Serials: break; - case SharedFeat: self[SharedFeat.NameKey] = name; break; - case Slot: self[Slot.NameKey] = name; break; - case SlotOption: self[SlotOption.NameKey] = name; break; - case SoftwareList: self[SoftwareList.NameKey] = name; break; + case SharedFeat sharedFeat: sharedFeat.Name = name; break; + case Slot slot: slot.Name = name; break; + case SlotOption slotOption: slotOption.Name = name; break; + case SoftwareList softwareList: softwareList.Name = name; break; case Sound: break; case SourceDetails: break; case Video: break; @@ -139,6 +143,9 @@ namespace SabreTools.Data.Extensions if (Activator.CreateInstance(self.GetType()) is not DictionaryBase clone) return null; + // Handle known properties + clone.SetName(self.GetName()); + // Loop through and clone per type foreach (string key in self.Keys) { @@ -196,13 +203,13 @@ namespace SabreTools.Data.Extensions return null; // Append a suffix to the name - string? name = disk.ReadString(Disk.NameKey); + string? name = disk.Name; if (name is not null) name += ".chd"; return new Rom { - [Rom.NameKey] = name, + Name = name, [Rom.MergeKey] = disk.ReadString(Disk.MergeKey), [Rom.RegionKey] = disk.ReadString(Disk.RegionKey), [Rom.StatusKey] = disk.ReadString(Disk.StatusKey), @@ -222,13 +229,13 @@ namespace SabreTools.Data.Extensions return null; // Append a suffix to the name - string? name = media.ReadString(Media.NameKey); + string? name = media.Name; if (name is not null) name += ".aaruf"; return new Rom { - [Rom.NameKey] = name, + Name = name, [Rom.MD5Key] = media.ReadString(Media.MD5Key), [Rom.SHA1Key] = media.ReadString(Media.SHA1Key), [Rom.SHA256Key] = media.ReadString(Media.SHA256Key), diff --git a/SabreTools.Data.Models/Metadata/Adjuster.cs b/SabreTools.Data.Models/Metadata/Adjuster.cs index cc057c04..93a92165 100644 --- a/SabreTools.Data.Models/Metadata/Adjuster.cs +++ b/SabreTools.Data.Models/Metadata/Adjuster.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("adjuster"), XmlRoot("adjuster")] public class Adjuster : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys // Condition diff --git a/SabreTools.Data.Models/Metadata/Archive.cs b/SabreTools.Data.Models/Metadata/Archive.cs index 44d47d00..12280858 100644 --- a/SabreTools.Data.Models/Metadata/Archive.cs +++ b/SabreTools.Data.Models/Metadata/Archive.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("archive"), XmlRoot("archive")] public class Archive : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string, No-Intro DB extension diff --git a/SabreTools.Data.Models/Metadata/BiosSet.cs b/SabreTools.Data.Models/Metadata/BiosSet.cs index df3e3d1f..e5026427 100644 --- a/SabreTools.Data.Models/Metadata/BiosSet.cs +++ b/SabreTools.Data.Models/Metadata/BiosSet.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("biosset"), XmlRoot("biosset")] public class BiosSet : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// bool diff --git a/SabreTools.Data.Models/Metadata/Chip.cs b/SabreTools.Data.Models/Metadata/Chip.cs index 2348bfdd..29717274 100644 --- a/SabreTools.Data.Models/Metadata/Chip.cs +++ b/SabreTools.Data.Models/Metadata/Chip.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("chip"), XmlRoot("chip")] public class Chip : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// long diff --git a/SabreTools.Data.Models/Metadata/ConfLocation.cs b/SabreTools.Data.Models/Metadata/ConfLocation.cs index ada4f513..84f95648 100644 --- a/SabreTools.Data.Models/Metadata/ConfLocation.cs +++ b/SabreTools.Data.Models/Metadata/ConfLocation.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("conflocation"), XmlRoot("conflocation")] public class ConfLocation : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// (yes|no) "no" diff --git a/SabreTools.Data.Models/Metadata/ConfSetting.cs b/SabreTools.Data.Models/Metadata/ConfSetting.cs index a4c7131c..8f61ce32 100644 --- a/SabreTools.Data.Models/Metadata/ConfSetting.cs +++ b/SabreTools.Data.Models/Metadata/ConfSetting.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("confsetting"), XmlRoot("confsetting")] public class ConfSetting : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Condition diff --git a/SabreTools.Data.Models/Metadata/Configuration.cs b/SabreTools.Data.Models/Metadata/Configuration.cs index dd793423..120ba827 100644 --- a/SabreTools.Data.Models/Metadata/Configuration.cs +++ b/SabreTools.Data.Models/Metadata/Configuration.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("configuration"), XmlRoot("configuration")] public class Configuration : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Condition diff --git a/SabreTools.Data.Models/Metadata/DataArea.cs b/SabreTools.Data.Models/Metadata/DataArea.cs index 2d2e4fb4..2ad809ae 100644 --- a/SabreTools.Data.Models/Metadata/DataArea.cs +++ b/SabreTools.Data.Models/Metadata/DataArea.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("dataarea"), XmlRoot("dataarea")] public class DataArea : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// (big|little) "little" diff --git a/SabreTools.Data.Models/Metadata/DeviceRef.cs b/SabreTools.Data.Models/Metadata/DeviceRef.cs index a83e31d8..6da889da 100644 --- a/SabreTools.Data.Models/Metadata/DeviceRef.cs +++ b/SabreTools.Data.Models/Metadata/DeviceRef.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("device_ref"), XmlRoot("device_ref")] public class DeviceRef : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/DipLocation.cs b/SabreTools.Data.Models/Metadata/DipLocation.cs index 4535667b..3a344d33 100644 --- a/SabreTools.Data.Models/Metadata/DipLocation.cs +++ b/SabreTools.Data.Models/Metadata/DipLocation.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("diplocation"), XmlRoot("diplocation")] public class DipLocation : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// (yes|no) "no" diff --git a/SabreTools.Data.Models/Metadata/DipSwitch.cs b/SabreTools.Data.Models/Metadata/DipSwitch.cs index ff5b170c..6538d0a8 100644 --- a/SabreTools.Data.Models/Metadata/DipSwitch.cs +++ b/SabreTools.Data.Models/Metadata/DipSwitch.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("dipswitch"), XmlRoot("dipswitch")] public class DipSwitch : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Condition diff --git a/SabreTools.Data.Models/Metadata/DipValue.cs b/SabreTools.Data.Models/Metadata/DipValue.cs index 53bae423..f4416636 100644 --- a/SabreTools.Data.Models/Metadata/DipValue.cs +++ b/SabreTools.Data.Models/Metadata/DipValue.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("dipvalue"), XmlRoot("dipvalue")] public class DipValue : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Condition diff --git a/SabreTools.Data.Models/Metadata/Disk.cs b/SabreTools.Data.Models/Metadata/Disk.cs index dffda24e..ebb019f8 100644 --- a/SabreTools.Data.Models/Metadata/Disk.cs +++ b/SabreTools.Data.Models/Metadata/Disk.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("disk"), XmlRoot(elementName: "disk")] public class Disk : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/DiskArea.cs b/SabreTools.Data.Models/Metadata/DiskArea.cs index cb91efa3..5cd92483 100644 --- a/SabreTools.Data.Models/Metadata/DiskArea.cs +++ b/SabreTools.Data.Models/Metadata/DiskArea.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("diskarea"), XmlRoot("diskarea")] public class DiskArea : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Disk[] diff --git a/SabreTools.Data.Models/Metadata/Extension.cs b/SabreTools.Data.Models/Metadata/Extension.cs index 66af6c6e..d5c912a1 100644 --- a/SabreTools.Data.Models/Metadata/Extension.cs +++ b/SabreTools.Data.Models/Metadata/Extension.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("extension"), XmlRoot("extension")] public class Extension : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Feature.cs b/SabreTools.Data.Models/Metadata/Feature.cs index 7a3521e7..3ecadbe0 100644 --- a/SabreTools.Data.Models/Metadata/Feature.cs +++ b/SabreTools.Data.Models/Metadata/Feature.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("feature"), XmlRoot("feature")] public class Feature : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Header.cs b/SabreTools.Data.Models/Metadata/Header.cs index 84addcdc..0851a8bc 100644 --- a/SabreTools.Data.Models/Metadata/Header.cs +++ b/SabreTools.Data.Models/Metadata/Header.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata /// public class Header : DictionaryBase { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Info.cs b/SabreTools.Data.Models/Metadata/Info.cs index 4eeb3840..380b8eb1 100644 --- a/SabreTools.Data.Models/Metadata/Info.cs +++ b/SabreTools.Data.Models/Metadata/Info.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("info"), XmlRoot("info")] public class Info : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Instance.cs b/SabreTools.Data.Models/Metadata/Instance.cs index df36275f..bcf5f4f4 100644 --- a/SabreTools.Data.Models/Metadata/Instance.cs +++ b/SabreTools.Data.Models/Metadata/Instance.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("instance"), XmlRoot("instance")] public class Instance : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Machine.cs b/SabreTools.Data.Models/Metadata/Machine.cs index 3e258a5c..0bccb4fb 100644 --- a/SabreTools.Data.Models/Metadata/Machine.cs +++ b/SabreTools.Data.Models/Metadata/Machine.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata /// public class Machine : DictionaryBase { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// Adjuster[] diff --git a/SabreTools.Data.Models/Metadata/Media.cs b/SabreTools.Data.Models/Metadata/Media.cs index f00cb3c6..ee974675 100644 --- a/SabreTools.Data.Models/Metadata/Media.cs +++ b/SabreTools.Data.Models/Metadata/Media.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("media"), XmlRoot("media")] public class Media : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Part.cs b/SabreTools.Data.Models/Metadata/Part.cs index 1b67de05..1e2a969e 100644 --- a/SabreTools.Data.Models/Metadata/Part.cs +++ b/SabreTools.Data.Models/Metadata/Part.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("part"), XmlRoot("part")] public class Part : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// DataArea[] diff --git a/SabreTools.Data.Models/Metadata/RamOption.cs b/SabreTools.Data.Models/Metadata/RamOption.cs index f39796b7..abe5f9b6 100644 --- a/SabreTools.Data.Models/Metadata/RamOption.cs +++ b/SabreTools.Data.Models/Metadata/RamOption.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("ramoption"), XmlRoot("ramoption")] public class RamOption : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Release.cs b/SabreTools.Data.Models/Metadata/Release.cs index 0a6f5aa9..e32520a3 100644 --- a/SabreTools.Data.Models/Metadata/Release.cs +++ b/SabreTools.Data.Models/Metadata/Release.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("release"), XmlRoot("release")] public class Release : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Rom.cs b/SabreTools.Data.Models/Metadata/Rom.cs index 92d0914d..2e97dfe7 100644 --- a/SabreTools.Data.Models/Metadata/Rom.cs +++ b/SabreTools.Data.Models/Metadata/Rom.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("rom"), XmlRoot("rom")] public class Rom : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string; ArchiveDotOrg.File diff --git a/SabreTools.Data.Models/Metadata/Sample.cs b/SabreTools.Data.Models/Metadata/Sample.cs index 93a40b44..63ec55ec 100644 --- a/SabreTools.Data.Models/Metadata/Sample.cs +++ b/SabreTools.Data.Models/Metadata/Sample.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("sample"), XmlRoot("sample")] public class Sample : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/SharedFeat.cs b/SabreTools.Data.Models/Metadata/SharedFeat.cs index 6a2fe032..524848dc 100644 --- a/SabreTools.Data.Models/Metadata/SharedFeat.cs +++ b/SabreTools.Data.Models/Metadata/SharedFeat.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("sharedfeat"), XmlRoot("sharedfeat")] public class SharedFeat : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/Slot.cs b/SabreTools.Data.Models/Metadata/Slot.cs index abd99216..3b57cbf7 100644 --- a/SabreTools.Data.Models/Metadata/Slot.cs +++ b/SabreTools.Data.Models/Metadata/Slot.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("slot"), XmlRoot("slot")] public class Slot : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/SlotOption.cs b/SabreTools.Data.Models/Metadata/SlotOption.cs index 83388ac5..829b9bcd 100644 --- a/SabreTools.Data.Models/Metadata/SlotOption.cs +++ b/SabreTools.Data.Models/Metadata/SlotOption.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("slotoption"), XmlRoot("slotoption")] public class SlotOption : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// (yes|no) "no" diff --git a/SabreTools.Data.Models/Metadata/Software.cs b/SabreTools.Data.Models/Metadata/Software.cs index 44d991be..9e1450f0 100644 --- a/SabreTools.Data.Models/Metadata/Software.cs +++ b/SabreTools.Data.Models/Metadata/Software.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("software"), XmlRoot("software")] public class Software : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Data.Models/Metadata/SoftwareList.cs b/SabreTools.Data.Models/Metadata/SoftwareList.cs index 3642796d..ac6a912f 100644 --- a/SabreTools.Data.Models/Metadata/SoftwareList.cs +++ b/SabreTools.Data.Models/Metadata/SoftwareList.cs @@ -6,6 +6,12 @@ namespace SabreTools.Data.Models.Metadata [JsonObject("softwarelist"), XmlRoot("softwarelist")] public class SoftwareList : DatItem { + #region Properties + + public string? Name { get; set; } + + #endregion + #region Keys /// string diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs index 434da387..cbe19e54 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs @@ -20,7 +20,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); DatItem datItem = new Rom(); datItem.SetName("rom.bin"); @@ -48,7 +48,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); DatItem datItem = new Rom(); datItem.SetName("rom.bin"); @@ -79,7 +79,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description"); DatItem datItem = new Rom(); @@ -103,7 +103,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void MachineDescriptionToName_ItemsDB() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description"); DatFile datFile = new Logiqx(datFile: null, useGame: false); @@ -126,7 +126,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); DatItem rom = new Rom(); rom.SetName("rom.bin"); @@ -165,7 +165,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); DatItem rom = new Rom(); rom.SetName("rom.bin"); @@ -204,10 +204,10 @@ namespace SabreTools.Metadata.DatFiles.Test public void SetOneGamePerRegion_Items() { Machine nowhereMachine = new Machine(); - nowhereMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)"); + nowhereMachine.SetName("machine (Nowhere)"); Machine worldMachine = new Machine(); - worldMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (World)"); + worldMachine.SetName("machine (World)"); worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)"); DatItem nowhereRom = new Rom(); @@ -238,10 +238,10 @@ namespace SabreTools.Metadata.DatFiles.Test public void SetOneGamePerRegion_ItemsDB() { Machine nowhereMachine = new Machine(); - nowhereMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)"); + nowhereMachine.SetName("machine (Nowhere)"); Machine worldMachine = new Machine(); - worldMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (World)"); + worldMachine.SetName("machine (World)"); worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)"); DatFile datFile = new Logiqx(datFile: null, useGame: false); @@ -266,7 +266,7 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name"); + machine.SetName("10.10.10-machine-name"); DatItem datItem = new Rom(); datItem.Write(DatItem.MachineKey, machine); @@ -288,7 +288,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void StripSceneDatesFromItems_ItemsDB() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name"); + machine.SetName("10.10.10-machine-name"); DatFile datFile = new Logiqx(datFile: null, useGame: false); _ = datFile.AddMachineDB(machine); diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs index 51bfb603..231e2fab 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs @@ -227,7 +227,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Header.LockRomModeKey] = "yes", [Data.Models.Metadata.Header.LockSampleModeKey] = "yes", [Data.Models.Metadata.Header.MameConfigKey] = "mameconfig", - [Data.Models.Metadata.Header.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Header.NewDatKey] = newDat, [Data.Models.Metadata.Header.NotesKey] = "notes", [Data.Models.Metadata.Header.PluginKey] = "plugin", @@ -297,7 +297,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Machine.LocationKey] = "location", [Data.Models.Metadata.Machine.ManufacturerKey] = "manufacturer", [Data.Models.Metadata.Machine.MediaKey] = new Data.Models.Metadata.Media[] { CreateMetadataMedia() }, - [Data.Models.Metadata.Machine.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Machine.NotesKey] = "notes", [Data.Models.Metadata.Machine.PartKey] = new Data.Models.Metadata.Part[] { CreateMetadataPart() }, [Data.Models.Metadata.Machine.PlayedCountKey] = "playedcount", @@ -338,7 +338,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.Adjuster.ConditionKey] = CreateMetadataCondition(), [Data.Models.Metadata.Adjuster.DefaultKey] = true, - [Data.Models.Metadata.Adjuster.NameKey] = "name", + Name = "name", }; } @@ -359,7 +359,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Archive.RegParentKey] = "regparent", [Data.Models.Metadata.Archive.MergeOfKey] = "mergeof", [Data.Models.Metadata.Archive.MergeNameKey] = "mergename", - [Data.Models.Metadata.Archive.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Archive.NameAltKey] = "name_alt", [Data.Models.Metadata.Archive.RegionKey] = "region", [Data.Models.Metadata.Archive.LanguagesKey] = "languages", @@ -396,7 +396,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.BiosSet.DefaultKey] = true, [Data.Models.Metadata.BiosSet.DescriptionKey] = "description", - [Data.Models.Metadata.BiosSet.NameKey] = "name", + Name = "name", }; } @@ -406,7 +406,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.Chip.ClockKey] = 12345L, [Data.Models.Metadata.Chip.FlagsKey] = "flags", - [Data.Models.Metadata.Chip.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Chip.SoundOnlyKey] = "yes", [Data.Models.Metadata.Chip.TagKey] = "tag", [Data.Models.Metadata.Chip.ChipTypeKey] = "cpu", @@ -421,7 +421,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Configuration.ConfLocationKey] = new Data.Models.Metadata.ConfLocation[] { CreateMetadataConfLocation() }, [Data.Models.Metadata.Configuration.ConfSettingKey] = new Data.Models.Metadata.ConfSetting[] { CreateMetadataConfSetting() }, [Data.Models.Metadata.Configuration.MaskKey] = "mask", - [Data.Models.Metadata.Configuration.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Configuration.TagKey] = "tag", }; } @@ -442,7 +442,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.ConfLocation { [Data.Models.Metadata.ConfLocation.InvertedKey] = "yes", - [Data.Models.Metadata.ConfLocation.NameKey] = "name", + Name = "name", [Data.Models.Metadata.ConfLocation.NumberKey] = "number", }; } @@ -453,7 +453,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.ConfSetting.ConditionKey] = CreateMetadataCondition(), [Data.Models.Metadata.ConfSetting.DefaultKey] = "yes", - [Data.Models.Metadata.ConfSetting.NameKey] = "name", + Name = "name", [Data.Models.Metadata.ConfSetting.ValueKey] = "value", }; } @@ -495,7 +495,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.DeviceRef { - [Data.Models.Metadata.DeviceRef.NameKey] = "name", + Name = "name", }; } @@ -504,7 +504,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.DipLocation { [Data.Models.Metadata.DipLocation.InvertedKey] = "yes", - [Data.Models.Metadata.DipLocation.NameKey] = "name", + Name = "name", [Data.Models.Metadata.DipLocation.NumberKey] = "number", }; } @@ -519,7 +519,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.DipSwitch.DipValueKey] = new Data.Models.Metadata.DipValue[] { CreateMetadataDipValue() }, [Data.Models.Metadata.DipSwitch.EntryKey] = new string[] { "entry" }, [Data.Models.Metadata.DipSwitch.MaskKey] = "mask", - [Data.Models.Metadata.DipSwitch.NameKey] = "name", + Name = "name", [Data.Models.Metadata.DipSwitch.TagKey] = "tag", }; } @@ -530,7 +530,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.DipValue.ConditionKey] = CreateMetadataCondition(), [Data.Models.Metadata.DipValue.DefaultKey] = "yes", - [Data.Models.Metadata.DipValue.NameKey] = "name", + Name = "name", [Data.Models.Metadata.DipValue.ValueKey] = "value", }; } @@ -540,7 +540,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.DataArea { [Data.Models.Metadata.DataArea.EndiannessKey] = "big", - [Data.Models.Metadata.DataArea.NameKey] = "name", + Name = "name", [Data.Models.Metadata.DataArea.RomKey] = new Data.Models.Metadata.Rom[] { [] }, [Data.Models.Metadata.DataArea.SizeKey] = 12345L, [Data.Models.Metadata.DataArea.WidthKey] = 64, @@ -555,7 +555,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Disk.IndexKey] = "index", [Data.Models.Metadata.Disk.MD5Key] = HashType.MD5.ZeroString, [Data.Models.Metadata.Disk.MergeKey] = "merge", - [Data.Models.Metadata.Disk.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Disk.OptionalKey] = "yes", [Data.Models.Metadata.Disk.RegionKey] = "region", [Data.Models.Metadata.Disk.SHA1Key] = HashType.SHA1.ZeroString, @@ -568,7 +568,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.DiskArea { [Data.Models.Metadata.DiskArea.DiskKey] = new Data.Models.Metadata.Disk[] { [] }, - [Data.Models.Metadata.DiskArea.NameKey] = "name", + Name = "name", }; } @@ -631,7 +631,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Extension { - [Data.Models.Metadata.Extension.NameKey] = "name", + Name = "name", }; } @@ -639,7 +639,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Feature { - [Data.Models.Metadata.Feature.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Feature.OverallKey] = "imperfect", [Data.Models.Metadata.Feature.StatusKey] = "imperfect", [Data.Models.Metadata.Feature.FeatureTypeKey] = "protection", @@ -651,7 +651,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Info { - [Data.Models.Metadata.Info.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Info.ValueKey] = "value", }; } @@ -674,7 +674,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.Instance { [Data.Models.Metadata.Instance.BriefNameKey] = "briefname", - [Data.Models.Metadata.Instance.NameKey] = "name", + Name = "name", }; } @@ -683,7 +683,7 @@ namespace SabreTools.Metadata.DatFiles.Test return new Data.Models.Metadata.Media { [Data.Models.Metadata.Media.MD5Key] = HashType.MD5.ZeroString, - [Data.Models.Metadata.Media.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Media.SHA1Key] = HashType.SHA1.ZeroString, [Data.Models.Metadata.Media.SHA256Key] = HashType.SHA256.ZeroString, [Data.Models.Metadata.Media.SpamSumKey] = HashType.SpamSum.ZeroString, @@ -708,7 +708,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Part.DipSwitchKey] = new Data.Models.Metadata.DipSwitch[] { [] }, [Data.Models.Metadata.Part.FeatureKey] = new Data.Models.Metadata.Feature[] { CreateMetadataFeature() }, [Data.Models.Metadata.Part.InterfaceKey] = "interface", - [Data.Models.Metadata.Part.NameKey] = "name", + Name = "name", }; } @@ -727,7 +727,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.RamOption.ContentKey] = "content", [Data.Models.Metadata.RamOption.DefaultKey] = "yes", - [Data.Models.Metadata.RamOption.NameKey] = "name", + Name = "name", }; } @@ -738,7 +738,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Release.DateKey] = "date", [Data.Models.Metadata.Release.DefaultKey] = "yes", [Data.Models.Metadata.Release.LanguageKey] = "language", - [Data.Models.Metadata.Release.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Release.RegionKey] = "region", }; } @@ -813,7 +813,7 @@ namespace SabreTools.Metadata.DatFiles.Test // [Data.Models.Metadata.Rom.OpenMSXMediaType] = null, // Omit due to other test [Data.Models.Metadata.Rom.MergeKey] = "merge", [Data.Models.Metadata.Rom.MIAKey] = "yes", - [Data.Models.Metadata.Rom.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Rom.TesseractOCRKey] = "ocr", [Data.Models.Metadata.Rom.TesseractOCRConvertedKey] = "ocr_converted", [Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey] = "ocr_detected_lang", @@ -873,7 +873,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Sample { - [Data.Models.Metadata.Sample.NameKey] = "name", + Name = "name", }; } @@ -902,7 +902,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.SharedFeat { - [Data.Models.Metadata.SharedFeat.NameKey] = "name", + Name = "name", [Data.Models.Metadata.SharedFeat.ValueKey] = "value", }; } @@ -911,7 +911,7 @@ namespace SabreTools.Metadata.DatFiles.Test { return new Data.Models.Metadata.Slot { - [Data.Models.Metadata.Slot.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Slot.SlotOptionKey] = new Data.Models.Metadata.SlotOption[] { CreateMetadataSlotOption() }, }; } @@ -922,7 +922,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.SlotOption.DefaultKey] = "yes", [Data.Models.Metadata.SlotOption.DevNameKey] = "devname", - [Data.Models.Metadata.SlotOption.NameKey] = "name", + Name = "name", }; } @@ -933,7 +933,7 @@ namespace SabreTools.Metadata.DatFiles.Test [Data.Models.Metadata.Software.CloneOfKey] = "cloneof", [Data.Models.Metadata.Software.DescriptionKey] = "description", [Data.Models.Metadata.Software.InfoKey] = new Data.Models.Metadata.Info[] { CreateMetadataInfo() }, - [Data.Models.Metadata.Software.NameKey] = "name", + Name = "name", [Data.Models.Metadata.Software.NotesKey] = "notes", [Data.Models.Metadata.Software.PartKey] = new Data.Models.Metadata.Part[] { CreateMetadataPart() }, [Data.Models.Metadata.Software.PublisherKey] = "publisher", @@ -949,7 +949,7 @@ namespace SabreTools.Metadata.DatFiles.Test { [Data.Models.Metadata.SoftwareList.DescriptionKey] = "description", [Data.Models.Metadata.SoftwareList.FilterKey] = "filter", - [Data.Models.Metadata.SoftwareList.NameKey] = "name", + Name = "name", [Data.Models.Metadata.SoftwareList.NotesKey] = "notes", [Data.Models.Metadata.SoftwareList.SoftwareKey] = new Data.Models.Metadata.Software[] { CreateMetadataSoftware() }, [Data.Models.Metadata.SoftwareList.StatusKey] = "original", @@ -1063,7 +1063,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.True(datHeader.ReadBool(Data.Models.Metadata.Header.LockRomModeKey)); Assert.True(datHeader.ReadBool(Data.Models.Metadata.Header.LockSampleModeKey)); Assert.Equal("mameconfig", datHeader.ReadString(Data.Models.Metadata.Header.MameConfigKey)); - Assert.Equal("name", datHeader.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("name", datHeader.Name); Assert.NotNull(datHeader.ReadString(Data.Models.Metadata.Header.NewDatKey)); Assert.Equal("notes", datHeader.ReadString(Data.Models.Metadata.Header.NotesKey)); Assert.Equal("plugin", datHeader.ReadString(Data.Models.Metadata.Header.PluginKey)); @@ -1145,7 +1145,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(adjuster); Assert.True(adjuster.ReadBool(Data.Models.Metadata.Adjuster.DefaultKey)); - Assert.Equal("name", adjuster.ReadString(Data.Models.Metadata.Adjuster.NameKey)); + Assert.Equal("name", adjuster.GetName()); Condition? condition = adjuster.Read(Data.Models.Metadata.Adjuster.ConditionKey); ValidateCondition(condition); @@ -1160,7 +1160,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateArchive(Archive? archive) { Assert.NotNull(archive); - Assert.Equal("name", archive.ReadString(Data.Models.Metadata.Archive.NameKey)); + Assert.Equal("name", archive.GetName()); } private static void ValidateBiosSet(BiosSet? biosSet) @@ -1168,7 +1168,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(biosSet); Assert.True(biosSet.ReadBool(Data.Models.Metadata.BiosSet.DefaultKey)); Assert.Equal("description", biosSet.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)); - Assert.Equal("name", biosSet.ReadString(Data.Models.Metadata.BiosSet.NameKey)); + Assert.Equal("name", biosSet.GetName()); } private static void ValidateChip(Chip? chip) @@ -1176,7 +1176,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(chip); Assert.Equal(12345L, chip.ReadLong(Data.Models.Metadata.Chip.ClockKey)); Assert.Equal("flags", chip.ReadString(Data.Models.Metadata.Chip.FlagsKey)); - Assert.Equal("name", chip.ReadString(Data.Models.Metadata.Chip.NameKey)); + Assert.Equal("name", chip.GetName()); Assert.True(chip.ReadBool(Data.Models.Metadata.Chip.SoundOnlyKey)); Assert.Equal("tag", chip.ReadString(Data.Models.Metadata.Chip.TagKey)); Assert.Equal("cpu", chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey)); @@ -1195,7 +1195,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(configuration); Assert.Equal("mask", configuration.ReadString(Data.Models.Metadata.Configuration.MaskKey)); - Assert.Equal("name", configuration.ReadString(Data.Models.Metadata.Configuration.NameKey)); + Assert.Equal("name", configuration.GetName()); Assert.Equal("tag", configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)); Condition? condition = configuration.Read(Data.Models.Metadata.Configuration.ConditionKey); @@ -1216,7 +1216,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(confLocation); Assert.True(confLocation.ReadBool(Data.Models.Metadata.ConfLocation.InvertedKey)); - Assert.Equal("name", confLocation.ReadString(Data.Models.Metadata.ConfLocation.NameKey)); + Assert.Equal("name", confLocation.GetName()); Assert.Equal("number", confLocation.ReadString(Data.Models.Metadata.ConfLocation.NumberKey)); } @@ -1224,7 +1224,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(confSetting); Assert.True(confSetting.ReadBool(Data.Models.Metadata.ConfSetting.DefaultKey)); - Assert.Equal("name", confSetting.ReadString(Data.Models.Metadata.ConfSetting.NameKey)); + Assert.Equal("name", confSetting.GetName()); Assert.Equal("value", confSetting.ReadString(Data.Models.Metadata.ConfSetting.ValueKey)); Condition? condition = confSetting.Read(Data.Models.Metadata.ConfSetting.ConditionKey); @@ -1252,7 +1252,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dataArea); Assert.Equal("big", dataArea.ReadString(Data.Models.Metadata.DataArea.EndiannessKey)); - Assert.Equal("name", dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey)); + Assert.Equal("name", dataArea.GetName()); Assert.Equal(12345L, dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey)); Assert.Equal(64, dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey)); } @@ -1278,14 +1278,14 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateDeviceRef(DeviceRef? deviceRef) { Assert.NotNull(deviceRef); - Assert.Equal("name", deviceRef.ReadString(Data.Models.Metadata.DeviceRef.NameKey)); + Assert.Equal("name", deviceRef.GetName()); } private static void ValidateDipLocation(DipLocation? dipLocation) { Assert.NotNull(dipLocation); Assert.True(dipLocation.ReadBool(Data.Models.Metadata.DipLocation.InvertedKey)); - Assert.Equal("name", dipLocation.ReadString(Data.Models.Metadata.DipLocation.NameKey)); + Assert.Equal("name", dipLocation.GetName()); Assert.Equal("number", dipLocation.ReadString(Data.Models.Metadata.DipLocation.NumberKey)); } @@ -1294,7 +1294,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(dipSwitch); Assert.True(dipSwitch.ReadBool(Data.Models.Metadata.DipSwitch.DefaultKey)); Assert.Equal("mask", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)); - Assert.Equal("name", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.NameKey)); + Assert.Equal("name", dipSwitch.GetName()); Assert.Equal("tag", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)); Condition? condition = dipSwitch.Read(Data.Models.Metadata.DipSwitch.ConditionKey); @@ -1320,7 +1320,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dipValue); Assert.True(dipValue.ReadBool(Data.Models.Metadata.DipValue.DefaultKey)); - Assert.Equal("name", dipValue.ReadString(Data.Models.Metadata.DipValue.NameKey)); + Assert.Equal("name", dipValue.GetName()); Assert.Equal("value", dipValue.ReadString(Data.Models.Metadata.DipValue.ValueKey)); Condition? condition = dipValue.Read(Data.Models.Metadata.DipValue.ConditionKey); @@ -1334,7 +1334,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("index", disk.ReadString(Data.Models.Metadata.Disk.IndexKey)); Assert.Equal(HashType.MD5.ZeroString, disk.ReadString(Data.Models.Metadata.Disk.MD5Key)); Assert.Equal("merge", disk.ReadString(Data.Models.Metadata.Disk.MergeKey)); - Assert.Equal("name", disk.ReadString(Data.Models.Metadata.Disk.NameKey)); + Assert.Equal("name", disk.GetName()); Assert.True(disk.ReadBool(Data.Models.Metadata.Disk.OptionalKey)); Assert.Equal("region", disk.ReadString(Data.Models.Metadata.Disk.RegionKey)); Assert.Equal(HashType.SHA1.ZeroString, disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)); @@ -1344,7 +1344,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateDiskArea(DiskArea? diskArea) { Assert.NotNull(diskArea); - Assert.Equal("name", diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey)); + Assert.Equal("name", diskArea.GetName()); } private static void ValidateDisplay(Display? display) @@ -1386,13 +1386,13 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateExtension(Extension? extension) { Assert.NotNull(extension); - Assert.Equal("name", extension.ReadString(Data.Models.Metadata.Extension.NameKey)); + Assert.Equal("name", extension.GetName()); } private static void ValidateFeature(Feature? feature) { Assert.NotNull(feature); - Assert.Equal("name", feature.ReadString(Data.Models.Metadata.Feature.NameKey)); + Assert.Equal("name", feature.GetName()); Assert.Equal("imperfect", feature.ReadString(Data.Models.Metadata.Feature.OverallKey)); Assert.Equal("imperfect", feature.ReadString(Data.Models.Metadata.Feature.StatusKey)); Assert.Equal("protection", feature.ReadString(Data.Models.Metadata.Feature.FeatureTypeKey)); @@ -1402,7 +1402,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateInfo(Info? info) { Assert.NotNull(info); - Assert.Equal("name", info.ReadString(Data.Models.Metadata.Info.NameKey)); + Assert.Equal("name", info.GetName()); Assert.Equal("value", info.ReadString(Data.Models.Metadata.Info.ValueKey)); } @@ -1425,14 +1425,14 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(instance); Assert.Equal("briefname", instance.ReadString(Data.Models.Metadata.Instance.BriefNameKey)); - Assert.Equal("name", instance.ReadString(Data.Models.Metadata.Instance.NameKey)); + Assert.Equal("name", instance.GetName()); } private static void ValidateMedia(Media? media) { Assert.NotNull(media); Assert.Equal(HashType.MD5.ZeroString, media.ReadString(Data.Models.Metadata.Media.MD5Key)); - Assert.Equal("name", media.ReadString(Data.Models.Metadata.Media.NameKey)); + Assert.Equal("name", media.GetName()); Assert.Equal(HashType.SHA1.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA1Key)); Assert.Equal(HashType.SHA256.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA256Key)); Assert.Equal(HashType.SpamSum.ZeroString, media.ReadString(Data.Models.Metadata.Media.SpamSumKey)); @@ -1442,13 +1442,13 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(part); Assert.Equal("interface", part.ReadString(Data.Models.Metadata.Part.InterfaceKey)); - Assert.Equal("name", part.ReadString(Data.Models.Metadata.Part.NameKey)); + Assert.Equal("name", part.GetName()); } private static void ValidatePartFeature(PartFeature? partFeature) { Assert.NotNull(partFeature); - Assert.Equal("name", partFeature.ReadString(Data.Models.Metadata.Feature.NameKey)); + Assert.Equal("name", partFeature.GetName()); Assert.Equal("imperfect", partFeature.ReadString(Data.Models.Metadata.Feature.OverallKey)); Assert.Equal("imperfect", partFeature.ReadString(Data.Models.Metadata.Feature.StatusKey)); Assert.Equal("protection", partFeature.ReadString(Data.Models.Metadata.Feature.FeatureTypeKey)); @@ -1474,7 +1474,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(ramOption); Assert.Equal("content", ramOption.ReadString(Data.Models.Metadata.RamOption.ContentKey)); Assert.True(ramOption.ReadBool(Data.Models.Metadata.RamOption.DefaultKey)); - Assert.Equal("name", ramOption.ReadString(Data.Models.Metadata.RamOption.NameKey)); + Assert.Equal("name", ramOption.GetName()); } private static void ValidateRelease(Release? release) @@ -1483,7 +1483,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("date", release.ReadString(Data.Models.Metadata.Release.DateKey)); Assert.True(release.ReadBool(Data.Models.Metadata.Release.DefaultKey)); Assert.Equal("language", release.ReadString(Data.Models.Metadata.Release.LanguageKey)); - Assert.Equal("name", release.ReadString(Data.Models.Metadata.Release.NameKey)); + Assert.Equal("name", release.GetName()); Assert.Equal("region", release.ReadString(Data.Models.Metadata.Release.RegionKey)); } @@ -1533,7 +1533,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.OpenMSXMediaType)); // Omit due to other test Assert.Equal("merge", rom.ReadString(Data.Models.Metadata.Rom.MergeKey)); Assert.True(rom.ReadBool(Data.Models.Metadata.Rom.MIAKey)); - Assert.Equal("name", rom.ReadString(Data.Models.Metadata.Rom.NameKey)); + Assert.Equal("name", rom.GetName()); Assert.Equal("ocr", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRKey)); Assert.Equal("ocr_converted", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRConvertedKey)); Assert.Equal("ocr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey)); @@ -1591,20 +1591,20 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateSample(Sample? sample) { Assert.NotNull(sample); - Assert.Equal("name", sample.ReadString(Data.Models.Metadata.Sample.NameKey)); + Assert.Equal("name", sample.GetName()); } private static void ValidateSharedFeat(SharedFeat? sharedFeat) { Assert.NotNull(sharedFeat); - Assert.Equal("name", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.NameKey)); + Assert.Equal("name", sharedFeat.GetName()); Assert.Equal("value", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.ValueKey)); } private static void ValidateSlot(Slot? slot) { Assert.NotNull(slot); - Assert.Equal("name", slot.ReadString(Data.Models.Metadata.Slot.NameKey)); + Assert.Equal("name", slot.GetName()); SlotOption[]? slotOptions = slot.Read(Data.Models.Metadata.Slot.SlotOptionKey); Assert.NotNull(slotOptions); @@ -1617,7 +1617,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(slotOption); Assert.True(slotOption.ReadBool(Data.Models.Metadata.SlotOption.DefaultKey)); Assert.Equal("devname", slotOption.ReadString(Data.Models.Metadata.SlotOption.DevNameKey)); - Assert.Equal("name", slotOption.ReadString(Data.Models.Metadata.SlotOption.NameKey)); + Assert.Equal("name", slotOption.GetName()); } private static void ValidateSoftwareList(SoftwareList? softwareList) @@ -1625,7 +1625,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(softwareList); Assert.Equal("description", softwareList.ReadString(Data.Models.Metadata.SoftwareList.DescriptionKey)); Assert.Equal("filter", softwareList.ReadString(Data.Models.Metadata.SoftwareList.FilterKey)); - Assert.Equal("name", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NameKey)); + Assert.Equal("name", softwareList.GetName()); Assert.Equal("notes", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NotesKey)); // TODO: Figure out why Data.Models.Metadata.SoftwareList.SoftwareKey doesn't get processed Assert.Equal("original", softwareList.ReadString(Data.Models.Metadata.SoftwareList.StatusKey)); diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs index e6fb6f2d..6f762582 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs @@ -399,7 +399,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.True(header.ReadBool(Data.Models.Metadata.Header.LockRomModeKey)); Assert.True(header.ReadBool(Data.Models.Metadata.Header.LockSampleModeKey)); Assert.Equal("mameconfig", header.ReadString(Data.Models.Metadata.Header.MameConfigKey)); - Assert.Equal("name", header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("name", header.Name); Assert.NotNull(header.Read(Data.Models.Metadata.Header.NewDatKey)); Assert.Equal("notes", header.ReadString(Data.Models.Metadata.Header.NotesKey)); Assert.Equal("plugin", header.ReadString(Data.Models.Metadata.Header.PluginKey)); @@ -450,7 +450,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("language", machine.ReadString(Data.Models.Metadata.Machine.LanguageKey)); Assert.Equal("location", machine.ReadString(Data.Models.Metadata.Machine.LocationKey)); Assert.Equal("manufacturer", machine.ReadString(Data.Models.Metadata.Machine.ManufacturerKey)); - Assert.Equal("name", machine.ReadString(Data.Models.Metadata.Machine.NameKey)); + Assert.Equal("name", machine.Name); Assert.Equal("notes", machine.ReadString(Data.Models.Metadata.Machine.NotesKey)); Assert.Equal("playedcount", machine.ReadString(Data.Models.Metadata.Machine.PlayedCountKey)); Assert.Equal("playedtime", machine.ReadString(Data.Models.Metadata.Machine.PlayedTimeKey)); @@ -620,7 +620,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(adjuster); Assert.True(adjuster.ReadBool(Data.Models.Metadata.Adjuster.DefaultKey)); - Assert.Equal("name", adjuster.ReadString(Data.Models.Metadata.Adjuster.NameKey)); + Assert.Equal("name", adjuster.Name); Data.Models.Metadata.Condition? condition = adjuster.Read(Data.Models.Metadata.Adjuster.ConditionKey); ValidateMetadataCondition(condition); @@ -640,7 +640,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("regparent", archive.ReadString(Data.Models.Metadata.Archive.RegParentKey)); Assert.Equal("mergeof", archive.ReadString(Data.Models.Metadata.Archive.MergeOfKey)); Assert.Equal("mergename", archive.ReadString(Data.Models.Metadata.Archive.MergeNameKey)); - Assert.Equal("name", archive.ReadString(Data.Models.Metadata.Archive.NameKey)); + Assert.Equal("name", archive.Name); Assert.Equal("name_alt", archive.ReadString(Data.Models.Metadata.Archive.NameAltKey)); Assert.Equal("region", archive.ReadString(Data.Models.Metadata.Archive.RegionKey)); Assert.Equal("languages", archive.ReadString(Data.Models.Metadata.Archive.LanguagesKey)); @@ -675,7 +675,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(biosSet); Assert.True(biosSet.ReadBool(Data.Models.Metadata.BiosSet.DefaultKey)); Assert.Equal("description", biosSet.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)); - Assert.Equal("name", biosSet.ReadString(Data.Models.Metadata.BiosSet.NameKey)); + Assert.Equal("name", biosSet.Name); } private static void ValidateMetadataChip(Data.Models.Metadata.Chip? chip) @@ -683,7 +683,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(chip); Assert.Equal(12345, chip.ReadLong(Data.Models.Metadata.Chip.ClockKey)); Assert.Equal("flags", chip.ReadString(Data.Models.Metadata.Chip.FlagsKey)); - Assert.Equal("name", chip.ReadString(Data.Models.Metadata.Chip.NameKey)); + Assert.Equal("name", chip.Name); Assert.True(chip.ReadBool(Data.Models.Metadata.Chip.SoundOnlyKey)); Assert.Equal("tag", chip.ReadString(Data.Models.Metadata.Chip.TagKey)); Assert.Equal("cpu", chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey)); @@ -702,7 +702,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(configuration); Assert.Equal("mask", configuration.ReadString(Data.Models.Metadata.Configuration.MaskKey)); - Assert.Equal("name", configuration.ReadString(Data.Models.Metadata.Configuration.NameKey)); + Assert.Equal("name", configuration.Name); Assert.Equal("tag", configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)); Data.Models.Metadata.Condition? condition = configuration.Read(Data.Models.Metadata.Configuration.ConditionKey); @@ -723,7 +723,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(confLocation); Assert.True(confLocation.ReadBool(Data.Models.Metadata.ConfLocation.InvertedKey)); - Assert.Equal("name", confLocation.ReadString(Data.Models.Metadata.ConfLocation.NameKey)); + Assert.Equal("name", confLocation.Name); Assert.Equal("number", confLocation.ReadString(Data.Models.Metadata.ConfLocation.NumberKey)); } @@ -731,7 +731,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(confSetting); Assert.True(confSetting.ReadBool(Data.Models.Metadata.ConfSetting.DefaultKey)); - Assert.Equal("name", confSetting.ReadString(Data.Models.Metadata.ConfSetting.NameKey)); + Assert.Equal("name", confSetting.Name); Assert.Equal("value", confSetting.ReadString(Data.Models.Metadata.ConfSetting.ValueKey)); Data.Models.Metadata.Condition? condition = confSetting.Read(Data.Models.Metadata.ConfSetting.ConditionKey); @@ -759,7 +759,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dataArea); Assert.Equal("big", dataArea.ReadString(Data.Models.Metadata.DataArea.EndiannessKey)); - Assert.Equal("name", dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey)); + Assert.Equal("name", dataArea.Name); Assert.Equal(12345, dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey)); Assert.Equal(64, dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey)); @@ -790,14 +790,14 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataDeviceRef(Data.Models.Metadata.DeviceRef? deviceRef) { Assert.NotNull(deviceRef); - Assert.Equal("name", deviceRef.ReadString(Data.Models.Metadata.DeviceRef.NameKey)); + Assert.Equal("name", deviceRef.Name); } private static void ValidateMetadataDipLocation(Data.Models.Metadata.DipLocation? dipLocation) { Assert.NotNull(dipLocation); Assert.True(dipLocation.ReadBool(Data.Models.Metadata.DipLocation.InvertedKey)); - Assert.Equal("name", dipLocation.ReadString(Data.Models.Metadata.DipLocation.NameKey)); + Assert.Equal("name", dipLocation.Name); Assert.Equal("number", dipLocation.ReadString(Data.Models.Metadata.DipLocation.NumberKey)); } @@ -806,7 +806,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(dipSwitch); Assert.True(dipSwitch.ReadBool(Data.Models.Metadata.DipSwitch.DefaultKey)); Assert.Equal("mask", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)); - Assert.Equal("name", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.NameKey)); + Assert.Equal("name", dipSwitch.Name); Assert.Equal("tag", dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)); Data.Models.Metadata.Condition? condition = dipSwitch.Read(Data.Models.Metadata.DipSwitch.ConditionKey); @@ -832,7 +832,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(dipValue); Assert.True(dipValue.ReadBool(Data.Models.Metadata.DipValue.DefaultKey)); - Assert.Equal("name", dipValue.ReadString(Data.Models.Metadata.DipValue.NameKey)); + Assert.Equal("name", dipValue.Name); Assert.Equal("value", dipValue.ReadString(Data.Models.Metadata.DipValue.ValueKey)); Data.Models.Metadata.Condition? condition = dipValue.Read(Data.Models.Metadata.DipValue.ConditionKey); @@ -846,7 +846,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("index", disk.ReadString(Data.Models.Metadata.Disk.IndexKey)); Assert.Equal(HashType.MD5.ZeroString, disk.ReadString(Data.Models.Metadata.Disk.MD5Key)); Assert.Equal("merge", disk.ReadString(Data.Models.Metadata.Disk.MergeKey)); - Assert.Equal("name", disk.ReadString(Data.Models.Metadata.Disk.NameKey)); + Assert.Equal("name", disk.Name); Assert.True(disk.ReadBool(Data.Models.Metadata.Disk.OptionalKey)); Assert.Equal("region", disk.ReadString(Data.Models.Metadata.Disk.RegionKey)); Assert.Equal(HashType.SHA1.ZeroString, disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)); @@ -856,7 +856,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataDiskArea(Data.Models.Metadata.DiskArea? diskArea) { Assert.NotNull(diskArea); - Assert.Equal("name", diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey)); + Assert.Equal("name", diskArea.Name); Data.Models.Metadata.Disk[]? disks = diskArea.ReadArray(Data.Models.Metadata.DiskArea.DiskKey); Assert.NotNull(disks); @@ -903,13 +903,13 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataExtension(Data.Models.Metadata.Extension? extension) { Assert.NotNull(extension); - Assert.Equal("name", extension.ReadString(Data.Models.Metadata.Extension.NameKey)); + Assert.Equal("name", extension.Name); } private static void ValidateMetadataFeature(Data.Models.Metadata.Feature? feature) { Assert.NotNull(feature); - Assert.Equal("name", feature.ReadString(Data.Models.Metadata.Feature.NameKey)); + Assert.Equal("name", feature.Name); Assert.Equal("imperfect", feature.ReadString(Data.Models.Metadata.Feature.OverallKey)); Assert.Equal("imperfect", feature.ReadString(Data.Models.Metadata.Feature.StatusKey)); Assert.Equal("protection", feature.ReadString(Data.Models.Metadata.Feature.FeatureTypeKey)); @@ -919,7 +919,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataInfo(Data.Models.Metadata.Info? info) { Assert.NotNull(info); - Assert.Equal("name", info.ReadString(Data.Models.Metadata.Info.NameKey)); + Assert.Equal("name", info.Name); Assert.Equal("value", info.ReadString(Data.Models.Metadata.Info.ValueKey)); } @@ -942,14 +942,14 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(instance); Assert.Equal("briefname", instance.ReadString(Data.Models.Metadata.Instance.BriefNameKey)); - Assert.Equal("name", instance.ReadString(Data.Models.Metadata.Instance.NameKey)); + Assert.Equal("name", instance.Name); } private static void ValidateMetadataMedia(Data.Models.Metadata.Media? media) { Assert.NotNull(media); Assert.Equal(HashType.MD5.ZeroString, media.ReadString(Data.Models.Metadata.Media.MD5Key)); - Assert.Equal("name", media.ReadString(Data.Models.Metadata.Media.NameKey)); + Assert.Equal("name", media.Name); Assert.Equal(HashType.SHA1.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA1Key)); Assert.Equal(HashType.SHA256.ZeroString, media.ReadString(Data.Models.Metadata.Media.SHA256Key)); Assert.Equal(HashType.SpamSum.ZeroString, media.ReadString(Data.Models.Metadata.Media.SpamSumKey)); @@ -959,7 +959,7 @@ namespace SabreTools.Metadata.DatFiles.Test { Assert.NotNull(part); Assert.Equal("interface", part.ReadString(Data.Models.Metadata.Part.InterfaceKey)); - Assert.Equal("name", part.ReadString(Data.Models.Metadata.Part.NameKey)); + Assert.Equal("name", part.Name); Data.Models.Metadata.DataArea[]? dataAreas = part.ReadArray(Data.Models.Metadata.Part.DataAreaKey); Assert.NotNull(dataAreas); @@ -998,7 +998,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(ramOption); Assert.Equal("content", ramOption.ReadString(Data.Models.Metadata.RamOption.ContentKey)); Assert.True(ramOption.ReadBool(Data.Models.Metadata.RamOption.DefaultKey)); - Assert.Equal("name", ramOption.ReadString(Data.Models.Metadata.RamOption.NameKey)); + Assert.Equal("name", ramOption.Name); } private static void ValidateMetadataRelease(Data.Models.Metadata.Release? release) @@ -1007,7 +1007,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("date", release.ReadString(Data.Models.Metadata.Release.DateKey)); Assert.True(release.ReadBool(Data.Models.Metadata.Release.DefaultKey)); Assert.Equal("language", release.ReadString(Data.Models.Metadata.Release.LanguageKey)); - Assert.Equal("name", release.ReadString(Data.Models.Metadata.Release.NameKey)); + Assert.Equal("name", release.Name); Assert.Equal("region", release.ReadString(Data.Models.Metadata.Release.RegionKey)); } @@ -1078,7 +1078,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.OpenMSXMediaType)); // Omit due to other test Assert.Equal("merge", rom.ReadString(Data.Models.Metadata.Rom.MergeKey)); Assert.True(rom.ReadBool(Data.Models.Metadata.Rom.MIAKey)); - Assert.Equal("name", rom.ReadString(Data.Models.Metadata.Rom.NameKey)); + Assert.Equal("name", rom.Name); Assert.Equal("ocr", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRKey)); Assert.Equal("ocr_converted", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRConvertedKey)); Assert.Equal("ocr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey)); @@ -1136,7 +1136,7 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataSample(Data.Models.Metadata.Sample? sample) { Assert.NotNull(sample); - Assert.Equal("name", sample.ReadString(Data.Models.Metadata.Sample.NameKey)); + Assert.Equal("name", sample.Name); } private static void ValidateMetadataSerials(Data.Models.Metadata.Serials? serials) @@ -1161,14 +1161,14 @@ namespace SabreTools.Metadata.DatFiles.Test private static void ValidateMetadataSharedFeat(Data.Models.Metadata.SharedFeat? sharedFeat) { Assert.NotNull(sharedFeat); - Assert.Equal("name", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.NameKey)); + Assert.Equal("name", sharedFeat.Name); Assert.Equal("value", sharedFeat.ReadString(Data.Models.Metadata.SharedFeat.ValueKey)); } private static void ValidateMetadataSlot(Data.Models.Metadata.Slot? slot) { Assert.NotNull(slot); - Assert.Equal("name", slot.ReadString(Data.Models.Metadata.Slot.NameKey)); + Assert.Equal("name", slot.Name); Data.Models.Metadata.SlotOption[]? slotOptions = slot.ReadArray(Data.Models.Metadata.Slot.SlotOptionKey); Assert.NotNull(slotOptions); @@ -1181,7 +1181,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(slotOption); Assert.True(slotOption.ReadBool(Data.Models.Metadata.SlotOption.DefaultKey)); Assert.Equal("devname", slotOption.ReadString(Data.Models.Metadata.SlotOption.DevNameKey)); - Assert.Equal("name", slotOption.ReadString(Data.Models.Metadata.SlotOption.NameKey)); + Assert.Equal("name", slotOption.Name); } private static void ValidateMetadataSoftwareList(Data.Models.Metadata.SoftwareList? softwareList) @@ -1189,7 +1189,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(softwareList); Assert.Equal("description", softwareList.ReadString(Data.Models.Metadata.SoftwareList.DescriptionKey)); Assert.Equal("filter", softwareList.ReadString(Data.Models.Metadata.SoftwareList.FilterKey)); - Assert.Equal("name", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NameKey)); + Assert.Equal("name", softwareList.Name); Assert.Equal("notes", softwareList.ReadString(Data.Models.Metadata.SoftwareList.NotesKey)); Assert.Equal("original", softwareList.ReadString(Data.Models.Metadata.SoftwareList.StatusKey)); Assert.Equal("tag", softwareList.ReadString(Data.Models.Metadata.SoftwareList.TagKey)); diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs index 49ff1fa6..a0cb87f8 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs @@ -40,7 +40,7 @@ namespace SabreTools.Metadata.DatFiles.Test rom.Write(DatItem.MachineKey, machine); DatFile? datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "name"); + datFile.Header.Name = "name"; datFile.AddItem(rom, statsOnly: false); long sourceIndex = datFile.AddSourceDB(source); @@ -51,7 +51,7 @@ namespace SabreTools.Metadata.DatFiles.Test created.BucketBy(ItemKey.Machine); Assert.NotNull(created.Header); - Assert.Equal("name", created.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("name", created.Header.Name); Assert.NotNull(created.Items); DatItem datItem = Assert.Single(created.GetItemsForBucket("key")); @@ -113,14 +113,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NoNameNoDesc_NotBare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, string.Empty); + datFile.Header.Name = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); - Assert.Equal("Filename (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Filename (1980-01-01)", datFile.Header.Name); Assert.Equal("Filename (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -128,14 +128,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NoNameNoDesc_Bare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, string.Empty); + datFile.Header.Name = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); - Assert.Equal("Filename", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Filename", datFile.Header.Name); Assert.Equal("Filename", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -143,14 +143,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NoNameDesc_NotBare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, string.Empty); + datFile.Header.Name = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); - Assert.Equal("Description (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Description (1980-01-01)", datFile.Header.Name); Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -158,14 +158,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NoNameDesc_Bare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, string.Empty); + datFile.Header.Name = string.Empty; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); - Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Description", datFile.Header.Name); Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -173,14 +173,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NameNoDesc_NotBare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "Name"); + datFile.Header.Name = "Name"; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); - Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Name", datFile.Header.Name); Assert.Equal("Name (1980-01-01)", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -188,14 +188,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NameNoDesc_Bare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "Name"); + datFile.Header.Name = "Name"; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, string.Empty); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); - Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Name", datFile.Header.Name); Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -203,14 +203,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NameDesc_NotBare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "Name"); + datFile.Header.Name = "Name"; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description"); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, false); - Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Name", datFile.Header.Name); Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -218,14 +218,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void FillHeaderFromPath_NameDesc_Bare() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "Name "); + datFile.Header.Name = "Name "; datFile.Header.Write(Data.Models.Metadata.Header.DescriptionKey, "Description "); datFile.Header.Write(Data.Models.Metadata.Header.DateKey, "1980-01-01"); string path = Path.Combine("Fake", "Path", "Filename"); datFile.FillHeaderFromPath(path, true); - Assert.Equal("Name", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("Name", datFile.Header.Name); Assert.Equal("Description", datFile.Header.ReadString(Data.Models.Metadata.Header.DescriptionKey)); } @@ -237,14 +237,14 @@ namespace SabreTools.Metadata.DatFiles.Test public void SetHeaderTest() { DatHeader datHeader = new DatHeader(); - datHeader.Write(Data.Models.Metadata.Header.NameKey, "name"); + datHeader.Name = "name"; DatFile? datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "notname"); + datFile.Header.Name = "notname"; datFile.SetHeader(datHeader); Assert.NotNull(datFile.Header); - Assert.Equal("name", datFile.Header.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("name", datFile.Header.Name); } #endregion @@ -273,7 +273,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResetDictionaryTest() { DatFile datFile = new Logiqx(datFile: null, useGame: false); - datFile.Header.Write(Data.Models.Metadata.Header.NameKey, "name"); + datFile.Header.Name = "name"; datFile.AddItem(new Rom(), statsOnly: false); datFile.AddItemDB(new Rom(), 0, 0, false); @@ -1329,10 +1329,10 @@ namespace SabreTools.Metadata.DatFiles.Test string expected) { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); DatItem item = new Rom(); - item.Write(Data.Models.Metadata.Rom.NameKey, "name"); + item.SetName("name"); item.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString); DatFile? datFile = new Logiqx(datFile: null, useGame: false); @@ -1363,13 +1363,13 @@ namespace SabreTools.Metadata.DatFiles.Test string expected = string.Empty; Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer"); machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher"); machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category"); DatItem item = new Rom(); - item.Write(Data.Models.Metadata.Rom.NameKey, "name"); + item.SetName("name"); item.Write(Data.Models.Metadata.Rom.SizeKey, 12345); item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16"); item.Write(Data.Models.Metadata.Rom.CRCKey, "crc"); @@ -1396,13 +1396,13 @@ namespace SabreTools.Metadata.DatFiles.Test string expected = "machine_machine_name_manufacturer_publisher_category______md5___sha1_____"; Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer"); machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher"); machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category"); DatItem item = new Disk(); - item.Write(Data.Models.Metadata.Disk.NameKey, "name"); + item.SetName("name"); item.Write(Data.Models.Metadata.Disk.MD5Key, "md5"); item.Write(Data.Models.Metadata.Disk.SHA1Key, "sha1"); @@ -1417,7 +1417,7 @@ namespace SabreTools.Metadata.DatFiles.Test string expected = "machine_machine_name.bin_manufacturer_publisher_category__00000000____d41d8cd98f00b204e9800998ecf8427e___da39a3ee5e6b4b0d3255bfef95601890afd80709_e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855___12345_"; Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer"); machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher"); machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category"); @@ -1444,13 +1444,13 @@ namespace SabreTools.Metadata.DatFiles.Test string expected = "machine_machine_name_manufacturer_publisher_category______md5___sha1_sha256____spamsum"; Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer"); machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher"); machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category"); DatItem item = new Media(); - item.Write(Data.Models.Metadata.Media.NameKey, "name"); + item.SetName("name"); item.Write(Data.Models.Metadata.Media.MD5Key, "md5"); item.Write(Data.Models.Metadata.Media.SHA1Key, "sha1"); item.Write(Data.Models.Metadata.Media.SHA256Key, "sha256"); @@ -1467,13 +1467,13 @@ namespace SabreTools.Metadata.DatFiles.Test string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum"; Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer"); machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher"); machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category"); DatItem item = new Rom(); - item.Write(Data.Models.Metadata.Rom.NameKey, "name"); + item.SetName("name"); item.Write(Data.Models.Metadata.Rom.SizeKey, 12345); item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16"); item.Write(Data.Models.Metadata.Rom.CRCKey, "crc"); @@ -1952,7 +1952,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNames_SingleItem_Single() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -1980,7 +1980,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNames_NonDuplicate_AllUntouched() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2022,7 +2022,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNames_AllDuplicate_Single() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2057,7 +2057,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNames_NameMatch_SingleRenamed() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2114,7 +2114,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNamesDB_SingleItem_Single() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2144,7 +2144,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNamesDB_NonDuplicate_AllUntouched() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2191,7 +2191,7 @@ namespace SabreTools.Metadata.DatFiles.Test DatFile datFile = new Logiqx(null, useGame: false); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); long machineIndex = datFile.AddMachineDB(machine); Source source = new Source(0); @@ -2228,7 +2228,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ResolveNamesDB_NameMatch_SingleRenamed() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "machine"); + machine.SetName("machine"); Source source = new Source(0); @@ -2318,7 +2318,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ShouldIgnore_NoIgnoreBlanksZeroRom_False() { DatItem? datItem = new Rom(); - datItem.Write(Data.Models.Metadata.Rom.NameKey, "name"); + datItem.SetName("name"); datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345); datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc"); DatFile datFile = new Logiqx(null, useGame: false); @@ -2341,7 +2341,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ShouldIgnore_MissingRequired_True() { DatItem? datItem = new Rom(); - datItem.Write(Data.Models.Metadata.Rom.NameKey, "name"); + datItem.SetName("name"); datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345); DatFile datFile = new Logiqx(null, useGame: false); @@ -2353,7 +2353,7 @@ namespace SabreTools.Metadata.DatFiles.Test public void ShouldIgnore_AllVerified_False() { DatItem? datItem = new Rom(); - datItem.Write(Data.Models.Metadata.Rom.NameKey, "name"); + datItem.SetName("name"); datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345); datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc"); datItem.Write(Data.Models.Metadata.Rom.MD2Key, "crc"); diff --git a/SabreTools.Metadata.DatFiles.Test/DatHeaderTests.cs b/SabreTools.Metadata.DatFiles.Test/DatHeaderTests.cs index ab8b6187..46c86387 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatHeaderTests.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatHeaderTests.cs @@ -118,12 +118,12 @@ namespace SabreTools.Metadata.DatFiles.Test public void CloneTest() { DatHeader header = new DatHeader(); - header.Write(Data.Models.Metadata.Header.NameKey, "name"); + header.Name = "name"; object clone = header.Clone(); DatHeader? actual = clone as DatHeader; Assert.NotNull(actual); - Assert.Equal("name", actual.ReadString(Data.Models.Metadata.Header.NameKey)); + Assert.Equal("name", actual.Name); } #endregion @@ -150,10 +150,10 @@ namespace SabreTools.Metadata.DatFiles.Test public void GetInternalCloneTest() { DatHeader header = new DatHeader(); - header.Write(Data.Models.Metadata.Header.NameKey, "name"); + header.Name = "name"; Data.Models.Metadata.Header actual = header.GetInternalClone(); - Assert.Equal("name", actual[Data.Models.Metadata.Header.NameKey]); + Assert.Equal("name", actual.Name); } #endregion @@ -184,10 +184,10 @@ namespace SabreTools.Metadata.DatFiles.Test public void Equals_MismatchedInternal_False() { DatHeader self = new DatHeader(); - self.Write(Data.Models.Metadata.Header.NameKey, "self"); + self.Name = "self"; DatHeader? other = new DatHeader(); - other.Write(Data.Models.Metadata.Header.NameKey, "other"); + other.Name = "other"; bool actual = self.Equals(other); Assert.False(actual); @@ -197,10 +197,10 @@ namespace SabreTools.Metadata.DatFiles.Test public void Equals_EqualInternal_True() { DatHeader self = new DatHeader(); - self.Write(Data.Models.Metadata.Header.NameKey, "name"); + self.Name = "name"; DatHeader? other = new DatHeader(); - other.Write(Data.Models.Metadata.Header.NameKey, "name"); + other.Name = "name"; bool actual = self.Equals(other); Assert.True(actual); diff --git a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs index d0df6070..03f630f9 100644 --- a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs +++ b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs @@ -509,10 +509,10 @@ namespace SabreTools.Metadata.DatFiles.Test Source source = new Source(0, source: null); Machine origMachine = new Machine(); - origMachine.Write(Data.Models.Metadata.Machine.NameKey, "original"); + origMachine.SetName("original"); Machine newMachine = new Machine(); - newMachine.Write(Data.Models.Metadata.Machine.NameKey, "new"); + newMachine.SetName("new"); DatItem datItem = new Rom(); diff --git a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs index e3704e9d..2d30295d 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs @@ -67,6 +67,7 @@ namespace SabreTools.Metadata.DatFiles // Create an internal header var header = new DatHeader(item); + Header.Name = header.Name; // Convert subheader values var canOpen = item.Read(Data.Models.Metadata.Header.CanOpenKey); @@ -136,8 +137,8 @@ namespace SabreTools.Metadata.DatFiles Header.Write(Data.Models.Metadata.Header.LockSampleModeKey, header.ReadBool(Data.Models.Metadata.Header.LockSampleModeKey)); if (Header.ReadString(Data.Models.Metadata.Header.MameConfigKey) is null) Header.Write(Data.Models.Metadata.Header.MameConfigKey, header.ReadString(Data.Models.Metadata.Header.MameConfigKey)); - if (Header.ReadString(Data.Models.Metadata.Header.NameKey) is null) - Header.Write(Data.Models.Metadata.Header.NameKey, header.ReadString(Data.Models.Metadata.Header.NameKey)); + if (Header.Name is null) + Header.Name = header.Name; if (Header.ReadString(Data.Models.Metadata.Header.NotesKey) is null) Header.Write(Data.Models.Metadata.Header.NotesKey, header.ReadString(Data.Models.Metadata.Header.NotesKey)); if (Header.ReadString(Data.Models.Metadata.Header.PluginKey) is null) @@ -170,7 +171,7 @@ namespace SabreTools.Metadata.DatFiles Header.Write(Data.Models.Metadata.Header.VersionKey, header.ReadString(Data.Models.Metadata.Header.VersionKey)); // Handle implied SuperDAT - if (Header.ReadString(Data.Models.Metadata.Header.NameKey)?.Contains(" - SuperDAT") == true && keep) + if (Header.Name?.Contains(" - SuperDAT") == true && keep) { if (Header.ReadString(Data.Models.Metadata.Header.TypeKey) is null) Header.Write(Data.Models.Metadata.Header.TypeKey, "SuperDAT"); diff --git a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs index 536c5cb4..27ebcece 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs @@ -315,7 +315,7 @@ namespace SabreTools.Metadata.DatFiles var datItem = partMapping.Value; // Get the part name and skip if there's none - string? partName = partItem.ReadString(Data.Models.Metadata.Part.NameKey); + string? partName = partItem.Name; if (partName is null) continue; @@ -324,7 +324,7 @@ namespace SabreTools.Metadata.DatFiles partItems[partName] = []; // Copy over string values - partItems[partName][Data.Models.Metadata.Part.NameKey] = partName; + partItems[partName].Name = partName; if (!partItems[partName].ContainsKey(Data.Models.Metadata.Part.InterfaceKey)) partItems[partName][Data.Models.Metadata.Part.InterfaceKey] = partItem.ReadString(Data.Models.Metadata.Part.InterfaceKey); @@ -341,7 +341,7 @@ namespace SabreTools.Metadata.DatFiles ClearEmptyKeys(romItem); // Get the data area name and skip if there's none - string? dataAreaName = dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey); + string? dataAreaName = dataArea.Name; if (dataAreaName is not null) { // Get existing data areas as a list @@ -349,7 +349,7 @@ namespace SabreTools.Metadata.DatFiles List dataAreas = [.. dataAreasArr]; // Find the existing disk area to append to, otherwise create a new disk area - int dataAreaIndex = dataAreas.FindIndex(da => da.ReadString(Data.Models.Metadata.DataArea.NameKey) == dataAreaName); + int dataAreaIndex = dataAreas.FindIndex(da => da.Name == dataAreaName); Data.Models.Metadata.DataArea aggregateDataArea; if (dataAreaIndex > -1) { @@ -359,7 +359,7 @@ namespace SabreTools.Metadata.DatFiles { aggregateDataArea = []; aggregateDataArea[Data.Models.Metadata.DataArea.EndiannessKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.EndiannessKey); - aggregateDataArea[Data.Models.Metadata.DataArea.NameKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey); + aggregateDataArea.Name = dataArea.Name; aggregateDataArea[Data.Models.Metadata.DataArea.SizeKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.SizeKey); aggregateDataArea[Data.Models.Metadata.DataArea.WidthKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.WidthKey); } @@ -398,7 +398,7 @@ namespace SabreTools.Metadata.DatFiles ClearEmptyKeys(diskItem); // Get the disk area name and skip if there's none - string? diskAreaName = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey); + string? diskAreaName = diskArea.Name; if (diskAreaName is not null) { // Get existing disk areas as a list @@ -406,7 +406,7 @@ namespace SabreTools.Metadata.DatFiles List diskAreas = [.. diskAreasArr]; // Find the existing disk area to append to, otherwise create a new disk area - int diskAreaIndex = diskAreas.FindIndex(da => da.ReadString(Data.Models.Metadata.DiskArea.NameKey) == diskAreaName); + int diskAreaIndex = diskAreas.FindIndex(da => da.Name == diskAreaName); Data.Models.Metadata.DiskArea aggregateDiskArea; if (diskAreaIndex > -1) { @@ -415,7 +415,7 @@ namespace SabreTools.Metadata.DatFiles else { aggregateDiskArea = []; - aggregateDiskArea[Data.Models.Metadata.DiskArea.NameKey] = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey); + aggregateDiskArea.Name = diskArea.Name; } // Clear any empty fields @@ -741,7 +741,7 @@ namespace SabreTools.Metadata.DatFiles var datItem = partMapping.Value; // Get the part name and skip if there's none - string? partName = partItem.ReadString(Data.Models.Metadata.Part.NameKey); + string? partName = partItem.Name; if (partName is null) continue; @@ -750,7 +750,7 @@ namespace SabreTools.Metadata.DatFiles partItems[partName] = []; // Copy over string values - partItems[partName][Data.Models.Metadata.Part.NameKey] = partName; + partItems[partName].Name = partName; if (!partItems[partName].ContainsKey(Data.Models.Metadata.Part.InterfaceKey)) partItems[partName][Data.Models.Metadata.Part.InterfaceKey] = partItem.ReadString(Data.Models.Metadata.Part.InterfaceKey); @@ -767,7 +767,7 @@ namespace SabreTools.Metadata.DatFiles ClearEmptyKeys(romItem); // Get the data area name and skip if there's none - string? dataAreaName = dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey); + string? dataAreaName = dataArea.Name; if (dataAreaName is not null) { // Get existing data areas as a list @@ -775,7 +775,7 @@ namespace SabreTools.Metadata.DatFiles List dataAreas = [.. dataAreasArr]; // Find the existing disk area to append to, otherwise create a new disk area - int dataAreaIndex = dataAreas.FindIndex(da => da.ReadString(Data.Models.Metadata.DataArea.NameKey) == dataAreaName); + int dataAreaIndex = dataAreas.FindIndex(da => da.Name == dataAreaName); Data.Models.Metadata.DataArea aggregateDataArea; if (dataAreaIndex > -1) { @@ -785,7 +785,7 @@ namespace SabreTools.Metadata.DatFiles { aggregateDataArea = []; aggregateDataArea[Data.Models.Metadata.DataArea.EndiannessKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.EndiannessKey); - aggregateDataArea[Data.Models.Metadata.DataArea.NameKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.NameKey); + aggregateDataArea.Name = dataArea.Name; aggregateDataArea[Data.Models.Metadata.DataArea.SizeKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.SizeKey); aggregateDataArea[Data.Models.Metadata.DataArea.WidthKey] = dataArea.ReadString(Data.Models.Metadata.DataArea.WidthKey); } @@ -824,7 +824,7 @@ namespace SabreTools.Metadata.DatFiles ClearEmptyKeys(diskItem); // Get the disk area name and skip if there's none - string? diskAreaName = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey); + string? diskAreaName = diskArea.Name; if (diskAreaName is not null) { // Get existing disk areas as a list @@ -832,7 +832,7 @@ namespace SabreTools.Metadata.DatFiles List diskAreas = [.. diskAreasArr]; // Find the existing disk area to append to, otherwise create a new disk area - int diskAreaIndex = diskAreas.FindIndex(da => da.ReadString(Data.Models.Metadata.DiskArea.NameKey) == diskAreaName); + int diskAreaIndex = diskAreas.FindIndex(da => da.Name == diskAreaName); Data.Models.Metadata.DiskArea aggregateDiskArea; if (diskAreaIndex > -1) { @@ -841,7 +841,7 @@ namespace SabreTools.Metadata.DatFiles else { aggregateDiskArea = []; - aggregateDiskArea[Data.Models.Metadata.DiskArea.NameKey] = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey); + aggregateDiskArea.Name = diskArea.Name; } // Clear any empty fields @@ -983,7 +983,7 @@ namespace SabreTools.Metadata.DatFiles var dumpRom = new Data.Models.Metadata.Dump(); var rom = new Data.Models.Metadata.Rom(); - rom[Data.Models.Metadata.Rom.NameKey] = romItem.ReadString(Data.Models.Metadata.Rom.NameKey); + rom.Name = romItem.Name; rom[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey); rom[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType); rom[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey); @@ -1011,7 +1011,7 @@ namespace SabreTools.Metadata.DatFiles var dumpMegaRom = new Data.Models.Metadata.Dump(); var megaRom = new Data.Models.Metadata.Rom(); - megaRom[Data.Models.Metadata.Rom.NameKey] = romItem.ReadString(Data.Models.Metadata.Rom.NameKey); + megaRom.Name = romItem.Name; megaRom[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey); megaRom[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType); megaRom[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey); @@ -1039,7 +1039,7 @@ namespace SabreTools.Metadata.DatFiles var dumpSccPlusCart = new Data.Models.Metadata.Dump(); var sccPlusCart = new Data.Models.Metadata.Rom(); - sccPlusCart[Data.Models.Metadata.Rom.NameKey] = romItem.ReadString(Data.Models.Metadata.Rom.NameKey); + sccPlusCart.Name = romItem.Name; sccPlusCart[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey); sccPlusCart[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType); sccPlusCart[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey); diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs index f82fbb34..908e108d 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.cs @@ -95,7 +95,7 @@ namespace SabreTools.Metadata.DatFiles public void FillHeaderFromPath(string path, bool bare) { // Get the header strings - string? name = Header.ReadString(Data.Models.Metadata.Header.NameKey); + string? name = Header.Name; string? description = Header.ReadString(Data.Models.Metadata.Header.DescriptionKey); string? date = Header.ReadString(Data.Models.Metadata.Header.DateKey); @@ -129,7 +129,7 @@ namespace SabreTools.Metadata.DatFiles description = description?.Trim(); // Set the fields back - Header.Write(Data.Models.Metadata.Header.NameKey, name); + Header.Name = name; Header.Write(Data.Models.Metadata.Header.DescriptionKey, description); } diff --git a/SabreTools.Metadata.DatFiles/DatHeader.cs b/SabreTools.Metadata.DatFiles/DatHeader.cs index c61c7e1d..197387f6 100644 --- a/SabreTools.Metadata.DatFiles/DatHeader.cs +++ b/SabreTools.Metadata.DatFiles/DatHeader.cs @@ -31,6 +31,12 @@ namespace SabreTools.Metadata.DatFiles #region Fields + public string? Name + { + get => _internal.Name; + set => _internal.Name = value; + } + [JsonIgnore] public bool CanOpenSpecified { diff --git a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs index f80fa993..6dfa3f3a 100644 --- a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs +++ b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs @@ -356,7 +356,7 @@ namespace SabreTools.Metadata.DatItems.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new Blank(); @@ -430,7 +430,7 @@ namespace SabreTools.Metadata.DatItems.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new Rom(); datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF"); diff --git a/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs index 63372540..df8ff31b 100644 --- a/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs +++ b/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs @@ -14,7 +14,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test diskArea.SetName("XXXXXX"); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX"); + machine.SetName("XXXXXX"); Part part = new Part(); part.SetName("XXXXXX"); @@ -49,7 +49,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test DataArea? actualDataArea = actual.Read(Rom.DataAreaKey); Assert.NotNull(actualDataArea); - Assert.Equal("XXXXXX", actualDataArea.ReadString(Data.Models.Metadata.DataArea.NameKey)); + Assert.Equal("XXXXXX", actualDataArea.GetName()); Machine? actualMachine = actual.GetMachine(); Assert.NotNull(actualMachine); @@ -59,7 +59,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test Part? actualPart = actual.Read(Rom.PartKey); Assert.NotNull(actualPart); - Assert.Equal("XXXXXX", actualPart.ReadString(Data.Models.Metadata.Part.NameKey)); + Assert.Equal("XXXXXX", actualPart.GetName()); Source? actualSource = actual.Read(DatItem.SourceKey); Assert.NotNull(actualSource); @@ -254,7 +254,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new Disk(); datItem.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF"); diff --git a/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs index d31ccce8..70177d4f 100644 --- a/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs +++ b/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs @@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test public void ConvertToRomTest() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX"); + machine.SetName("XXXXXX"); Source source = new Source(0, "XXXXXX"); @@ -341,7 +341,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new File { diff --git a/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs index d2636b5f..5cab2483 100644 --- a/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs +++ b/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs @@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test public void ConvertToRomTest() { Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX"); + machine.SetName("XXXXXX"); Source source = new Source(0, "XXXXXX"); @@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new Media(); datItem.Write(Data.Models.Metadata.Media.MD5Key, "DEADBEEF"); diff --git a/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs index 704fb1a0..062f19d9 100644 --- a/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs +++ b/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs @@ -800,7 +800,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test Source source = new Source(0); Machine machine = new Machine(); - machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine"); + machine.SetName("Machine"); DatItem datItem = new Rom(); datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF"); diff --git a/SabreTools.Metadata.DatItems.Test/MachineTests.cs b/SabreTools.Metadata.DatItems.Test/MachineTests.cs index aced0ad8..c8922d83 100644 --- a/SabreTools.Metadata.DatItems.Test/MachineTests.cs +++ b/SabreTools.Metadata.DatItems.Test/MachineTests.cs @@ -1,3 +1,4 @@ +using SabreTools.Data.Extensions; using Xunit; namespace SabreTools.Metadata.DatItems.Test @@ -10,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Test public void CloneTest() { Machine item = new Machine(); - item.Write(Data.Models.Metadata.Machine.NameKey, "name"); + item.SetName("name"); object clone = item.Clone(); Machine? actual = clone as Machine; @@ -26,10 +27,10 @@ namespace SabreTools.Metadata.DatItems.Test public void GetInternalCloneTest() { Machine item = new Machine(); - item.Write(Data.Models.Metadata.Machine.NameKey, "name"); + item.SetName("name"); Data.Models.Metadata.Machine actual = item.GetInternalClone(); - Assert.Equal("name", actual[Data.Models.Metadata.Machine.NameKey]); + Assert.Equal("name", actual.GetName()); } #endregion @@ -60,10 +61,10 @@ namespace SabreTools.Metadata.DatItems.Test public void Equals_MismatchedInternal_False() { Machine self = new Machine(); - self.Write(Data.Models.Metadata.Machine.NameKey, "self"); + self.SetName("self"); Machine? other = new Machine(); - other.Write(Data.Models.Metadata.Machine.NameKey, "other"); + other.SetName("other"); bool actual = self.Equals(other); Assert.False(actual); @@ -73,10 +74,10 @@ namespace SabreTools.Metadata.DatItems.Test public void Equals_EqualInternal_True() { Machine self = new Machine(); - self.Write(Data.Models.Metadata.Machine.NameKey, "name"); + self.SetName("name"); Machine? other = new Machine(); - other.Write(Data.Models.Metadata.Machine.NameKey, "name"); + other.SetName("name"); bool actual = self.Equals(other); Assert.True(actual); diff --git a/SabreTools.Metadata.DatItems/Formats/Disk.cs b/SabreTools.Metadata.DatItems/Formats/Disk.cs index 14cefd9d..82753e3d 100644 --- a/SabreTools.Metadata.DatItems/Formats/Disk.cs +++ b/SabreTools.Metadata.DatItems/Formats/Disk.cs @@ -114,8 +114,8 @@ namespace SabreTools.Metadata.DatItems.Formats { var dataArea = new DataArea(); - string? diskAreaName = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey); - dataArea.Write(Data.Models.Metadata.DataArea.NameKey, diskAreaName); + string? diskAreaName = diskArea.GetName(); + dataArea.SetName(diskAreaName); rom.Write(Rom.DataAreaKey, dataArea); } diff --git a/SabreTools.Metadata.Filter.Test/FilterObjectTests.cs b/SabreTools.Metadata.Filter.Test/FilterObjectTests.cs index 34b96bf7..280b59eb 100644 --- a/SabreTools.Metadata.Filter.Test/FilterObjectTests.cs +++ b/SabreTools.Metadata.Filter.Test/FilterObjectTests.cs @@ -85,7 +85,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -94,7 +94,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -103,7 +103,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12345" }; + var sample = new Sample { Name = "12345" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -112,7 +112,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.345" }; + var sample = new Sample { Name = "12.345" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -121,7 +121,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -130,7 +130,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesEqual_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.Equals); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -152,7 +152,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -161,7 +161,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -170,7 +170,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12345" }; + var sample = new Sample { Name = "12345" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -179,7 +179,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.345" }; + var sample = new Sample { Name = "12.345" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -188,7 +188,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -197,7 +197,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesNotEqual_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.NotEquals); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -219,7 +219,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -228,7 +228,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -237,7 +237,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12346" }; + var sample = new Sample { Name = "12346" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -246,7 +246,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.346" }; + var sample = new Sample { Name = "12.346" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -255,7 +255,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -264,7 +264,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThan_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.GreaterThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -286,7 +286,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -295,7 +295,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -304,7 +304,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12346" }; + var sample = new Sample { Name = "12346" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -313,7 +313,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.346" }; + var sample = new Sample { Name = "12.346" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -322,7 +322,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -331,7 +331,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesGreaterThanOrEqual_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.GreaterThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -353,7 +353,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -362,7 +362,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -371,7 +371,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12344" }; + var sample = new Sample { Name = "12344" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -380,7 +380,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.344" }; + var sample = new Sample { Name = "12.344" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -389,7 +389,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -398,7 +398,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThan_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.LessThan); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -420,7 +420,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_NoValue() { - var sample = new Sample { [Sample.NameKey] = null }; + var sample = new Sample { Name = null }; FilterObject filterObject = new FilterObject("Sample.Name", null, Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -429,7 +429,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_BoolValue() { - var sample = new Sample { [Sample.NameKey] = "true" }; + var sample = new Sample { Name = "true" }; FilterObject filterObject = new FilterObject("Sample.Name", "yes", Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -438,7 +438,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_Int64Value() { - var sample = new Sample { [Sample.NameKey] = "12344" }; + var sample = new Sample { Name = "12344" }; FilterObject filterObject = new FilterObject("Sample.Name", "12345", Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -447,7 +447,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_DoubleValue() { - var sample = new Sample { [Sample.NameKey] = "12.344" }; + var sample = new Sample { Name = "12.344" }; FilterObject filterObject = new FilterObject("Sample.Name", "12.345", Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.True(actual); @@ -456,7 +456,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_RegexValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "^XXXXXX$", Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); @@ -465,7 +465,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void MatchesLessThanOrEqual_StringValue() { - var sample = new Sample { [Sample.NameKey] = "XXXXXX" }; + var sample = new Sample { Name = "XXXXXX" }; FilterObject filterObject = new FilterObject("Sample.Name", "XXXXXX", Operation.LessThanOrEqual); bool actual = filterObject.Matches(sample); Assert.False(actual); diff --git a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs index cfbaf684..23140ae1 100644 --- a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs +++ b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs @@ -121,7 +121,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void DatItem_Null_False() { - DatItem datItem = new Sample { [Sample.NameKey] = null }; + DatItem datItem = new Sample { Name = null }; bool actual = _filterRunner.Run(datItem); Assert.False(actual); } @@ -129,7 +129,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void DatItem_Empty_False() { - DatItem datItem = new Sample { [Sample.NameKey] = "" }; + DatItem datItem = new Sample { Name = "" }; bool actual = _filterRunner.Run(datItem); Assert.False(actual); } @@ -137,7 +137,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void DatItem_Incorrect_False() { - DatItem datItem = new Sample { [Sample.NameKey] = "NO_MATCH" }; + DatItem datItem = new Sample { Name = "NO_MATCH" }; bool actual = _filterRunner.Run(datItem); Assert.False(actual); } @@ -145,7 +145,7 @@ namespace SabreTools.Metadata.Filter.Test [Fact] public void DatItem_Correct_True() { - DatItem datItem = new Sample { [Sample.NameKey] = "name" }; + DatItem datItem = new Sample { Name = "name" }; bool actual = _filterRunner.Run(datItem); Assert.True(actual); } @@ -167,7 +167,7 @@ namespace SabreTools.Metadata.Filter.Test { DatItem datItem = new Rom { - [Rom.NameKey] = "name", + Name = "name", [Rom.CRCKey] = null, }; @@ -180,7 +180,7 @@ namespace SabreTools.Metadata.Filter.Test { DatItem datItem = new Rom { - [Rom.NameKey] = "name", + Name = "name", [Rom.CRCKey] = "", }; @@ -193,7 +193,7 @@ namespace SabreTools.Metadata.Filter.Test { DatItem datItem = new Rom { - [Rom.NameKey] = "name", + Name = "name", [Rom.CRCKey] = "NO_MATCH", }; @@ -206,7 +206,7 @@ namespace SabreTools.Metadata.Filter.Test { DatItem datItem = new Rom { - [Rom.NameKey] = "name", + Name = "name", [Rom.CRCKey] = "crc", }; diff --git a/SabreTools.Metadata.Filter/FilterObject.cs b/SabreTools.Metadata.Filter/FilterObject.cs index f0448b01..dcfca12c 100644 --- a/SabreTools.Metadata.Filter/FilterObject.cs +++ b/SabreTools.Metadata.Filter/FilterObject.cs @@ -77,12 +77,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesEqual(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return string.IsNullOrEmpty(Value); + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // If a null value is expected if (checkValue is null) return string.IsNullOrEmpty(Value); @@ -120,12 +132,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesNotEqual(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return !string.IsNullOrEmpty(Value); + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // If a null value is expected if (checkValue is null) return !string.IsNullOrEmpty(Value); @@ -163,12 +187,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesGreaterThan(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return false; + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // Null is always failure if (checkValue is null) return false; @@ -196,12 +232,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesGreaterThanOrEqual(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return false; + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // Null is always failure if (checkValue is null) return false; @@ -229,12 +277,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesLessThan(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return false; + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // Null is always failure if (checkValue is null) return false; @@ -262,12 +322,24 @@ namespace SabreTools.Metadata.Filter /// private bool MatchesLessThanOrEqual(DictionaryBase dictionaryBase) { - // If the key doesn't exist, we count it as null - if (!dictionaryBase.ContainsKey(Key.FieldName)) - return false; + // Some fields need unique handling + string? checkValue; + if (Key.FieldName == "name") + { + // TODO: Make this less awkward and hacky + checkValue = dictionaryBase.GetName(); + } + else + { + // If the key doesn't exist, we count it as null + if (!dictionaryBase.ContainsKey(Key.FieldName)) + return string.IsNullOrEmpty(Value); - // If the value in the dictionary is null - string? checkValue = dictionaryBase.ReadString(Key.FieldName); + // If the value in the dictionary is null + checkValue = dictionaryBase.ReadString(Key.FieldName); + } + + // Null is always failure if (checkValue is null) return false; diff --git a/SabreTools.Metadata.Test/DictionaryBaseExtensionsTests.cs b/SabreTools.Metadata.Test/DictionaryBaseExtensionsTests.cs index cf320aad..e6905167 100644 --- a/SabreTools.Metadata.Test/DictionaryBaseExtensionsTests.cs +++ b/SabreTools.Metadata.Test/DictionaryBaseExtensionsTests.cs @@ -23,14 +23,14 @@ namespace SabreTools.Metadata.Test DictionaryBase self = new Disk { [Disk.StatusKey] = "nodump", - [Disk.NameKey] = "XXXXXX", + Name = "XXXXXX", [Disk.MD5Key] = string.Empty, [Disk.SHA1Key] = string.Empty, }; DictionaryBase other = new Disk { [Disk.StatusKey] = "NODUMP", - [Disk.NameKey] = "XXXXXX", + Name = "XXXXXX", [Disk.MD5Key] = string.Empty, [Disk.SHA1Key] = string.Empty, }; @@ -44,13 +44,13 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Disk { - [Disk.NameKey] = "XXXXXX", + Name = "XXXXXX", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = string.Empty, }; DictionaryBase other = new Disk { - [Disk.NameKey] = "XXXXXX", + Name = "XXXXXX", [Disk.MD5Key] = string.Empty, [Disk.SHA1Key] = "XXXXXX", }; @@ -64,13 +64,13 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Disk { - [Disk.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = string.Empty, }; DictionaryBase other = new Disk { - [Disk.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = "XXXXXX", }; @@ -84,13 +84,13 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Disk { - [Disk.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Disk.MD5Key] = string.Empty, [Disk.SHA1Key] = "XXXXXX", }; DictionaryBase other = new Disk { - [Disk.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = "XXXXXX", }; @@ -104,13 +104,13 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Disk { - [Disk.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = "XXXXXX", }; DictionaryBase other = new Disk { - [Disk.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Disk.MD5Key] = "XXXXXX", [Disk.SHA1Key] = "XXXXXX", }; @@ -124,7 +124,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = "XXXXXX", @@ -132,7 +132,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = string.Empty, [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = string.Empty, @@ -148,7 +148,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = string.Empty, @@ -156,7 +156,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -172,7 +172,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = string.Empty, [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = string.Empty, @@ -180,7 +180,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -196,7 +196,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = string.Empty, [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = "XXXXXX", @@ -204,7 +204,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -220,7 +220,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = string.Empty, [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = string.Empty, @@ -228,7 +228,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -244,7 +244,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -252,7 +252,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Media { - [Media.NameKey] = "XXXXXX", + Name = "XXXXXX", [Media.MD5Key] = "XXXXXX", [Media.SHA1Key] = "XXXXXX", [Media.SHA256Key] = "XXXXXX", @@ -269,7 +269,7 @@ namespace SabreTools.Metadata.Test DictionaryBase self = new Rom { [Rom.StatusKey] = "nodump", - [Rom.NameKey] = "XXXXXX", + Name = "XXXXXX", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -288,7 +288,7 @@ namespace SabreTools.Metadata.Test DictionaryBase other = new Rom { [Rom.StatusKey] = "NODUMP", - [Rom.NameKey] = "XXXXXX", + Name = "XXXXXX", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -314,7 +314,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX", + Name = "XXXXXX", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = string.Empty, @@ -332,7 +332,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX", + Name = "XXXXXX", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = "XXXXXX", @@ -358,7 +358,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", [Rom.CRC64Key] = "XXXXXX", @@ -375,7 +375,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -401,7 +401,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -419,7 +419,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", [Rom.CRC64Key] = "XXXXXX", @@ -444,7 +444,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = string.Empty, @@ -462,7 +462,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -488,7 +488,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = "XXXXXX", @@ -506,7 +506,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -532,7 +532,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -550,7 +550,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -576,7 +576,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -594,7 +594,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -620,7 +620,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -638,7 +638,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -664,7 +664,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -682,7 +682,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -708,7 +708,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -726,7 +726,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -752,7 +752,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -770,7 +770,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -796,7 +796,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -814,7 +814,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -840,7 +840,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -858,7 +858,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -884,7 +884,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -902,7 +902,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -928,7 +928,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -946,7 +946,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -972,7 +972,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = string.Empty, [Rom.CRCKey] = string.Empty, @@ -990,7 +990,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -1016,7 +1016,7 @@ namespace SabreTools.Metadata.Test { DictionaryBase self = new Rom { - [Rom.NameKey] = "XXXXXX1", + Name = "XXXXXX1", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", @@ -1034,7 +1034,7 @@ namespace SabreTools.Metadata.Test }; DictionaryBase other = new Rom { - [Rom.NameKey] = "XXXXXX2", + Name = "XXXXXX2", [Rom.SizeKey] = 12345, [Rom.CRC16Key] = "XXXXXX", [Rom.CRCKey] = "XXXXXX", diff --git a/SabreTools.Metadata/DictionaryBaseExtensions.cs b/SabreTools.Metadata/DictionaryBaseExtensions.cs index 0fe77c02..04466666 100644 --- a/SabreTools.Metadata/DictionaryBaseExtensions.cs +++ b/SabreTools.Metadata/DictionaryBaseExtensions.cs @@ -55,6 +55,10 @@ namespace SabreTools.Metadata if (!selfKeys.SetEquals(otherKeys)) return false; + // Check names + if (self.GetName() != other.GetName()) + return false; + // Check all pairs to see if they're equal foreach (var kvp in self) { @@ -175,8 +179,8 @@ namespace SabreTools.Metadata string? selfStatus = self.ReadString(Disk.StatusKey); string? otherStatus = other.ReadString(Disk.StatusKey); - string? selfName = self.ReadString(Disk.NameKey); - string? otherName = other.ReadString(Disk.NameKey); + string? selfName = self.Name; + string? otherName = other.Name; // If all hashes are empty but they're both nodump and the names match, then they're dupes if (string.Equals(selfStatus, "nodump", StringComparison.OrdinalIgnoreCase) @@ -217,8 +221,8 @@ namespace SabreTools.Metadata string? selfStatus = self.ReadString(Rom.StatusKey); string? otherStatus = other.ReadString(Rom.StatusKey); - string? selfName = self.ReadString(Rom.NameKey); - string? otherName = other.ReadString(Rom.NameKey); + string? selfName = self.Name; + string? otherName = other.Name; long? selfSize = self.ReadLong(Rom.SizeKey); long? otherSize = other.ReadLong(Rom.SizeKey); diff --git a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs index ea09cc81..f194e1f0 100644 --- a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs @@ -44,7 +44,7 @@ namespace SabreTools.Serialization.CrossModel { var file = new File { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Source = item.ReadString(Data.Models.Metadata.Rom.SourceKey), BitTorrentMagnetHash = item.ReadString(Data.Models.Metadata.Rom.BitTorrentMagnetHashKey), LastModifiedTime = item.ReadString(Data.Models.Metadata.Rom.LastModifiedTimeKey), diff --git a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs index 815abf05..21fdf3f4 100644 --- a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs @@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = "archive.org", + Name = "archive.org", }; return header; } @@ -61,7 +61,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SourceKey] = item.Source, [Data.Models.Metadata.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash, [Data.Models.Metadata.Rom.LastModifiedTimeKey] = item.LastModifiedTime, diff --git a/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs index 533f8e97..9019ffbf 100644 --- a/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs @@ -57,8 +57,8 @@ namespace SabreTools.Serialization.CrossModel { var row = new Row { - Name = parent.ReadString(Data.Models.Metadata.Machine.NameKey), - Title = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = parent.Name, + Title = item.Name, Emulator = parent.ReadString(Data.Models.Metadata.Machine.EmulatorKey), CloneOf = parent.ReadString(Data.Models.Metadata.Machine.CloneOfKey), Year = parent.ReadString(Data.Models.Metadata.Machine.YearKey), diff --git a/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs index 3f8188d2..1ae5ab1e 100644 --- a/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs @@ -47,7 +47,7 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Machine.EmulatorKey] = item.Emulator, [Data.Models.Metadata.Machine.CloneOfKey] = item.CloneOf, [Data.Models.Metadata.Machine.YearKey] = item.Year, @@ -77,7 +77,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Title, + Name = item.Title, [Data.Models.Metadata.Rom.AltRomnameKey] = item.AltRomname, [Data.Models.Metadata.Rom.AltTitleKey] = item.AltTitle, [Data.Models.Metadata.Rom.FileIsAvailableKey] = item.FileIsAvailable, diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs index 362085a1..cb198879 100644 --- a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs @@ -43,7 +43,7 @@ namespace SabreTools.Serialization.CrossModel { var clrMamePro = new Data.Models.ClrMamePro.ClrMamePro { - Name = item.ReadString(Data.Models.Metadata.Header.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), RootDir = item.ReadString(Data.Models.Metadata.Header.RootDirKey), Category = item.ReadString(Data.Models.Metadata.Header.CategoryKey), @@ -69,7 +69,7 @@ namespace SabreTools.Serialization.CrossModel { GameBase gameBase = game ? new Game() : new Machine(); - gameBase.Name = item.ReadString(Data.Models.Metadata.Machine.NameKey); + gameBase.Name = item.Name; gameBase.Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey); // gameBase.DriverStatus = item.ReadString(Data.Models.Metadata.Machine.DriverKey); // TODO: Needs metadata mapping gameBase.Year = item.ReadString(Data.Models.Metadata.Machine.YearKey); @@ -141,7 +141,7 @@ namespace SabreTools.Serialization.CrossModel { var archive = new Archive { - Name = item.ReadString(Data.Models.Metadata.Archive.NameKey), + Name = item.Name, }; return archive; } @@ -153,7 +153,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new BiosSet { - Name = item.ReadString(Data.Models.Metadata.BiosSet.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), Default = item.ReadString(Data.Models.Metadata.BiosSet.DefaultKey), }; @@ -168,7 +168,7 @@ namespace SabreTools.Serialization.CrossModel var chip = new Chip { Type = item.ReadString(Data.Models.Metadata.Chip.ChipTypeKey), - Name = item.ReadString(Data.Models.Metadata.Chip.NameKey), + Name = item.Name, Flags = item.ReadString(Data.Models.Metadata.Chip.FlagsKey), Clock = item.ReadString(Data.Models.Metadata.Chip.ClockKey), }; @@ -182,7 +182,7 @@ namespace SabreTools.Serialization.CrossModel { var dipswitch = new DipSwitch { - Name = item.ReadString(Data.Models.Metadata.DipSwitch.NameKey), + Name = item.Name, Entry = item[Data.Models.Metadata.DipSwitch.EntryKey] as string[], Default = item.ReadString(Data.Models.Metadata.DipSwitch.DefaultKey), }; @@ -196,7 +196,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Disk { - Name = item.ReadString(Data.Models.Metadata.Disk.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key), Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey), @@ -246,7 +246,7 @@ namespace SabreTools.Serialization.CrossModel { var media = new Media { - Name = item.ReadString(Data.Models.Metadata.Media.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Media.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Media.SHA1Key), SHA256 = item.ReadString(Data.Models.Metadata.Media.SHA256Key), @@ -262,7 +262,7 @@ namespace SabreTools.Serialization.CrossModel { var release = new Release { - Name = item.ReadString(Data.Models.Metadata.Release.NameKey), + Name = item.Name, Region = item.ReadString(Data.Models.Metadata.Release.RegionKey), Language = item.ReadString(Data.Models.Metadata.Release.LanguageKey), Date = item.ReadString(Data.Models.Metadata.Release.DateKey), @@ -278,7 +278,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Rom { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), @@ -316,7 +316,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Sample { - Name = item.ReadString(Data.Models.Metadata.Sample.NameKey), + Name = item.Name, }; return sample; } diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs index ec3f209c..0c2f1399 100644 --- a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs @@ -35,7 +35,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Header.DescriptionKey] = item.Description, [Data.Models.Metadata.Header.RootDirKey] = item.RootDir, [Data.Models.Metadata.Header.CategoryKey] = item.Category, @@ -64,7 +64,7 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, // [Data.Models.Metadata.Machine.DriverKey] = item.DriverStatus, // TODO: Needs metadata mapping [Data.Models.Metadata.Machine.YearKey] = item.Year, @@ -154,7 +154,7 @@ namespace SabreTools.Serialization.CrossModel { var archive = new Data.Models.Metadata.Archive { - [Data.Models.Metadata.Archive.NameKey] = item.Name, + Name = item.Name, }; return archive; } @@ -166,7 +166,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new Data.Models.Metadata.BiosSet { - [Data.Models.Metadata.BiosSet.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, [Data.Models.Metadata.BiosSet.DefaultKey] = item.Default, }; @@ -181,7 +181,7 @@ namespace SabreTools.Serialization.CrossModel var chip = new Data.Models.Metadata.Chip { [Data.Models.Metadata.Chip.ChipTypeKey] = item.Type, - [Data.Models.Metadata.Chip.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Chip.FlagsKey] = item.Flags, [Data.Models.Metadata.Chip.ClockKey] = item.Clock, }; @@ -195,7 +195,7 @@ namespace SabreTools.Serialization.CrossModel { var dipswitch = new Data.Models.Metadata.DipSwitch { - [Data.Models.Metadata.DipSwitch.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipSwitch.EntryKey] = item.Entry, [Data.Models.Metadata.DipSwitch.DefaultKey] = item.Default, }; @@ -209,7 +209,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, [Data.Models.Metadata.Disk.MergeKey] = item.Merge, @@ -259,7 +259,7 @@ namespace SabreTools.Serialization.CrossModel { var media = new Data.Models.Metadata.Media { - [Data.Models.Metadata.Media.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Media.MD5Key] = item.MD5, [Data.Models.Metadata.Media.SHA1Key] = item.SHA1, [Data.Models.Metadata.Media.SHA256Key] = item.SHA256, @@ -275,7 +275,7 @@ namespace SabreTools.Serialization.CrossModel { var release = new Data.Models.Metadata.Release { - [Data.Models.Metadata.Release.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Release.RegionKey] = item.Region, [Data.Models.Metadata.Release.LanguageKey] = item.Language, [Data.Models.Metadata.Release.DateKey] = item.Date, @@ -291,7 +291,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRC16Key] = item.CRC16, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, @@ -329,7 +329,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Data.Models.Metadata.Sample { - [Data.Models.Metadata.Sample.NameKey] = item.Name, + Name = item.Name, }; return sample; } diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs index a73db67f..8e3f3259 100644 --- a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs @@ -31,7 +31,7 @@ namespace SabreTools.Serialization.CrossModel { var dosCenter = new Data.Models.DosCenter.DosCenter { - Name = item.ReadString(Data.Models.Metadata.Header.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), Version = item.ReadString(Data.Models.Metadata.Header.VersionKey), Date = item.ReadString(Data.Models.Metadata.Header.DateKey), @@ -49,7 +49,7 @@ namespace SabreTools.Serialization.CrossModel { var game = new Game { - Name = item.ReadString(Data.Models.Metadata.Machine.NameKey), + Name = item.Name, }; var roms = item.Read(Data.Models.Metadata.Machine.RomKey); @@ -66,7 +66,7 @@ namespace SabreTools.Serialization.CrossModel { var file = new File { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key), diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs index c800e016..1342d1ec 100644 --- a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs @@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Header.DescriptionKey] = item.Description, [Data.Models.Metadata.Header.VersionKey] = item.Version, [Data.Models.Metadata.Header.DateKey] = item.Date, @@ -50,7 +50,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Name, + Name = item.Name, }; if (item.File is not null && item.File.Length > 0) @@ -69,7 +69,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1, diff --git a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs index 44e097f9..bbb8bf43 100644 --- a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs @@ -46,7 +46,7 @@ namespace SabreTools.Serialization.CrossModel var row = new Row { SHA256 = item.ReadString(Data.Models.Metadata.Rom.SHA256Key), - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key), MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key), CRC32 = item.ReadString(Data.Models.Metadata.Rom.CRCKey), diff --git a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs index dccf6ccd..89b6f060 100644 --- a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs @@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = "Everdrive SMDB", + Name = "Everdrive SMDB", }; return header; } @@ -57,7 +57,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SHA256Key] = item.SHA256, - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1, [Data.Models.Metadata.Rom.MD5Key] = item.MD5, [Data.Models.Metadata.Rom.CRCKey] = item.CRC32, diff --git a/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs index 07f63d7c..708360e6 100644 --- a/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs @@ -146,7 +146,7 @@ namespace SabreTools.Serialization.CrossModel var md2 = new MD2 { Hash = item.ReadString(Data.Models.Metadata.Rom.MD2Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return md2; } @@ -159,7 +159,7 @@ namespace SabreTools.Serialization.CrossModel var md4 = new MD4 { Hash = item.ReadString(Data.Models.Metadata.Rom.MD4Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return md4; } @@ -172,7 +172,7 @@ namespace SabreTools.Serialization.CrossModel var md5 = new MD5 { Hash = item.ReadString(Data.Models.Metadata.Rom.MD5Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return md5; } @@ -185,7 +185,7 @@ namespace SabreTools.Serialization.CrossModel var ripemd128 = new RIPEMD128 { Hash = item.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return ripemd128; } @@ -198,7 +198,7 @@ namespace SabreTools.Serialization.CrossModel var ripemd160 = new RIPEMD160 { Hash = item.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return ripemd160; } @@ -210,7 +210,7 @@ namespace SabreTools.Serialization.CrossModel { var sfv = new SFV { - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, Hash = item.ReadString(Data.Models.Metadata.Rom.CRCKey), }; return sfv; @@ -224,7 +224,7 @@ namespace SabreTools.Serialization.CrossModel var sha1 = new SHA1 { Hash = item.ReadString(Data.Models.Metadata.Rom.SHA1Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return sha1; } @@ -237,7 +237,7 @@ namespace SabreTools.Serialization.CrossModel var sha256 = new SHA256 { Hash = item.ReadString(Data.Models.Metadata.Rom.SHA256Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return sha256; } @@ -250,7 +250,7 @@ namespace SabreTools.Serialization.CrossModel var sha384 = new SHA384 { Hash = item.ReadString(Data.Models.Metadata.Rom.SHA384Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return sha384; } @@ -263,7 +263,7 @@ namespace SabreTools.Serialization.CrossModel var sha512 = new SHA512 { Hash = item.ReadString(Data.Models.Metadata.Rom.SHA512Key), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return sha512; } @@ -276,7 +276,7 @@ namespace SabreTools.Serialization.CrossModel var spamsum = new SpamSum { Hash = item.ReadString(Data.Models.Metadata.Rom.SpamSumKey), - File = item.ReadString(Data.Models.Metadata.Rom.NameKey), + File = item.Name, }; return spamsum; } diff --git a/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs index 4d79740a..49b86282 100644 --- a/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs @@ -29,7 +29,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = "Hashfile", + Name = "Hashfile", }; return header; } @@ -75,7 +75,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.MD2Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -88,7 +88,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.MD4Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.MD5Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -114,7 +114,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.RIPEMD128Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -127,7 +127,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.RIPEMD160Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -139,7 +139,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, [Data.Models.Metadata.Rom.CRCKey] = item.Hash, }; return rom; @@ -153,7 +153,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SHA1Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -166,7 +166,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SHA256Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -179,7 +179,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SHA384Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -192,7 +192,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SHA512Key] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } @@ -205,7 +205,7 @@ namespace SabreTools.Serialization.CrossModel var rom = new Data.Models.Metadata.Rom { [Data.Models.Metadata.Rom.SpamSumKey] = item.Hash, - [Data.Models.Metadata.Rom.NameKey] = item.File, + Name = item.File, }; return rom; } diff --git a/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs index 0e0bb551..ac5806ef 100644 --- a/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs @@ -28,9 +28,9 @@ namespace SabreTools.Serialization.CrossModel { var set = new Set(); if (item.ReadString(Data.Models.Metadata.Machine.IsDeviceKey) == "yes") - set.Device = item.ReadString(Data.Models.Metadata.Machine.NameKey); + set.Device = item.Name; else - set.Driver = item.ReadString(Data.Models.Metadata.Machine.NameKey); + set.Driver = item.Name; var rowItems = new List(); @@ -55,7 +55,7 @@ namespace SabreTools.Serialization.CrossModel { var row = new Row { - Name = item.ReadString(Data.Models.Metadata.Disk.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key), }; @@ -75,7 +75,7 @@ namespace SabreTools.Serialization.CrossModel { var row = new Row { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key), diff --git a/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs index c049bad1..86844857 100644 --- a/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs @@ -33,7 +33,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = "MAME Listrom", + Name = "MAME Listrom", }; return header; } @@ -46,12 +46,12 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine(); if (!string.IsNullOrEmpty(item.Device)) { - machine[Data.Models.Metadata.Machine.NameKey] = item.Device; + machine.Name = item.Device; machine[Data.Models.Metadata.Machine.IsDeviceKey] = "yes"; } else { - machine[Data.Models.Metadata.Machine.NameKey] = item.Driver; + machine.Name = item.Driver; } if (item.Row is not null && item.Row.Length > 0) @@ -83,7 +83,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, }; @@ -99,7 +99,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1, diff --git a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs index af9978f6..3064aaa2 100644 --- a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs @@ -43,7 +43,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Machine { - Name = item.ReadString(Data.Models.Metadata.Machine.NameKey), + Name = item.Name, SourceFile = item.ReadString(Data.Models.Metadata.Machine.SourceFileKey), IsBios = item.ReadString(Data.Models.Metadata.Machine.IsBiosKey), IsDevice = item.ReadString(Data.Models.Metadata.Machine.IsDeviceKey), @@ -148,7 +148,7 @@ namespace SabreTools.Serialization.CrossModel { var adjuster = new Adjuster { - Name = item.ReadString(Data.Models.Metadata.Adjuster.NameKey), + Name = item.Name, Default = item.ReadString(Data.Models.Metadata.Adjuster.DefaultKey), }; @@ -178,7 +178,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new BiosSet { - Name = item.ReadString(Data.Models.Metadata.BiosSet.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), Default = item.ReadString(Data.Models.Metadata.BiosSet.DefaultKey), }; @@ -192,7 +192,7 @@ namespace SabreTools.Serialization.CrossModel { var chip = new Chip { - Name = item.ReadString(Data.Models.Metadata.Chip.NameKey), + Name = item.Name, Tag = item.ReadString(Data.Models.Metadata.Chip.TagKey), Type = item.ReadString(Data.Models.Metadata.Chip.ChipTypeKey), SoundOnly = item.ReadString(Data.Models.Metadata.Chip.SoundOnlyKey), @@ -223,7 +223,7 @@ namespace SabreTools.Serialization.CrossModel { var configuration = new Configuration { - Name = item.ReadString(Data.Models.Metadata.Configuration.NameKey), + Name = item.Name, Tag = item.ReadString(Data.Models.Metadata.Configuration.TagKey), Mask = item.ReadString(Data.Models.Metadata.Configuration.MaskKey), }; @@ -250,7 +250,7 @@ namespace SabreTools.Serialization.CrossModel { var confLocation = new ConfLocation { - Name = item.ReadString(Data.Models.Metadata.ConfLocation.NameKey), + Name = item.Name, Number = item.ReadString(Data.Models.Metadata.ConfLocation.NumberKey), Inverted = item.ReadString(Data.Models.Metadata.ConfLocation.InvertedKey), }; @@ -264,7 +264,7 @@ namespace SabreTools.Serialization.CrossModel { var confSetting = new ConfSetting { - Name = item.ReadString(Data.Models.Metadata.ConfSetting.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.ConfSetting.ValueKey), Default = item.ReadString(Data.Models.Metadata.ConfSetting.DefaultKey), }; @@ -331,7 +331,7 @@ namespace SabreTools.Serialization.CrossModel { var deviceRef = new DeviceRef { - Name = item.ReadString(Data.Models.Metadata.DeviceRef.NameKey), + Name = item.Name, }; return deviceRef; } @@ -343,7 +343,7 @@ namespace SabreTools.Serialization.CrossModel { var dipLocation = new DipLocation { - Name = item.ReadString(Data.Models.Metadata.DipLocation.NameKey), + Name = item.Name, Number = item.ReadString(Data.Models.Metadata.DipLocation.NumberKey), Inverted = item.ReadString(Data.Models.Metadata.DipLocation.InvertedKey), }; @@ -357,7 +357,7 @@ namespace SabreTools.Serialization.CrossModel { var dipSwitch = new DipSwitch { - Name = item.ReadString(Data.Models.Metadata.DipSwitch.NameKey), + Name = item.Name, Tag = item.ReadString(Data.Models.Metadata.DipSwitch.TagKey), Mask = item.ReadString(Data.Models.Metadata.DipSwitch.MaskKey), }; @@ -384,7 +384,7 @@ namespace SabreTools.Serialization.CrossModel { var dipValue = new DipValue { - Name = item.ReadString(Data.Models.Metadata.DipValue.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.DipValue.ValueKey), Default = item.ReadString(Data.Models.Metadata.DipValue.DefaultKey), }; @@ -403,7 +403,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Disk { - Name = item.ReadString(Data.Models.Metadata.Disk.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key), Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey), @@ -470,7 +470,7 @@ namespace SabreTools.Serialization.CrossModel { var extension = new Extension { - Name = item.ReadString(Data.Models.Metadata.Extension.NameKey), + Name = item.Name, }; return extension; } @@ -521,7 +521,7 @@ namespace SabreTools.Serialization.CrossModel { var instance = new Instance { - Name = item.ReadString(Data.Models.Metadata.Instance.NameKey), + Name = item.Name, BriefName = item.ReadString(Data.Models.Metadata.Instance.BriefNameKey), }; return instance; @@ -551,7 +551,7 @@ namespace SabreTools.Serialization.CrossModel { var ramOption = new RamOption { - Name = item.ReadString(Data.Models.Metadata.RamOption.NameKey), + Name = item.Name, Default = item.ReadString(Data.Models.Metadata.RamOption.DefaultKey), Content = item.ReadString(Data.Models.Metadata.RamOption.ContentKey), }; @@ -565,7 +565,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Rom { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Bios = item.ReadString(Data.Models.Metadata.Rom.BiosKey), Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), @@ -588,7 +588,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Sample { - Name = item.ReadString(Data.Models.Metadata.Sample.NameKey), + Name = item.Name, }; return sample; } @@ -600,7 +600,7 @@ namespace SabreTools.Serialization.CrossModel { var slot = new Slot { - Name = item.ReadString(Data.Models.Metadata.Slot.NameKey), + Name = item.Name, }; var slotOptions = item.Read(Data.Models.Metadata.Slot.SlotOptionKey); @@ -617,7 +617,7 @@ namespace SabreTools.Serialization.CrossModel { var slotOption = new SlotOption { - Name = item.ReadString(Data.Models.Metadata.SlotOption.NameKey), + Name = item.Name, DevName = item.ReadString(Data.Models.Metadata.SlotOption.DevNameKey), Default = item.ReadString(Data.Models.Metadata.SlotOption.DefaultKey), }; @@ -632,7 +632,7 @@ namespace SabreTools.Serialization.CrossModel var softwareList = new Data.Models.Listxml.SoftwareList { Tag = item.ReadString(Data.Models.Metadata.SoftwareList.TagKey), - Name = item.ReadString(Data.Models.Metadata.SoftwareList.NameKey), + Name = item.Name, Status = item.ReadString(Data.Models.Metadata.SoftwareList.StatusKey), Filter = item.ReadString(Data.Models.Metadata.SoftwareList.FilterKey), }; diff --git a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs index d4173c4f..2769f63c 100644 --- a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs @@ -46,7 +46,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Machine.SourceFileKey] = item.SourceFile, [Data.Models.Metadata.Machine.IsBiosKey] = item.IsBios, [Data.Models.Metadata.Machine.IsDeviceKey] = item.IsDevice, @@ -182,7 +182,7 @@ namespace SabreTools.Serialization.CrossModel { var adjuster = new Data.Models.Metadata.Adjuster { - [Data.Models.Metadata.Adjuster.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Adjuster.DefaultKey] = item.Default, }; @@ -211,7 +211,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new Data.Models.Metadata.BiosSet { - [Data.Models.Metadata.BiosSet.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, [Data.Models.Metadata.BiosSet.DefaultKey] = item.Default, }; @@ -225,7 +225,7 @@ namespace SabreTools.Serialization.CrossModel { var chip = new Data.Models.Metadata.Chip { - [Data.Models.Metadata.Chip.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Chip.TagKey] = item.Tag, [Data.Models.Metadata.Chip.ChipTypeKey] = item.Type, [Data.Models.Metadata.Chip.SoundOnlyKey] = item.SoundOnly, @@ -256,7 +256,7 @@ namespace SabreTools.Serialization.CrossModel { var configuration = new Data.Models.Metadata.Configuration { - [Data.Models.Metadata.Configuration.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Configuration.TagKey] = item.Tag, [Data.Models.Metadata.Configuration.MaskKey] = item.Mask, }; @@ -286,7 +286,7 @@ namespace SabreTools.Serialization.CrossModel { var confLocation = new Data.Models.Metadata.ConfLocation { - [Data.Models.Metadata.ConfLocation.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.ConfLocation.NumberKey] = item.Number, [Data.Models.Metadata.ConfLocation.InvertedKey] = item.Inverted, }; @@ -300,7 +300,7 @@ namespace SabreTools.Serialization.CrossModel { var confSetting = new Data.Models.Metadata.ConfSetting { - [Data.Models.Metadata.ConfSetting.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.ConfSetting.ValueKey] = item.Value, [Data.Models.Metadata.ConfSetting.DefaultKey] = item.Default, }; @@ -367,7 +367,7 @@ namespace SabreTools.Serialization.CrossModel { var deviceRef = new Data.Models.Metadata.DeviceRef { - [Data.Models.Metadata.DeviceRef.NameKey] = item.Name, + Name = item.Name, }; return deviceRef; } @@ -379,7 +379,7 @@ namespace SabreTools.Serialization.CrossModel { var dipLocation = new Data.Models.Metadata.DipLocation { - [Data.Models.Metadata.DipLocation.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipLocation.NumberKey] = item.Number, [Data.Models.Metadata.DipLocation.InvertedKey] = item.Inverted, }; @@ -393,7 +393,7 @@ namespace SabreTools.Serialization.CrossModel { var dipSwitch = new Data.Models.Metadata.DipSwitch { - [Data.Models.Metadata.DipSwitch.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipSwitch.TagKey] = item.Tag, [Data.Models.Metadata.DipSwitch.MaskKey] = item.Mask, }; @@ -423,7 +423,7 @@ namespace SabreTools.Serialization.CrossModel { var dipValue = new Data.Models.Metadata.DipValue { - [Data.Models.Metadata.DipValue.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipValue.ValueKey] = item.Value, [Data.Models.Metadata.DipValue.DefaultKey] = item.Default, }; @@ -441,7 +441,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, [Data.Models.Metadata.Disk.MergeKey] = item.Merge, @@ -508,7 +508,7 @@ namespace SabreTools.Serialization.CrossModel { var extension = new Data.Models.Metadata.Extension { - [Data.Models.Metadata.Extension.NameKey] = item.Name, + Name = item.Name, }; return extension; } @@ -558,7 +558,7 @@ namespace SabreTools.Serialization.CrossModel { var instance = new Data.Models.Metadata.Instance { - [Data.Models.Metadata.Instance.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Instance.BriefNameKey] = item.BriefName, }; return instance; @@ -590,7 +590,7 @@ namespace SabreTools.Serialization.CrossModel { var ramOption = new Data.Models.Metadata.RamOption { - [Data.Models.Metadata.RamOption.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.RamOption.DefaultKey] = item.Default, [Data.Models.Metadata.RamOption.ContentKey] = item.Content, }; @@ -604,7 +604,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.BiosKey] = item.Bios, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, @@ -627,7 +627,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Data.Models.Metadata.Sample { - [Data.Models.Metadata.Sample.NameKey] = item.Name, + Name = item.Name, }; return sample; } @@ -639,7 +639,7 @@ namespace SabreTools.Serialization.CrossModel { var slot = new Data.Models.Metadata.Slot { - [Data.Models.Metadata.Slot.NameKey] = item.Name, + Name = item.Name, }; if (item.SlotOption is not null && item.SlotOption.Length > 0) @@ -658,7 +658,7 @@ namespace SabreTools.Serialization.CrossModel { var slotOption = new Data.Models.Metadata.SlotOption { - [Data.Models.Metadata.SlotOption.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.SlotOption.DevNameKey] = item.DevName, [Data.Models.Metadata.SlotOption.DefaultKey] = item.Default, }; @@ -673,7 +673,7 @@ namespace SabreTools.Serialization.CrossModel var softwareList = new Data.Models.Metadata.SoftwareList { [Data.Models.Metadata.SoftwareList.TagKey] = item.Tag, - [Data.Models.Metadata.SoftwareList.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.SoftwareList.StatusKey] = item.Status, [Data.Models.Metadata.SoftwareList.FilterKey] = item.Filter, }; diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs index c04ee6b4..8ded8f42 100644 --- a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs @@ -42,7 +42,7 @@ namespace SabreTools.Serialization.CrossModel var header = new Header { Id = item.ReadString(Data.Models.Metadata.Header.IdKey), - Name = item.ReadString(Data.Models.Metadata.Header.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), RootDir = item.ReadString(Data.Models.Metadata.Header.RootDirKey), Category = item.ReadString(Data.Models.Metadata.Header.CategoryKey), @@ -120,7 +120,7 @@ namespace SabreTools.Serialization.CrossModel { GameBase gameBase = game ? new Game() : new Machine(); - gameBase.Name = item.ReadString(Data.Models.Metadata.Machine.NameKey); + gameBase.Name = item.Name; gameBase.SourceFile = item.ReadString(Data.Models.Metadata.Machine.SourceFileKey); gameBase.IsBios = item.ReadString(Data.Models.Metadata.Machine.IsBiosKey); gameBase.IsDevice = item.ReadString(Data.Models.Metadata.Machine.IsDeviceKey); @@ -194,7 +194,7 @@ namespace SabreTools.Serialization.CrossModel { var archive = new Archive { - Name = item.ReadString(Data.Models.Metadata.Archive.NameKey), + Name = item.Name, }; return archive; } @@ -206,7 +206,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new BiosSet { - Name = item.ReadString(Data.Models.Metadata.BiosSet.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey), Default = item.ReadString(Data.Models.Metadata.BiosSet.DefaultKey), }; @@ -220,7 +220,7 @@ namespace SabreTools.Serialization.CrossModel { var deviceRef = new DeviceRef { - Name = item.ReadString(Data.Models.Metadata.DipSwitch.NameKey), + Name = item.Name, }; return deviceRef; } @@ -232,7 +232,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Disk { - Name = item.ReadString(Data.Models.Metadata.Disk.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key), Merge = item.ReadString(Data.Models.Metadata.Disk.MergeKey), @@ -268,7 +268,7 @@ namespace SabreTools.Serialization.CrossModel { var media = new Media { - Name = item.ReadString(Data.Models.Metadata.Media.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Media.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Media.SHA1Key), SHA256 = item.ReadString(Data.Models.Metadata.Media.SHA256Key), @@ -284,7 +284,7 @@ namespace SabreTools.Serialization.CrossModel { var release = new Release { - Name = item.ReadString(Data.Models.Metadata.Release.NameKey), + Name = item.Name, Region = item.ReadString(Data.Models.Metadata.Release.RegionKey), Language = item.ReadString(Data.Models.Metadata.Release.LanguageKey), Date = item.ReadString(Data.Models.Metadata.Release.DateKey), @@ -300,7 +300,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Rom { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), @@ -335,7 +335,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Sample { - Name = item.ReadString(Data.Models.Metadata.Sample.NameKey), + Name = item.Name, }; return sample; } @@ -348,7 +348,7 @@ namespace SabreTools.Serialization.CrossModel var softwareList = new Data.Models.Logiqx.SoftwareList { Tag = item.ReadString(Data.Models.Metadata.SoftwareList.TagKey), - Name = item.ReadString(Data.Models.Metadata.SoftwareList.NameKey), + Name = item.Name, Status = item.ReadString(Data.Models.Metadata.SoftwareList.StatusKey), Filter = item.ReadString(Data.Models.Metadata.SoftwareList.FilterKey), }; diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs index 316c3d77..33ed2d0b 100644 --- a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs @@ -54,7 +54,7 @@ namespace SabreTools.Serialization.CrossModel var header = new Data.Models.Metadata.Header { [Data.Models.Metadata.Header.IdKey] = item.Id, - [Data.Models.Metadata.Header.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Header.DescriptionKey] = item.Description, [Data.Models.Metadata.Header.RootDirKey] = item.RootDir, [Data.Models.Metadata.Header.CategoryKey] = item.Category, @@ -126,7 +126,7 @@ namespace SabreTools.Serialization.CrossModel var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = machineName, + Name = machineName, [Data.Models.Metadata.Machine.SourceFileKey] = item.SourceFile, [Data.Models.Metadata.Machine.IsBiosKey] = item.IsBios, [Data.Models.Metadata.Machine.IsDeviceKey] = item.IsDevice, @@ -188,7 +188,7 @@ namespace SabreTools.Serialization.CrossModel { var archive = new Data.Models.Metadata.Archive { - [Data.Models.Metadata.Archive.NameKey] = item.Name, + Name = item.Name, }; return archive; } @@ -200,7 +200,7 @@ namespace SabreTools.Serialization.CrossModel { var biosset = new Data.Models.Metadata.BiosSet { - [Data.Models.Metadata.BiosSet.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.BiosSet.DescriptionKey] = item.Description, [Data.Models.Metadata.BiosSet.DefaultKey] = item.Default, }; @@ -214,7 +214,7 @@ namespace SabreTools.Serialization.CrossModel { var deviceRef = new Data.Models.Metadata.DeviceRef { - [Data.Models.Metadata.DeviceRef.NameKey] = item.Name, + Name = item.Name, }; return deviceRef; } @@ -226,7 +226,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, [Data.Models.Metadata.Disk.MergeKey] = item.Merge, @@ -262,7 +262,7 @@ namespace SabreTools.Serialization.CrossModel { var media = new Data.Models.Metadata.Media { - [Data.Models.Metadata.Media.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Media.MD5Key] = item.MD5, [Data.Models.Metadata.Media.SHA1Key] = item.SHA1, [Data.Models.Metadata.Media.SHA256Key] = item.SHA256, @@ -278,7 +278,7 @@ namespace SabreTools.Serialization.CrossModel { var release = new Data.Models.Metadata.Release { - [Data.Models.Metadata.Release.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Release.RegionKey] = item.Region, [Data.Models.Metadata.Release.LanguageKey] = item.Language, [Data.Models.Metadata.Release.DateKey] = item.Date, @@ -294,7 +294,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRC16Key] = item.CRC16, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, @@ -329,7 +329,7 @@ namespace SabreTools.Serialization.CrossModel { var sample = new Data.Models.Metadata.Sample { - [Data.Models.Metadata.Sample.NameKey] = item.Name, + Name = item.Name, }; return sample; } @@ -342,7 +342,7 @@ namespace SabreTools.Serialization.CrossModel var softwareList = new Data.Models.Metadata.SoftwareList { [Data.Models.Metadata.SoftwareList.TagKey] = item.Tag, - [Data.Models.Metadata.SoftwareList.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.SoftwareList.StatusKey] = item.Status, [Data.Models.Metadata.SoftwareList.FilterKey] = item.Filter, }; diff --git a/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs index 02e1b261..dd7199e8 100644 --- a/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs @@ -36,7 +36,7 @@ namespace SabreTools.Serialization.CrossModel NoNamespaceSchemaLocation = item.ReadString(Data.Models.Metadata.Header.SchemaLocationKey), }; - if (item.ContainsKey(Data.Models.Metadata.Header.NameKey) + if (item.Name is not null || item.ContainsKey(Data.Models.Metadata.Header.ImFolderKey) || item.ContainsKey(Data.Models.Metadata.Header.DatVersionKey) || item.ContainsKey(Data.Models.Metadata.Header.SystemKey) @@ -50,7 +50,7 @@ namespace SabreTools.Serialization.CrossModel { dat.Configuration = new Configuration { - DatName = item.ReadString(Data.Models.Metadata.Header.NameKey), + DatName = item.Name, ImFolder = item.ReadString(Data.Models.Metadata.Header.ImFolderKey), DatVersion = item.ReadString(Data.Models.Metadata.Header.DatVersionKey), System = item.ReadString(Data.Models.Metadata.Header.SystemKey), @@ -84,7 +84,7 @@ namespace SabreTools.Serialization.CrossModel { ImageNumber = item.ReadString(Data.Models.Metadata.Machine.ImageNumberKey), ReleaseNumber = item.ReadString(Data.Models.Metadata.Machine.ReleaseNumberKey), - Title = item.ReadString(Data.Models.Metadata.Machine.NameKey), + Title = item.Name, SaveType = item.ReadString(Data.Models.Metadata.Machine.SaveTypeKey), Publisher = item.ReadString(Data.Models.Metadata.Machine.PublisherKey), Location = item.ReadString(Data.Models.Metadata.Machine.LocationKey), diff --git a/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs index 1b3f1139..c8032e8d 100644 --- a/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs @@ -37,7 +37,7 @@ namespace SabreTools.Serialization.CrossModel if (item.Configuration is not null) { - header[Data.Models.Metadata.Header.NameKey] = item.Configuration.DatName; + header.Name = item.Configuration.DatName; header[Data.Models.Metadata.Header.ImFolderKey] = item.Configuration.ImFolder; header[Data.Models.Metadata.Header.DatVersionKey] = item.Configuration.DatVersion; header[Data.Models.Metadata.Header.SystemKey] = item.Configuration.System; @@ -67,7 +67,7 @@ namespace SabreTools.Serialization.CrossModel { [Data.Models.Metadata.Machine.ImageNumberKey] = item.ImageNumber, [Data.Models.Metadata.Machine.ReleaseNumberKey] = item.ReleaseNumber, - [Data.Models.Metadata.Machine.NameKey] = item.Title, + Name = item.Title, [Data.Models.Metadata.Machine.SaveTypeKey] = item.SaveType, [Data.Models.Metadata.Machine.PublisherKey] = item.Publisher, [Data.Models.Metadata.Machine.LocationKey] = item.Location, diff --git a/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs index adcea623..0fd48c22 100644 --- a/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs @@ -40,7 +40,7 @@ namespace SabreTools.Serialization.CrossModel { var game = new Software { - Title = item.ReadString(Data.Models.Metadata.Machine.NameKey), + Title = item.Name, GenMSXID = item.ReadString(Data.Models.Metadata.Machine.GenMSXIDKey), System = item.ReadString(Data.Models.Metadata.Machine.SystemKey), Company = item.ReadString(Data.Models.Metadata.Machine.CompanyKey), diff --git a/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs index c86f5ee1..e77396d4 100644 --- a/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs @@ -44,7 +44,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Title, + Name = item.Title, [Data.Models.Metadata.Machine.GenMSXIDKey] = item.GenMSXID, [Data.Models.Metadata.Machine.SystemKey] = item.System, [Data.Models.Metadata.Machine.CompanyKey] = item.Company, diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs index afd41443..35121c7e 100644 --- a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs @@ -100,9 +100,9 @@ namespace SabreTools.Serialization.CrossModel { ParentName = parent.ReadString(Data.Models.Metadata.Machine.CloneOfKey), //ParentDescription = parent.ReadString(Data.Models.Metadata.Machine.ParentDescriptionKey), // This is unmappable - GameName = parent.ReadString(Data.Models.Metadata.Machine.NameKey), + GameName = parent.Name, GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), - RomName = item.ReadString(Data.Models.Metadata.Rom.NameKey), + RomName = item.Name, RomCRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), RomSize = item.ReadString(Data.Models.Metadata.Rom.SizeKey), RomOf = parent.ReadString(Data.Models.Metadata.Machine.RomOfKey), diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs index 214a66be..7e77deec 100644 --- a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Machine.RomOfKey] = item.RomOf, [Data.Models.Metadata.Machine.CloneOfKey] = item.ParentName, //[Data.Models.Metadata.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable - [Data.Models.Metadata.Machine.NameKey] = item.GameName, + Name = item.GameName, [Data.Models.Metadata.Machine.DescriptionKey] = item.GameDescription, [Data.Models.Metadata.Machine.RomKey] = new Data.Models.Metadata.Rom[] { ConvertToInternalModel(item) }, }; @@ -88,7 +88,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.RomName, + Name = item.RomName, [Data.Models.Metadata.Rom.CRCKey] = item.RomCRC, [Data.Models.Metadata.Rom.SizeKey] = item.RomSize, [Data.Models.Metadata.Rom.MergeKey] = item.MergeName, diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs index e6404c6b..38ac7b00 100644 --- a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs @@ -77,13 +77,13 @@ namespace SabreTools.Serialization.CrossModel var row = new Row { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve - InternalName = header?.ReadString(Data.Models.Metadata.Header.NameKey), + InternalName = header?.Name, Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), - GameName = parent.ReadString(Data.Models.Metadata.Machine.NameKey), + GameName = parent.Name, GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), Type = "disk", RomName = null, - DiskName = item.ReadString(Data.Models.Metadata.Disk.NameKey), + DiskName = item.Name, Size = null, CRC = null, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), @@ -105,13 +105,13 @@ namespace SabreTools.Serialization.CrossModel var row = new Row { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve on an item -- OriginalFilename - InternalName = header?.ReadString(Data.Models.Metadata.Header.NameKey), + InternalName = header?.Name, Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), - GameName = parent.ReadString(Data.Models.Metadata.Machine.NameKey), + GameName = parent.Name, GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), Type = "media", RomName = null, - DiskName = item.ReadString(Data.Models.Metadata.Media.NameKey), + DiskName = item.Name, Size = null, CRC = null, MD5 = item.ReadString(Data.Models.Metadata.Media.MD5Key), @@ -132,12 +132,12 @@ namespace SabreTools.Serialization.CrossModel var row = new Row { FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve - InternalName = header?.ReadString(Data.Models.Metadata.Header.NameKey), + InternalName = header?.Name, Description = header?.ReadString(Data.Models.Metadata.Header.DescriptionKey), - GameName = parent.ReadString(Data.Models.Metadata.Machine.NameKey), + GameName = parent.Name, GameDescription = parent.ReadString(Data.Models.Metadata.Machine.DescriptionKey), Type = "rom", - RomName = item.ReadString(Data.Models.Metadata.Rom.NameKey), + RomName = item.Name, DiskName = null, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs index 8a6492c1..5b98e28f 100644 --- a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs @@ -39,7 +39,7 @@ namespace SabreTools.Serialization.CrossModel { var first = item.Row[0]; header["FILENAME"] = first.FileName; // TODO: Make this an actual key to retrieve on an item -- OriginalFilename - header[Data.Models.Metadata.Header.NameKey] = first.FileName; + header.Name = first.FileName; header[Data.Models.Metadata.Header.DescriptionKey] = first.Description; } @@ -53,7 +53,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.GameName, + Name = item.GameName, [Data.Models.Metadata.Machine.DescriptionKey] = item.GameDescription, }; @@ -89,14 +89,14 @@ namespace SabreTools.Serialization.CrossModel { "disk" => new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.DiskName, + Name = item.DiskName, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, [Data.Models.Metadata.Disk.StatusKey] = item.Status, }, "media" => new Data.Models.Metadata.Media { - [Data.Models.Metadata.Media.NameKey] = item.DiskName, + Name = item.DiskName, [Data.Models.Metadata.Media.MD5Key] = item.MD5, [Data.Models.Metadata.Media.SHA1Key] = item.SHA1, [Data.Models.Metadata.Media.SHA256Key] = item.SHA256, @@ -104,7 +104,7 @@ namespace SabreTools.Serialization.CrossModel }, "rom" => new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.RomName, + Name = item.RomName, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, [Data.Models.Metadata.Rom.MD5Key] = item.MD5, diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs index 28b116b3..e5bcaf2f 100644 --- a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs +++ b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs @@ -28,7 +28,7 @@ namespace SabreTools.Serialization.CrossModel { var softwareList = new Data.Models.SoftwareList.SoftwareList { - Name = item.ReadString(Data.Models.Metadata.Header.NameKey), + Name = item.Name, Description = item.ReadString(Data.Models.Metadata.Header.DescriptionKey), Notes = item.ReadString(Data.Models.Metadata.Header.NotesKey), }; @@ -42,7 +42,7 @@ namespace SabreTools.Serialization.CrossModel { var software = new Software { - Name = item.ReadString(Data.Models.Metadata.Machine.NameKey), + Name = item.Name, CloneOf = item.ReadString(Data.Models.Metadata.Machine.CloneOfKey), Supported = item.ReadString(Data.Models.Metadata.Machine.SupportedKey), Description = item.ReadString(Data.Models.Metadata.Machine.DescriptionKey), @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.CrossModel { var dataArea = new DataArea { - Name = item.ReadString(Data.Models.Metadata.DataArea.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.DataArea.SizeKey), Width = item.ReadString(Data.Models.Metadata.DataArea.WidthKey), Endianness = item.ReadString(Data.Models.Metadata.DataArea.EndiannessKey), @@ -93,7 +93,7 @@ namespace SabreTools.Serialization.CrossModel { var dipSwitch = new DipSwitch { - Name = item.ReadString(Data.Models.Metadata.DipSwitch.NameKey), + Name = item.Name, Tag = item.ReadString(Data.Models.Metadata.DipSwitch.TagKey), Mask = item.ReadString(Data.Models.Metadata.DipSwitch.MaskKey), }; @@ -112,7 +112,7 @@ namespace SabreTools.Serialization.CrossModel { var dipValue = new DipValue { - Name = item.ReadString(Data.Models.Metadata.DipValue.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.DipValue.ValueKey), Default = item.ReadString(Data.Models.Metadata.DipValue.DefaultKey), }; @@ -126,7 +126,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Disk { - Name = item.ReadString(Data.Models.Metadata.Disk.NameKey), + Name = item.Name, MD5 = item.ReadString(Data.Models.Metadata.Disk.MD5Key), SHA1 = item.ReadString(Data.Models.Metadata.Disk.SHA1Key), Status = item.ReadString(Data.Models.Metadata.Disk.StatusKey), @@ -142,7 +142,7 @@ namespace SabreTools.Serialization.CrossModel { var diskArea = new DiskArea { - Name = item.ReadString(Data.Models.Metadata.DiskArea.NameKey), + Name = item.Name, }; var disks = item.Read(Data.Models.Metadata.DiskArea.DiskKey); @@ -159,7 +159,7 @@ namespace SabreTools.Serialization.CrossModel { var feature = new Feature { - Name = item.ReadString(Data.Models.Metadata.Feature.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.Feature.ValueKey), }; return feature; @@ -172,7 +172,7 @@ namespace SabreTools.Serialization.CrossModel { var info = new Info { - Name = item.ReadString(Data.Models.Metadata.Info.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.Info.ValueKey), }; return info; @@ -185,7 +185,7 @@ namespace SabreTools.Serialization.CrossModel { var part = new Part { - Name = item.ReadString(Data.Models.Metadata.Part.NameKey), + Name = item.Name, Interface = item.ReadString(Data.Models.Metadata.Part.InterfaceKey), }; @@ -215,7 +215,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Rom { - Name = item.ReadString(Data.Models.Metadata.Rom.NameKey), + Name = item.Name, Size = item.ReadString(Data.Models.Metadata.Rom.SizeKey), Length = item.ReadString(Data.Models.Metadata.Rom.LengthKey), CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey), @@ -235,7 +235,7 @@ namespace SabreTools.Serialization.CrossModel { var sharedFeat = new SharedFeat { - Name = item.ReadString(Data.Models.Metadata.SharedFeat.NameKey), + Name = item.Name, Value = item.ReadString(Data.Models.Metadata.SharedFeat.ValueKey), }; return sharedFeat; diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs index d9f2c7aa..ea3f33e5 100644 --- a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs +++ b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs @@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel { var header = new Data.Models.Metadata.Header { - [Data.Models.Metadata.Header.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Header.DescriptionKey] = item.Description, [Data.Models.Metadata.Header.NotesKey] = item.Notes, }; @@ -46,7 +46,7 @@ namespace SabreTools.Serialization.CrossModel { var machine = new Data.Models.Metadata.Machine { - [Data.Models.Metadata.Machine.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Machine.CloneOfKey] = item.CloneOf, [Data.Models.Metadata.Machine.SupportedKey] = item.Supported, [Data.Models.Metadata.Machine.DescriptionKey] = item.Description, @@ -74,7 +74,7 @@ namespace SabreTools.Serialization.CrossModel { var dataArea = new Data.Models.Metadata.DataArea { - [Data.Models.Metadata.DataArea.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DataArea.SizeKey] = item.Size, [Data.Models.Metadata.DataArea.WidthKey] = item.Width, [Data.Models.Metadata.DataArea.EndiannessKey] = item.Endianness, @@ -93,7 +93,7 @@ namespace SabreTools.Serialization.CrossModel { var dipSwitch = new Data.Models.Metadata.DipSwitch { - [Data.Models.Metadata.DipSwitch.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipSwitch.TagKey] = item.Tag, [Data.Models.Metadata.DipSwitch.MaskKey] = item.Mask, }; @@ -111,7 +111,7 @@ namespace SabreTools.Serialization.CrossModel { var dipValue = new Data.Models.Metadata.DipValue { - [Data.Models.Metadata.DipValue.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.DipValue.ValueKey] = item.Value, [Data.Models.Metadata.DipValue.DefaultKey] = item.Default, }; @@ -125,7 +125,7 @@ namespace SabreTools.Serialization.CrossModel { var disk = new Data.Models.Metadata.Disk { - [Data.Models.Metadata.Disk.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Disk.MD5Key] = item.MD5, [Data.Models.Metadata.Disk.SHA1Key] = item.SHA1, [Data.Models.Metadata.Disk.StatusKey] = item.Status, @@ -141,7 +141,7 @@ namespace SabreTools.Serialization.CrossModel { var diskArea = new Data.Models.Metadata.DiskArea { - [Data.Models.Metadata.DiskArea.NameKey] = item.Name, + Name = item.Name, }; if (item.Disk is not null && item.Disk.Length > 0) @@ -157,7 +157,7 @@ namespace SabreTools.Serialization.CrossModel { var feature = new Data.Models.Metadata.Feature { - [Data.Models.Metadata.Feature.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Feature.ValueKey] = item.Value, }; return feature; @@ -170,7 +170,7 @@ namespace SabreTools.Serialization.CrossModel { var info = new Data.Models.Metadata.Info { - [Data.Models.Metadata.Info.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Info.ValueKey] = item.Value, }; return info; @@ -183,7 +183,7 @@ namespace SabreTools.Serialization.CrossModel { var part = new Data.Models.Metadata.Part { - [Data.Models.Metadata.Part.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Part.InterfaceKey] = item.Interface, }; @@ -209,7 +209,7 @@ namespace SabreTools.Serialization.CrossModel { var rom = new Data.Models.Metadata.Rom { - [Data.Models.Metadata.Rom.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.Rom.SizeKey] = item.Size, [Data.Models.Metadata.Rom.LengthKey] = item.Length, [Data.Models.Metadata.Rom.CRCKey] = item.CRC, @@ -229,7 +229,7 @@ namespace SabreTools.Serialization.CrossModel { var sharedFeat = new Data.Models.Metadata.SharedFeat { - [Data.Models.Metadata.SharedFeat.NameKey] = item.Name, + Name = item.Name, [Data.Models.Metadata.SharedFeat.ValueKey] = item.Value, }; return sharedFeat;