From 85aefc8d90799b8d6364655d6017c4179f1bd67c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 26 Mar 2026 15:16:12 -0400 Subject: [PATCH] Move required extension --- .../DatFileTests.ToMetadata.cs | 84 +++++++++---------- .../DatFile.FromMetadata.cs | 68 +++++++-------- .../Formats/Configuration.cs | 4 +- .../Formats/Device.cs | 2 +- .../Formats/DipSwitch.cs | 4 +- SabreTools.Metadata.DatItems/Formats/Input.cs | 2 +- SabreTools.Metadata.DatItems/Formats/Port.cs | 2 +- SabreTools.Metadata.DatItems/Formats/Slot.cs | 2 +- 8 files changed, 84 insertions(+), 84 deletions(-) diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs index cf5cc01d..0b6c2d42 100644 --- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs +++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs @@ -81,7 +81,7 @@ namespace SabreTools.Metadata.DatFiles.Test Data.Models.Metadata.MetadataFile? actual = datFile.ConvertToMetadata(); Assert.NotNull(actual); - Data.Models.Metadata.Machine[]? machines = actual.ReadItemArray(Data.Models.Metadata.MetadataFile.MachineKey); + Data.Models.Metadata.Machine[]? machines = actual.ReadArray(Data.Models.Metadata.MetadataFile.MachineKey); Assert.NotNull(machines); Data.Models.Metadata.Machine actualMachine = Assert.Single(machines); ValidateMetadataMachine(actualMachine); @@ -472,138 +472,138 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("tags", machine.ReadString(Data.Models.Metadata.Machine.TagsKey)); Assert.Equal("year", machine.ReadString(Data.Models.Metadata.Machine.YearKey)); - Data.Models.Metadata.Adjuster[]? adjusters = machine.ReadItemArray(Data.Models.Metadata.Machine.AdjusterKey); + Data.Models.Metadata.Adjuster[]? adjusters = machine.ReadArray(Data.Models.Metadata.Machine.AdjusterKey); Assert.NotNull(adjusters); Data.Models.Metadata.Adjuster adjuster = Assert.Single(adjusters); ValidateMetadataAdjuster(adjuster); - Data.Models.Metadata.Archive[]? archives = machine.ReadItemArray(Data.Models.Metadata.Machine.ArchiveKey); + Data.Models.Metadata.Archive[]? archives = machine.ReadArray(Data.Models.Metadata.Machine.ArchiveKey); Assert.NotNull(archives); Data.Models.Metadata.Archive archive = Assert.Single(archives); ValidateMetadataArchive(archive); - Data.Models.Metadata.BiosSet[]? biosSets = machine.ReadItemArray(Data.Models.Metadata.Machine.BiosSetKey); + Data.Models.Metadata.BiosSet[]? biosSets = machine.ReadArray(Data.Models.Metadata.Machine.BiosSetKey); Assert.NotNull(biosSets); Data.Models.Metadata.BiosSet biosSet = Assert.Single(biosSets); ValidateMetadataBiosSet(biosSet); - Data.Models.Metadata.Chip[]? chips = machine.ReadItemArray(Data.Models.Metadata.Machine.ChipKey); + Data.Models.Metadata.Chip[]? chips = machine.ReadArray(Data.Models.Metadata.Machine.ChipKey); Assert.NotNull(chips); Data.Models.Metadata.Chip chip = Assert.Single(chips); ValidateMetadataChip(chip); - Data.Models.Metadata.Configuration[]? configurations = machine.ReadItemArray(Data.Models.Metadata.Machine.ConfigurationKey); + Data.Models.Metadata.Configuration[]? configurations = machine.ReadArray(Data.Models.Metadata.Machine.ConfigurationKey); Assert.NotNull(configurations); Data.Models.Metadata.Configuration configuration = Assert.Single(configurations); ValidateMetadataConfiguration(configuration); - Data.Models.Metadata.Device[]? devices = machine.ReadItemArray(Data.Models.Metadata.Machine.DeviceKey); + Data.Models.Metadata.Device[]? devices = machine.ReadArray(Data.Models.Metadata.Machine.DeviceKey); Assert.NotNull(devices); Data.Models.Metadata.Device device = Assert.Single(devices); ValidateMetadataDevice(device); - Data.Models.Metadata.DeviceRef[]? deviceRefs = machine.ReadItemArray(Data.Models.Metadata.Machine.DeviceRefKey); + Data.Models.Metadata.DeviceRef[]? deviceRefs = machine.ReadArray(Data.Models.Metadata.Machine.DeviceRefKey); Assert.NotNull(deviceRefs); Data.Models.Metadata.DeviceRef deviceRef = Assert.Single(deviceRefs); ValidateMetadataDeviceRef(deviceRef); - Data.Models.Metadata.DipSwitch[]? dipSwitches = machine.ReadItemArray(Data.Models.Metadata.Machine.DipSwitchKey); + Data.Models.Metadata.DipSwitch[]? dipSwitches = machine.ReadArray(Data.Models.Metadata.Machine.DipSwitchKey); Assert.NotNull(dipSwitches); Assert.Equal(2, dipSwitches.Length); Data.Models.Metadata.DipSwitch dipSwitch = dipSwitches[0]; ValidateMetadataDipSwitch(dipSwitch); - Data.Models.Metadata.Disk[]? disks = machine.ReadItemArray(Data.Models.Metadata.Machine.DiskKey); + Data.Models.Metadata.Disk[]? disks = machine.ReadArray(Data.Models.Metadata.Machine.DiskKey); Assert.NotNull(disks); Assert.Equal(2, disks.Length); Data.Models.Metadata.Disk disk = disks[0]; ValidateMetadataDisk(disk); - Data.Models.Metadata.Display[]? displays = machine.ReadItemArray(Data.Models.Metadata.Machine.DisplayKey); + Data.Models.Metadata.Display[]? displays = machine.ReadArray(Data.Models.Metadata.Machine.DisplayKey); Assert.NotNull(displays); Assert.Equal(2, displays.Length); Data.Models.Metadata.Display? display = Array.Find(displays, d => !d.ContainsKey(Data.Models.Metadata.Video.AspectXKey)); ValidateMetadataDisplay(display); - Data.Models.Metadata.Driver[]? drivers = machine.ReadItemArray(Data.Models.Metadata.Machine.DriverKey); + Data.Models.Metadata.Driver[]? drivers = machine.ReadArray(Data.Models.Metadata.Machine.DriverKey); Assert.NotNull(drivers); Data.Models.Metadata.Driver driver = Assert.Single(drivers); ValidateMetadataDriver(driver); // TODO: Implement this validation - // Data.Models.Metadata.Dump[]? dumps = machine.ReadItemArray(Data.Models.Metadata.Machine.DumpKey); + // Data.Models.Metadata.Dump[]? dumps = machine.ReadArray(Data.Models.Metadata.Machine.DumpKey); // Assert.NotNull(dumps); // Data.Models.Metadata.Dump dump = Assert.Single(dumps); // ValidateMetadataDump(dump); - Data.Models.Metadata.Feature[]? features = machine.ReadItemArray(Data.Models.Metadata.Machine.FeatureKey); + Data.Models.Metadata.Feature[]? features = machine.ReadArray(Data.Models.Metadata.Machine.FeatureKey); Assert.NotNull(features); Assert.Equal(2, features.Length); Data.Models.Metadata.Feature feature = features[0]; ValidateMetadataFeature(feature); - Data.Models.Metadata.Info[]? infos = machine.ReadItemArray(Data.Models.Metadata.Machine.InfoKey); + Data.Models.Metadata.Info[]? infos = machine.ReadArray(Data.Models.Metadata.Machine.InfoKey); Assert.NotNull(infos); Data.Models.Metadata.Info info = Assert.Single(infos); ValidateMetadataInfo(info); - Data.Models.Metadata.Input[]? inputs = machine.ReadItemArray(Data.Models.Metadata.Machine.InputKey); + Data.Models.Metadata.Input[]? inputs = machine.ReadArray(Data.Models.Metadata.Machine.InputKey); Assert.NotNull(inputs); Data.Models.Metadata.Input input = Assert.Single(inputs); ValidateMetadataInput(input); - Data.Models.Metadata.Media[]? media = machine.ReadItemArray(Data.Models.Metadata.Machine.MediaKey); + Data.Models.Metadata.Media[]? media = machine.ReadArray(Data.Models.Metadata.Machine.MediaKey); Assert.NotNull(media); Data.Models.Metadata.Media medium = Assert.Single(media); ValidateMetadataMedia(medium); - Data.Models.Metadata.Part[]? parts = machine.ReadItemArray(Data.Models.Metadata.Machine.PartKey); + Data.Models.Metadata.Part[]? parts = machine.ReadArray(Data.Models.Metadata.Machine.PartKey); Assert.NotNull(parts); Data.Models.Metadata.Part part = Assert.Single(parts); ValidateMetadataPart(part); - Data.Models.Metadata.Port[]? ports = machine.ReadItemArray(Data.Models.Metadata.Machine.PortKey); + Data.Models.Metadata.Port[]? ports = machine.ReadArray(Data.Models.Metadata.Machine.PortKey); Assert.NotNull(ports); Data.Models.Metadata.Port port = Assert.Single(ports); ValidateMetadataPort(port); - Data.Models.Metadata.RamOption[]? ramOptions = machine.ReadItemArray(Data.Models.Metadata.Machine.RamOptionKey); + Data.Models.Metadata.RamOption[]? ramOptions = machine.ReadArray(Data.Models.Metadata.Machine.RamOptionKey); Assert.NotNull(ramOptions); Data.Models.Metadata.RamOption ramOption = Assert.Single(ramOptions); ValidateMetadataRamOption(ramOption); - Data.Models.Metadata.Release[]? releases = machine.ReadItemArray(Data.Models.Metadata.Machine.ReleaseKey); + Data.Models.Metadata.Release[]? releases = machine.ReadArray(Data.Models.Metadata.Machine.ReleaseKey); Assert.NotNull(releases); Data.Models.Metadata.Release release = Assert.Single(releases); ValidateMetadataRelease(release); - Data.Models.Metadata.Rom[]? roms = machine.ReadItemArray(Data.Models.Metadata.Machine.RomKey); + Data.Models.Metadata.Rom[]? roms = machine.ReadArray(Data.Models.Metadata.Machine.RomKey); Assert.NotNull(roms); Assert.Equal(2, roms.Length); Data.Models.Metadata.Rom rom = roms[0]; ValidateMetadataRom(rom); - Data.Models.Metadata.Sample[]? samples = machine.ReadItemArray(Data.Models.Metadata.Machine.SampleKey); + Data.Models.Metadata.Sample[]? samples = machine.ReadArray(Data.Models.Metadata.Machine.SampleKey); Assert.NotNull(samples); Data.Models.Metadata.Sample sample = Assert.Single(samples); ValidateMetadataSample(sample); - Data.Models.Metadata.SharedFeat[]? sharedFeats = machine.ReadItemArray(Data.Models.Metadata.Machine.SharedFeatKey); + Data.Models.Metadata.SharedFeat[]? sharedFeats = machine.ReadArray(Data.Models.Metadata.Machine.SharedFeatKey); Assert.NotNull(sharedFeats); Data.Models.Metadata.SharedFeat sharedFeat = Assert.Single(sharedFeats); ValidateMetadataSharedFeat(sharedFeat); - Data.Models.Metadata.Slot[]? slots = machine.ReadItemArray(Data.Models.Metadata.Machine.SlotKey); + Data.Models.Metadata.Slot[]? slots = machine.ReadArray(Data.Models.Metadata.Machine.SlotKey); Assert.NotNull(slots); Data.Models.Metadata.Slot slot = Assert.Single(slots); ValidateMetadataSlot(slot); - Data.Models.Metadata.SoftwareList[]? softwareLists = machine.ReadItemArray(Data.Models.Metadata.Machine.SoftwareListKey); + Data.Models.Metadata.SoftwareList[]? softwareLists = machine.ReadArray(Data.Models.Metadata.Machine.SoftwareListKey); Assert.NotNull(softwareLists); Data.Models.Metadata.SoftwareList softwareList = Assert.Single(softwareLists); ValidateMetadataSoftwareList(softwareList); - Data.Models.Metadata.Sound[]? sounds = machine.ReadItemArray(Data.Models.Metadata.Machine.SoundKey); + Data.Models.Metadata.Sound[]? sounds = machine.ReadArray(Data.Models.Metadata.Machine.SoundKey); Assert.NotNull(sounds); Data.Models.Metadata.Sound sound = Assert.Single(sounds); ValidateMetadataSound(sound); @@ -611,7 +611,7 @@ namespace SabreTools.Metadata.DatFiles.Test Data.Models.Logiqx.Trurip? trurip = machine.Read(Data.Models.Metadata.Machine.TruripKey); ValidateMetadataTrurip(trurip); - Data.Models.Metadata.Video[]? videos = machine.ReadItemArray(Data.Models.Metadata.Machine.VideoKey); + Data.Models.Metadata.Video[]? videos = machine.ReadArray(Data.Models.Metadata.Machine.VideoKey); Assert.NotNull(videos); Data.Models.Metadata.Video video = Assert.Single(videos); ValidateMetadataVideo(video); @@ -677,12 +677,12 @@ namespace SabreTools.Metadata.DatFiles.Test Data.Models.Metadata.Condition? condition = configuration.Read(Data.Models.Metadata.Configuration.ConditionKey); ValidateMetadataCondition(condition); - Data.Models.Metadata.ConfLocation[]? confLocations = configuration.ReadItemArray(Data.Models.Metadata.Configuration.ConfLocationKey); + Data.Models.Metadata.ConfLocation[]? confLocations = configuration.ReadArray(Data.Models.Metadata.Configuration.ConfLocationKey); Assert.NotNull(confLocations); Data.Models.Metadata.ConfLocation? confLocation = Assert.Single(confLocations); ValidateMetadataConfLocation(confLocation); - Data.Models.Metadata.ConfSetting[]? confSettings = configuration.ReadItemArray(Data.Models.Metadata.Configuration.ConfSettingKey); + Data.Models.Metadata.ConfSetting[]? confSettings = configuration.ReadArray(Data.Models.Metadata.Configuration.ConfSettingKey); Assert.NotNull(confSettings); Data.Models.Metadata.ConfSetting? confSetting = Assert.Single(confSettings); ValidateMetadataConfSetting(confSetting); @@ -732,7 +732,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal(12345, dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey)); Assert.Equal(64, dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey)); - Data.Models.Metadata.Rom[]? roms = dataArea.ReadItemArray(Data.Models.Metadata.DataArea.RomKey); + Data.Models.Metadata.Rom[]? roms = dataArea.ReadArray(Data.Models.Metadata.DataArea.RomKey); Assert.NotNull(roms); Data.Models.Metadata.Rom? rom = Assert.Single(roms); ValidateMetadataRom(rom); @@ -747,7 +747,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("tag", device.ReadString(Data.Models.Metadata.Device.TagKey)); Assert.Equal("punchtape", device.ReadString(Data.Models.Metadata.Device.DeviceTypeKey)); - Data.Models.Metadata.Extension[]? extensions = device.ReadItemArray(Data.Models.Metadata.Device.ExtensionKey); + Data.Models.Metadata.Extension[]? extensions = device.ReadArray(Data.Models.Metadata.Device.ExtensionKey); Assert.NotNull(extensions); Data.Models.Metadata.Extension? extension = Assert.Single(extensions); ValidateMetadataExtension(extension); @@ -781,12 +781,12 @@ namespace SabreTools.Metadata.DatFiles.Test Data.Models.Metadata.Condition? condition = dipSwitch.Read(Data.Models.Metadata.DipSwitch.ConditionKey); ValidateMetadataCondition(condition); - Data.Models.Metadata.DipLocation[]? dipLocations = dipSwitch.ReadItemArray(Data.Models.Metadata.DipSwitch.DipLocationKey); + Data.Models.Metadata.DipLocation[]? dipLocations = dipSwitch.ReadArray(Data.Models.Metadata.DipSwitch.DipLocationKey); Assert.NotNull(dipLocations); Data.Models.Metadata.DipLocation? dipLocation = Assert.Single(dipLocations); ValidateMetadataDipLocation(dipLocation); - Data.Models.Metadata.DipValue[]? dipValues = dipSwitch.ReadItemArray(Data.Models.Metadata.DipSwitch.DipValueKey); + Data.Models.Metadata.DipValue[]? dipValues = dipSwitch.ReadArray(Data.Models.Metadata.DipSwitch.DipValueKey); Assert.NotNull(dipValues); Data.Models.Metadata.DipValue? dipValue = Assert.Single(dipValues); ValidateMetadataDipValue(dipValue); @@ -827,7 +827,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(diskArea); Assert.Equal("name", diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey)); - Data.Models.Metadata.Disk[]? disks = diskArea.ReadItemArray(Data.Models.Metadata.DiskArea.DiskKey); + Data.Models.Metadata.Disk[]? disks = diskArea.ReadArray(Data.Models.Metadata.DiskArea.DiskKey); Assert.NotNull(disks); Data.Models.Metadata.Disk? disk = Assert.Single(disks); ValidateMetadataDisk(disk); @@ -901,7 +901,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.True(input.ReadBool(Data.Models.Metadata.Input.ServiceKey)); Assert.True(input.ReadBool(Data.Models.Metadata.Input.TiltKey)); - Data.Models.Metadata.Control[]? controls = input.ReadItemArray(Data.Models.Metadata.Input.ControlKey); + Data.Models.Metadata.Control[]? controls = input.ReadArray(Data.Models.Metadata.Input.ControlKey); Assert.NotNull(controls); Data.Models.Metadata.Control? control = Assert.Single(controls); ValidateMetadataControl(control); @@ -930,22 +930,22 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.Equal("interface", part.ReadString(Data.Models.Metadata.Part.InterfaceKey)); Assert.Equal("name", part.ReadString(Data.Models.Metadata.Part.NameKey)); - Data.Models.Metadata.DataArea[]? dataAreas = part.ReadItemArray(Data.Models.Metadata.Part.DataAreaKey); + Data.Models.Metadata.DataArea[]? dataAreas = part.ReadArray(Data.Models.Metadata.Part.DataAreaKey); Assert.NotNull(dataAreas); Data.Models.Metadata.DataArea? dataArea = Assert.Single(dataAreas); ValidateMetadataDataArea(dataArea); - Data.Models.Metadata.DiskArea[]? diskAreas = part.ReadItemArray(Data.Models.Metadata.Part.DiskAreaKey); + Data.Models.Metadata.DiskArea[]? diskAreas = part.ReadArray(Data.Models.Metadata.Part.DiskAreaKey); Assert.NotNull(diskAreas); Data.Models.Metadata.DiskArea? diskArea = Assert.Single(diskAreas); ValidateMetadataDiskArea(diskArea); - Data.Models.Metadata.DipSwitch[]? dipSwitches = part.ReadItemArray(Data.Models.Metadata.Part.DipSwitchKey); + Data.Models.Metadata.DipSwitch[]? dipSwitches = part.ReadArray(Data.Models.Metadata.Part.DipSwitchKey); Assert.NotNull(dipSwitches); Data.Models.Metadata.DipSwitch? dipSwitch = Assert.Single(dipSwitches); ValidateMetadataDipSwitch(dipSwitch); - Data.Models.Metadata.Feature[]? features = part.ReadItemArray(Data.Models.Metadata.Part.FeatureKey); + Data.Models.Metadata.Feature[]? features = part.ReadArray(Data.Models.Metadata.Part.FeatureKey); Assert.NotNull(features); Data.Models.Metadata.Feature? feature = Assert.Single(features); ValidateMetadataFeature(feature); @@ -956,7 +956,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(port); Assert.Equal("tag", port.ReadString(Data.Models.Metadata.Port.TagKey)); - Data.Models.Metadata.Analog[]? dipValues = port.ReadItemArray(Data.Models.Metadata.Port.AnalogKey); + Data.Models.Metadata.Analog[]? dipValues = port.ReadArray(Data.Models.Metadata.Port.AnalogKey); Assert.NotNull(dipValues); Data.Models.Metadata.Analog? dipValue = Assert.Single(dipValues); ValidateMetadataAnalog(dipValue); @@ -1099,7 +1099,7 @@ namespace SabreTools.Metadata.DatFiles.Test Assert.NotNull(slot); Assert.Equal("name", slot.ReadString(Data.Models.Metadata.Slot.NameKey)); - Data.Models.Metadata.SlotOption[]? slotOptions = slot.ReadItemArray(Data.Models.Metadata.Slot.SlotOptionKey); + Data.Models.Metadata.SlotOption[]? slotOptions = slot.ReadArray(Data.Models.Metadata.Slot.SlotOptionKey); Assert.NotNull(slotOptions); Data.Models.Metadata.SlotOption? slotOption = Assert.Single(slotOptions); ValidateMetadataSlotOption(slotOption); diff --git a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs index acbd11c2..218d5600 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs @@ -46,7 +46,7 @@ namespace SabreTools.Metadata.DatFiles ConvertHeader(header, keep); // Get the machines from the metadata - var machines = item.ReadItemArray(Data.Models.Metadata.MetadataFile.MachineKey); + var machines = item.ReadArray(Data.Models.Metadata.MetadataFile.MachineKey); if (machines is not null) ConvertMachines(machines, source, sourceIndex: 0, statsOnly, filterRunner); } @@ -247,7 +247,7 @@ namespace SabreTools.Metadata.DatFiles // Convert items in the machine if (item.ContainsKey(Data.Models.Metadata.Machine.AdjusterKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.AdjusterKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.AdjusterKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -259,7 +259,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.ArchiveKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.ArchiveKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.ArchiveKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -271,7 +271,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.BiosSetKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.BiosSetKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.BiosSetKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -283,7 +283,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.ChipKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.ChipKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.ChipKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -295,7 +295,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.ConfigurationKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.ConfigurationKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.ConfigurationKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -307,7 +307,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DeviceKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DeviceKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DeviceKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -319,7 +319,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DeviceRefKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DeviceRefKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DeviceRefKey) ?? []; // Do not filter these due to later use Array.ForEach(items, item => { @@ -331,7 +331,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DipSwitchKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DipSwitchKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DipSwitchKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -343,7 +343,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DiskKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DiskKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DiskKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -355,7 +355,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DisplayKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DisplayKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DisplayKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -367,7 +367,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DriverKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DriverKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DriverKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -379,7 +379,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.DumpKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.DumpKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.DumpKey) ?? []; for (int i = 0; i < items.Length; i++) { var datItem = new Rom(items[i], machine, source, i); @@ -393,7 +393,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.FeatureKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.FeatureKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.FeatureKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -405,7 +405,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.InfoKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.InfoKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.InfoKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -417,7 +417,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.InputKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.InputKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.InputKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -429,7 +429,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.MediaKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.MediaKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.MediaKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -441,13 +441,13 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.PartKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.PartKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.PartKey) ?? []; ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly, filterRunner); } if (item.ContainsKey(Data.Models.Metadata.Machine.PortKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.PortKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.PortKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -459,7 +459,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.RamOptionKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.RamOptionKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.RamOptionKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -471,7 +471,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.ReleaseKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.ReleaseKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.ReleaseKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -483,7 +483,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.RomKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.RomKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.RomKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -498,7 +498,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.SampleKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.SampleKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.SampleKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -510,7 +510,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.SharedFeatKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.SharedFeatKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.SharedFeatKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -522,7 +522,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.SlotKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.SlotKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.SlotKey) ?? []; // Do not filter these due to later use Array.ForEach(items, item => { @@ -534,7 +534,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.SoftwareListKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.SoftwareListKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.SoftwareListKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -546,7 +546,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.SoundKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.SoundKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.SoundKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -558,7 +558,7 @@ namespace SabreTools.Metadata.DatFiles if (item.ContainsKey(Data.Models.Metadata.Machine.VideoKey)) { - var items = item.ReadItemArray(Data.Models.Metadata.Machine.VideoKey) ?? []; + var items = item.ReadArray(Data.Models.Metadata.Machine.VideoKey) ?? []; var filtered = filterRunner is null ? items : Array.FindAll(items, i => filterRunner.Run(item)); Array.ForEach(filtered, item => { @@ -597,13 +597,13 @@ namespace SabreTools.Metadata.DatFiles var partItem = new Part(item, machine, source); // Handle subitems - var dataAreas = item.ReadItemArray(Data.Models.Metadata.Part.DataAreaKey); + var dataAreas = item.ReadArray(Data.Models.Metadata.Part.DataAreaKey); if (dataAreas is not null) { foreach (var dataArea in dataAreas) { var dataAreaItem = new DataArea(dataArea, machine, source); - var roms = dataArea.ReadItemArray(Data.Models.Metadata.DataArea.RomKey); + var roms = dataArea.ReadArray(Data.Models.Metadata.DataArea.RomKey); if (roms is null) continue; @@ -646,13 +646,13 @@ namespace SabreTools.Metadata.DatFiles } } - var diskAreas = item.ReadItemArray(Data.Models.Metadata.Part.DiskAreaKey); + var diskAreas = item.ReadArray(Data.Models.Metadata.Part.DiskAreaKey); if (diskAreas is not null) { foreach (var diskArea in diskAreas) { var diskAreaitem = new DiskArea(diskArea, machine, source); - var disks = diskArea.ReadItemArray(Data.Models.Metadata.DiskArea.DiskKey); + var disks = diskArea.ReadArray(Data.Models.Metadata.DiskArea.DiskKey); if (disks is null) continue; @@ -672,7 +672,7 @@ namespace SabreTools.Metadata.DatFiles } } - var dipSwitches = item.ReadItemArray(Data.Models.Metadata.Part.DipSwitchKey); + var dipSwitches = item.ReadArray(Data.Models.Metadata.Part.DipSwitchKey); if (dipSwitches is not null) { foreach (var dipSwitch in dipSwitches) @@ -689,7 +689,7 @@ namespace SabreTools.Metadata.DatFiles } } - var partFeatures = item.ReadItemArray(Data.Models.Metadata.Part.FeatureKey); + var partFeatures = item.ReadArray(Data.Models.Metadata.Part.FeatureKey); if (partFeatures is not null) { foreach (var partFeature in partFeatures) diff --git a/SabreTools.Metadata.DatItems/Formats/Configuration.cs b/SabreTools.Metadata.DatItems/Formats/Configuration.cs index 192fca3d..62b5f8c2 100644 --- a/SabreTools.Metadata.DatItems/Formats/Configuration.cs +++ b/SabreTools.Metadata.DatItems/Formats/Configuration.cs @@ -59,14 +59,14 @@ namespace SabreTools.Metadata.DatItems.Formats if (condition is not null) Write(Data.Models.Metadata.Configuration.ConditionKey, new Condition(condition)); - var confLocations = item.ReadItemArray(Data.Models.Metadata.Configuration.ConfLocationKey); + var confLocations = item.ReadArray(Data.Models.Metadata.Configuration.ConfLocationKey); if (confLocations is not null) { ConfLocation[] confLocationItems = Array.ConvertAll(confLocations, confLocation => new ConfLocation(confLocation)); Write(Data.Models.Metadata.Configuration.ConfLocationKey, confLocationItems); } - var confSettings = item.ReadItemArray(Data.Models.Metadata.Configuration.ConfSettingKey); + var confSettings = item.ReadArray(Data.Models.Metadata.Configuration.ConfSettingKey); if (confSettings is not null) { ConfSetting[] confSettingItems = Array.ConvertAll(confSettings, confSetting => new ConfSetting(confSetting)); diff --git a/SabreTools.Metadata.DatItems/Formats/Device.cs b/SabreTools.Metadata.DatItems/Formats/Device.cs index d1923e96..e6e143f8 100644 --- a/SabreTools.Metadata.DatItems/Formats/Device.cs +++ b/SabreTools.Metadata.DatItems/Formats/Device.cs @@ -55,7 +55,7 @@ namespace SabreTools.Metadata.DatItems.Formats if (instance is not null) Write(Data.Models.Metadata.Device.InstanceKey, new Instance(instance)); - var extensions = item.ReadItemArray(Data.Models.Metadata.Device.ExtensionKey); + var extensions = item.ReadArray(Data.Models.Metadata.Device.ExtensionKey); if (extensions is not null) { Extension[] extensionItems = Array.ConvertAll(extensions, extension => new Extension(extension)); diff --git a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs index 66941858..b0753650 100644 --- a/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs +++ b/SabreTools.Metadata.DatItems/Formats/DipSwitch.cs @@ -84,14 +84,14 @@ namespace SabreTools.Metadata.DatItems.Formats if (condition is not null) Write(Data.Models.Metadata.DipSwitch.ConditionKey, new Condition(condition)); - var dipLocations = item.ReadItemArray(Data.Models.Metadata.DipSwitch.DipLocationKey); + var dipLocations = item.ReadArray(Data.Models.Metadata.DipSwitch.DipLocationKey); if (dipLocations is not null) { DipLocation[] dipLocationItems = Array.ConvertAll(dipLocations, dipLocation => new DipLocation(dipLocation)); Write(Data.Models.Metadata.DipSwitch.DipLocationKey, dipLocationItems); } - var dipValues = item.ReadItemArray(Data.Models.Metadata.DipSwitch.DipValueKey); + var dipValues = item.ReadArray(Data.Models.Metadata.DipSwitch.DipValueKey); if (dipValues is not null) { DipValue[] dipValueItems = Array.ConvertAll(dipValues, dipValue => new DipValue(dipValue)); diff --git a/SabreTools.Metadata.DatItems/Formats/Input.cs b/SabreTools.Metadata.DatItems/Formats/Input.cs index 35f726a9..b32e32f9 100644 --- a/SabreTools.Metadata.DatItems/Formats/Input.cs +++ b/SabreTools.Metadata.DatItems/Formats/Input.cs @@ -47,7 +47,7 @@ namespace SabreTools.Metadata.DatItems.Formats Write(Data.Models.Metadata.Input.TiltKey, ReadBool(Data.Models.Metadata.Input.TiltKey).FromYesNo()); // Handle subitems - var controls = item.ReadItemArray(Data.Models.Metadata.Input.ControlKey); + var controls = item.ReadArray(Data.Models.Metadata.Input.ControlKey); if (controls is not null) { Control[] controlItems = Array.ConvertAll(controls, control => new Control(control)); diff --git a/SabreTools.Metadata.DatItems/Formats/Port.cs b/SabreTools.Metadata.DatItems/Formats/Port.cs index f83bc36f..76eb6e82 100644 --- a/SabreTools.Metadata.DatItems/Formats/Port.cs +++ b/SabreTools.Metadata.DatItems/Formats/Port.cs @@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats public Port(Data.Models.Metadata.Port item) : base(item) { // Handle subitems - var analogs = item.ReadItemArray(Data.Models.Metadata.Port.AnalogKey); + var analogs = item.ReadArray(Data.Models.Metadata.Port.AnalogKey); if (analogs is not null) { Analog[] analogItems = Array.ConvertAll(analogs, analog => new Analog(analog)); diff --git a/SabreTools.Metadata.DatItems/Formats/Slot.cs b/SabreTools.Metadata.DatItems/Formats/Slot.cs index 7f150b21..97353a5d 100644 --- a/SabreTools.Metadata.DatItems/Formats/Slot.cs +++ b/SabreTools.Metadata.DatItems/Formats/Slot.cs @@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats public Slot(Data.Models.Metadata.Slot item) : base(item) { // Handle subitems - var slotOptions = item.ReadItemArray(Data.Models.Metadata.Slot.SlotOptionKey); + var slotOptions = item.ReadArray(Data.Models.Metadata.Slot.SlotOptionKey); if (slotOptions is not null) { SlotOption[] slotOptionItems = Array.ConvertAll(slotOptions, slotOption => new SlotOption(slotOption));