Thin out ModelBackedItem wrapper class

This commit is contained in:
Matt Nadareski
2026-03-26 13:52:00 -04:00
parent e61aec89ea
commit 8356fc5970
102 changed files with 3002 additions and 3006 deletions

View File

@@ -7,6 +7,8 @@ namespace SabreTools.Data.Models.Metadata
/// </summary>
public abstract class DictionaryBase : Dictionary<string, object?>
{
#region Read
/// <summary>
/// Read a key as the specified type, returning null on error
/// </summary>
@@ -14,7 +16,7 @@ namespace SabreTools.Data.Models.Metadata
{
try
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return default;
if (this[key] is not T)
return default;
@@ -31,7 +33,7 @@ namespace SabreTools.Data.Models.Metadata
/// </summary>
public bool? ReadBool(string key)
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return null;
bool? asBool = Read<bool?>(key);
@@ -52,13 +54,23 @@ namespace SabreTools.Data.Models.Metadata
/// </summary>
public double? ReadDouble(string key)
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return null;
double? asDouble = Read<double?>(key);
if (asDouble is not null)
return asDouble;
float? asFloat = Read<float?>(key);
if (asFloat is not null)
return asFloat;
#if NET5_0_OR_GREATER
System.Half? asHalf = Read<System.Half?>(key);
if (asHalf is not null)
return (double?)asHalf;
#endif
string? asString = Read<string>(key);
if (asString is not null && double.TryParse(asString, out double asStringDouble))
return asStringDouble;
@@ -72,13 +84,21 @@ namespace SabreTools.Data.Models.Metadata
/// <remarks>TODO: Add logic to convert SI suffixes and hex</remarks>
public long? ReadLong(string key)
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return null;
long? asLong = Read<long?>(key);
if (asLong is not null)
return asLong;
int? asInt = Read<int?>(key);
if (asInt is not null)
return asInt;
short? asShort = Read<short?>(key);
if (asShort is not null)
return asShort;
string? asString = Read<string>(key);
if (asString is not null && long.TryParse(asString, out long asStringLong))
return asStringLong;
@@ -91,7 +111,7 @@ namespace SabreTools.Data.Models.Metadata
/// </summary>
public string? ReadString(string key)
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return null;
string? asString = Read<string>(key);
@@ -117,7 +137,7 @@ namespace SabreTools.Data.Models.Metadata
/// </summary>
public string[]? ReadStringArray(string key)
{
if (!ValidateKey(key))
if (!ValidateReadKey(key))
return null;
string[]? asArray = Read<string[]>(key);
@@ -136,9 +156,9 @@ namespace SabreTools.Data.Models.Metadata
}
/// <summary>
/// Check if a key is valid
/// Check if a key is valid for read
/// </summary>
private bool ValidateKey(string key)
private bool ValidateReadKey(string key)
{
if (string.IsNullOrEmpty(key))
return false;
@@ -149,5 +169,72 @@ namespace SabreTools.Data.Models.Metadata
return true;
}
#endregion
#region Write
/// <summary>
/// Remove a key, if possible
/// </summary>
public new bool Remove(string? fieldName)
{
// If the item or field name are missing, we can't do anything
if (string.IsNullOrEmpty(fieldName))
return false;
// If the key doesn't exist, then it's already removed
if (!ContainsKey(fieldName!))
return true;
// Remove the key
base.Remove(fieldName!);
return true;
}
/// <summary>
/// Replace a field from another item
/// </summary>
public bool Replace(DictionaryBase? from, string fieldName)
{
// If the source item is invalid
if (from is null)
return false;
// If the field name is missing, we can't do anything
if (string.IsNullOrEmpty(fieldName))
return false;
// If the types of the items are not the same, we can't do anything
if (from.GetType() != GetType())
return false;
// If the key doesn't exist in the source, we can't do anything
if (!from.TryGetValue(fieldName!, out var value))
return false;
// Set the key
this[fieldName!] = value;
return true;
}
/// <summary>
/// Write a key as the specified type, returning false on error
/// </summary>
/// <param name="fieldName">Field to set</param>
/// <param name="value">Value to set</param>
/// <returns>True if the value was set, false otherwise</returns>
public bool Write<T>(string fieldName, T? value)
{
// Invalid field cannot be processed
if (fieldName is null)
return false;
// Set the value based on the type
this[fieldName] = value;
return true;
}
#endregion
}
}

View File

@@ -20,13 +20,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
DatItem datItem = new Rom();
datItem.SetName("rom.bin");
datItem.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.Write(DatItem.MachineKey, machine);
datItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
@@ -36,7 +36,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var actualDatItems = datFile.GetItemsForBucket("machine");
DatItem actualRom = Assert.Single(actualDatItems);
Assert.Equal(true, actualRom.GetBoolFieldValue(DatItem.RemoveKey));
Assert.Equal(true, actualRom.ReadBool(DatItem.RemoveKey));
}
[Fact]
@@ -48,13 +48,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
DatItem datItem = new Rom();
datItem.SetName("rom.bin");
datItem.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.Write(DatItem.MachineKey, machine);
datItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long sourceIndex = datFile.AddSourceDB(source);
@@ -66,7 +66,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var actualDatItems = datFile.GetItemsForBucketDB("machine");
DatItem actualRom = Assert.Single(actualDatItems).Value;
Assert.Equal(true, actualRom.GetBoolFieldValue(DatItem.RemoveKey));
Assert.Equal(true, actualRom.ReadBool(DatItem.RemoveKey));
}
#endregion
@@ -79,12 +79,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.SetFieldValue(Data.Models.Metadata.Machine.DescriptionKey, "description");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description");
DatItem datItem = new Rom();
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write(DatItem.MachineKey, machine);
datItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
@@ -96,15 +96,15 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? actualMachine = actual.GetMachine();
Assert.NotNull(actualMachine);
Assert.Equal("description", actualMachine.GetName());
Assert.Equal("description", actualMachine.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey));
Assert.Equal("description", actualMachine.ReadString(Data.Models.Metadata.Machine.DescriptionKey));
}
[Fact]
public void MachineDescriptionToName_ItemsDB()
{
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.SetFieldValue(Data.Models.Metadata.Machine.DescriptionKey, "description");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.DescriptionKey, "description");
DatFile datFile = new Logiqx(datFile: null, useGame: false);
_ = datFile.AddMachineDB(machine);
@@ -113,7 +113,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine actualMachine = Assert.Single(datFile.GetMachinesDB()).Value;
Assert.Equal("description", actualMachine.GetName());
Assert.Equal("description", actualMachine.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey));
Assert.Equal("description", actualMachine.ReadString(Data.Models.Metadata.Machine.DescriptionKey));
}
#endregion
@@ -126,17 +126,17 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
DatItem rom = new Rom();
rom.SetName("rom.bin");
rom.SetFieldValue(DatItem.MachineKey, machine);
rom.SetFieldValue(DatItem.SourceKey, source);
rom.Write(DatItem.MachineKey, machine);
rom.Write(DatItem.SourceKey, source);
DatItem disk = new Disk();
disk.SetName("disk");
disk.SetFieldValue(DatItem.MachineKey, machine);
disk.SetFieldValue(DatItem.SourceKey, source);
disk.Write(DatItem.MachineKey, machine);
disk.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(rom, statsOnly: false);
@@ -165,7 +165,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "machine");
DatItem rom = new Rom();
rom.SetName("rom.bin");
@@ -204,19 +204,19 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SetOneGamePerRegion_Items()
{
Machine nowhereMachine = new Machine();
nowhereMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)");
nowhereMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)");
Machine worldMachine = new Machine();
worldMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine (World)");
worldMachine.SetFieldValue(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
worldMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (World)");
worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
DatItem nowhereRom = new Rom();
nowhereRom.SetName("rom.bin");
nowhereRom.SetFieldValue(DatItem.MachineKey, nowhereMachine);
nowhereRom.Write(DatItem.MachineKey, nowhereMachine);
DatItem worldRom = new Rom();
worldRom.SetName("rom.nib");
worldRom.SetFieldValue(DatItem.MachineKey, worldMachine);
worldRom.Write(DatItem.MachineKey, worldMachine);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(nowhereRom, statsOnly: false);
@@ -238,11 +238,11 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SetOneGamePerRegion_ItemsDB()
{
Machine nowhereMachine = new Machine();
nowhereMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)");
nowhereMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (Nowhere)");
Machine worldMachine = new Machine();
worldMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "machine (World)");
worldMachine.SetFieldValue(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
worldMachine.Write(Data.Models.Metadata.Machine.NameKey, "machine (World)");
worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
DatFile datFile = new Logiqx(datFile: null, useGame: false);
_ = datFile.AddMachineDB(nowhereMachine);
@@ -266,11 +266,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name");
machine.Write(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name");
DatItem datItem = new Rom();
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write(DatItem.MachineKey, machine);
datItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
@@ -288,7 +288,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void StripSceneDatesFromItems_ItemsDB()
{
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name");
machine.Write(Data.Models.Metadata.Machine.NameKey, "10.10.10-machine-name");
DatFile datFile = new Logiqx(datFile: null, useGame: false);
_ = datFile.AddMachineDB(machine);

View File

@@ -19,29 +19,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -64,29 +64,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -109,29 +109,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -157,29 +157,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -209,29 +209,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -254,29 +254,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -307,7 +307,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.SetFieldValue(Data.Models.Metadata.Machine.IsDeviceKey, true);
deviceMachine.Write(Data.Models.Metadata.Machine.IsDeviceKey, true);
Machine slotOptionMachine = new Machine();
slotOptionMachine.SetName("slotoption");
@@ -317,30 +317,30 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem deviceItem = new Sample();
deviceItem.SetName("device_item");
deviceItem.SetFieldValue(DatItem.MachineKey, deviceMachine);
deviceItem.SetFieldValue(DatItem.SourceKey, source);
deviceItem.Write(DatItem.MachineKey, deviceMachine);
deviceItem.Write(DatItem.SourceKey, source);
DatItem slotOptionItem = new Sample();
slotOptionItem.SetName("slot_option_item");
slotOptionItem.SetFieldValue(DatItem.MachineKey, slotOptionMachine);
slotOptionItem.SetFieldValue(DatItem.SourceKey, source);
slotOptionItem.Write(DatItem.MachineKey, slotOptionMachine);
slotOptionItem.Write(DatItem.SourceKey, source);
DatItem datItem = new Rom();
datItem.SetName("rom");
datItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.SetFieldValue(DatItem.MachineKey, itemMachine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.Write(DatItem.MachineKey, itemMachine);
datItem.Write(DatItem.SourceKey, source);
DatItem deviceRef = new DeviceRef();
deviceRef.SetName("device");
deviceRef.SetFieldValue(DatItem.MachineKey, itemMachine);
deviceRef.SetFieldValue(DatItem.SourceKey, source);
deviceRef.Write(DatItem.MachineKey, itemMachine);
deviceRef.Write(DatItem.SourceKey, source);
DatItem slotOption = new SlotOption();
slotOption.SetName("slotoption");
slotOption.SetFieldValue(DatItem.MachineKey, itemMachine);
slotOption.SetFieldValue(DatItem.SourceKey, source);
slotOption.Write(DatItem.MachineKey, itemMachine);
slotOption.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(deviceItem, statsOnly: false);
@@ -366,7 +366,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.SetFieldValue(Data.Models.Metadata.Machine.IsDeviceKey, true);
deviceMachine.Write(Data.Models.Metadata.Machine.IsDeviceKey, true);
Machine slotOptionMachine = new Machine();
slotOptionMachine.SetName("slotoption");
@@ -382,8 +382,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom();
datItem.SetName("rom");
datItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
DatItem deviceRef = new DeviceRef();
deviceRef.SetName("device");
@@ -422,29 +422,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -467,29 +467,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -516,19 +516,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine biosMachine = new Machine();
biosMachine.SetName("bios");
biosMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
biosMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.SetFieldValue(Data.Models.Metadata.Machine.IsDeviceKey, true);
deviceMachine.Write(Data.Models.Metadata.Machine.IsDeviceKey, true);
DatItem biosItem = new Rom();
biosItem.SetFieldValue(DatItem.MachineKey, biosMachine);
biosItem.SetFieldValue(DatItem.SourceKey, source);
biosItem.Write(DatItem.MachineKey, biosMachine);
biosItem.Write(DatItem.SourceKey, source);
DatItem deviceItem = new Rom();
deviceItem.SetFieldValue(DatItem.MachineKey, deviceMachine);
deviceItem.SetFieldValue(DatItem.SourceKey, source);
deviceItem.Write(DatItem.MachineKey, deviceMachine);
deviceItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(biosItem, statsOnly: false);
@@ -548,11 +548,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine biosMachine = new Machine();
biosMachine.SetName("bios");
biosMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
biosMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.SetFieldValue(Data.Models.Metadata.Machine.IsDeviceKey, true);
deviceMachine.Write(Data.Models.Metadata.Machine.IsDeviceKey, true);
DatItem biosItem = new Rom();
DatItem deviceItem = new Rom();
@@ -581,32 +581,32 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
parentMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -621,7 +621,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? actualMachine = actual.GetMachine();
Assert.NotNull(actualMachine);
Assert.Equal("child", actualMachine.GetName());
Assert.Equal("romof", actualMachine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey));
Assert.Equal("romof", actualMachine.ReadString(Data.Models.Metadata.Machine.RomOfKey));
}
[Fact]
@@ -631,32 +631,32 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
parentMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -674,7 +674,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? actualMachine = datFile.GetMachineForItemDB(actual).Value;
Assert.NotNull(actualMachine);
Assert.Equal("child", actualMachine.GetName());
Assert.Equal("romof", actualMachine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey));
Assert.Equal("romof", actualMachine.ReadString(Data.Models.Metadata.Machine.RomOfKey));
}
#endregion
@@ -691,29 +691,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -740,29 +740,29 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.SetFieldValue(Data.Models.Metadata.Machine.IsBiosKey, true);
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.Write(Data.Models.Metadata.Machine.IsBiosKey, true);
DatItem parentItem = new Rom();
parentItem.SetName("parent_rom");
parentItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.SetFieldValue(DatItem.MachineKey, parentMachine);
parentItem.SetFieldValue(DatItem.SourceKey, source);
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Write(DatItem.MachineKey, parentMachine);
parentItem.Write(DatItem.SourceKey, source);
DatItem matchChildItem = new Rom();
matchChildItem.SetName("match_child_rom");
matchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
matchChildItem.SetFieldValue(DatItem.SourceKey, source);
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Write(DatItem.MachineKey, childMachine);
matchChildItem.Write(DatItem.SourceKey, source);
DatItem noMatchChildItem = new Rom();
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.SetFieldValue(DatItem.MachineKey, childMachine);
noMatchChildItem.SetFieldValue(DatItem.SourceKey, source);
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Write(DatItem.MachineKey, childMachine);
noMatchChildItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -793,13 +793,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.SetName("machine");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "XXXXXX");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "XXXXXX");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, "XXXXXX");
DatItem datItem = new Rom();
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.SetFieldValue(DatItem.SourceKey, source);
datItem.Write(DatItem.MachineKey, machine);
datItem.Write(DatItem.SourceKey, source);
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
@@ -810,9 +810,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actualItem = Assert.Single(datFile.GetItemsForBucket("machine"));
Machine? actual = actualItem.GetMachine();
Assert.NotNull(actual);
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.SampleOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.CloneOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.RomOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.SampleOfKey));
}
[Fact]
@@ -822,9 +822,9 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.SetName("machine");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, "XXXXXX");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, "XXXXXX");
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "XXXXXX");
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, "XXXXXX");
DatItem datItem = new Rom();
@@ -837,9 +837,9 @@ namespace SabreTools.Metadata.DatFiles.Test
datFile.RemoveMachineRelationshipTags();
Machine actual = Assert.Single(datFile.GetMachinesDB()).Value;
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Machine.SampleOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.CloneOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.RomOfKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Machine.SampleOfKey));
}
#endregion

View File

@@ -95,14 +95,14 @@ namespace SabreTools.Metadata.DatFiles.Test
{
DatHeader item = new DatHeader(CreateMetadataHeader());
item.SetFieldValue<string[]>(Data.Models.Metadata.Header.CanOpenKey, ["ext"]);
item.SetFieldValue(Data.Models.Metadata.Header.ImagesKey,
item.Write<string[]>(Data.Models.Metadata.Header.CanOpenKey, ["ext"]);
item.Write(Data.Models.Metadata.Header.ImagesKey,
new Data.Models.OfflineList.Images() { Height = "height" });
item.SetFieldValue(Data.Models.Metadata.Header.InfosKey,
item.Write(Data.Models.Metadata.Header.InfosKey,
new Data.Models.OfflineList.Infos() { Comment = new Data.Models.OfflineList.Comment() });
item.SetFieldValue(Data.Models.Metadata.Header.NewDatKey,
item.Write(Data.Models.Metadata.Header.NewDatKey,
new Data.Models.OfflineList.NewDat() { DatUrl = new Data.Models.OfflineList.DatUrl() });
item.SetFieldValue(Data.Models.Metadata.Header.SearchKey,
item.Write(Data.Models.Metadata.Header.SearchKey,
new Data.Models.OfflineList.Search() { To = [] });
return item;
@@ -111,7 +111,7 @@ namespace SabreTools.Metadata.DatFiles.Test
private static Machine CreateMachine()
{
Machine item = new Machine(CreateMetadataMachine());
item.SetFieldValue(Data.Models.Metadata.Machine.TruripKey, CreateTrurip());
item.Write(Data.Models.Metadata.Machine.TruripKey, CreateTrurip());
return item;
}
@@ -182,7 +182,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
DipSwitch item = new DipSwitch(CreateMetadataDipSwitch());
item.CopyMachineInformation(machine);
item.SetFieldValue(DipSwitch.PartKey, CreatePart(machine));
item.Write(DipSwitch.PartKey, CreatePart(machine));
return item;
}
@@ -197,8 +197,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Disk item = new Disk(CreateMetadataDisk());
item.CopyMachineInformation(machine);
item.SetFieldValue(Disk.DiskAreaKey, CreateDiskArea(machine));
item.SetFieldValue(Disk.PartKey, CreatePart(machine));
item.Write(Disk.DiskAreaKey, CreateDiskArea(machine));
item.Write(Disk.PartKey, CreatePart(machine));
return item;
}
@@ -262,7 +262,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
PartFeature item = new PartFeature(CreateMetadataFeature());
item.CopyMachineInformation(machine);
item.SetFieldValue(PartFeature.PartKey, CreatePart(machine));
item.Write(PartFeature.PartKey, CreatePart(machine));
return item;
}
@@ -299,8 +299,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Rom item = new Rom(CreateMetadataRom());
item.CopyMachineInformation(machine);
item.SetFieldValue(Rom.DataAreaKey, CreateDataArea(machine));
item.SetFieldValue(Rom.PartKey, CreatePart(machine));
item.Write(Rom.DataAreaKey, CreateDataArea(machine));
item.Write(Rom.PartKey, CreatePart(machine));
return item;
}

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void CanOpenSpecified_Missing()
{
DatHeader header = new DatHeader();
header.SetFieldValue<string[]>(Data.Models.Metadata.Header.CanOpenKey, null);
header.Write<string[]>(Data.Models.Metadata.Header.CanOpenKey, null);
Assert.False(header.CanOpenSpecified);
}
@@ -18,7 +18,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void CanOpenSpecified_Empty()
{
DatHeader header = new DatHeader();
header.SetFieldValue<string[]>(Data.Models.Metadata.Header.CanOpenKey, []);
header.Write<string[]>(Data.Models.Metadata.Header.CanOpenKey, []);
Assert.False(header.CanOpenSpecified);
}
@@ -26,7 +26,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void CanOpenSpecified_Exists()
{
DatHeader header = new DatHeader();
header.SetFieldValue<string[]>(Data.Models.Metadata.Header.CanOpenKey, ["value"]);
header.Write<string[]>(Data.Models.Metadata.Header.CanOpenKey, ["value"]);
Assert.True(header.CanOpenSpecified);
}
@@ -38,7 +38,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ImagesSpecified_Missing()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey, null);
header.Write<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey, null);
Assert.False(header.ImagesSpecified);
}
@@ -46,7 +46,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ImagesSpecified_Exists()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey, new());
header.Write<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey, new());
Assert.True(header.ImagesSpecified);
}
@@ -58,7 +58,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void InfosSpecified_Missing()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey, null);
header.Write<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey, null);
Assert.False(header.InfosSpecified);
}
@@ -66,7 +66,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void InfosSpecified_Exists()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey, new());
header.Write<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey, new());
Assert.True(header.InfosSpecified);
}
@@ -78,7 +78,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void NewDatSpecified_Missing()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey, null);
header.Write<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey, null);
Assert.False(header.NewDatSpecified);
}
@@ -86,7 +86,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void NewDatSpecified_Exists()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey, new());
header.Write<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey, new());
Assert.True(header.NewDatSpecified);
}
@@ -98,7 +98,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SearchSpecified_Missing()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey, null);
header.Write<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey, null);
Assert.False(header.SearchSpecified);
}
@@ -106,7 +106,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SearchSpecified_Exists()
{
DatHeader header = new DatHeader();
header.SetFieldValue<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey, new());
header.Write<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey, new());
Assert.True(header.SearchSpecified);
}
@@ -118,12 +118,12 @@ namespace SabreTools.Metadata.DatFiles.Test
public void CloneTest()
{
DatHeader header = new DatHeader();
header.SetFieldValue(Data.Models.Metadata.Header.NameKey, "name");
header.Write(Data.Models.Metadata.Header.NameKey, "name");
object clone = header.Clone();
DatHeader? actual = clone as DatHeader;
Assert.NotNull(actual);
Assert.Equal("name", actual.GetStringFieldValue(Data.Models.Metadata.Header.NameKey));
Assert.Equal("name", actual.ReadString(Data.Models.Metadata.Header.NameKey));
}
#endregion
@@ -134,12 +134,12 @@ namespace SabreTools.Metadata.DatFiles.Test
public void CloneFormatTest()
{
DatHeader header = new DatHeader();
header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.Logiqx);
header.Write(DatHeader.DatFormatKey, DatFormat.Logiqx);
object clone = header.Clone();
DatHeader? actual = clone as DatHeader;
Assert.NotNull(actual);
Assert.Equal(DatFormat.Logiqx, actual.GetFieldValue<DatFormat>(DatHeader.DatFormatKey));
Assert.Equal(DatFormat.Logiqx, actual.Read<DatFormat>(DatHeader.DatFormatKey));
}
#endregion
@@ -150,7 +150,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetInternalCloneTest()
{
DatHeader header = new DatHeader();
header.SetFieldValue(Data.Models.Metadata.Header.NameKey, "name");
header.Write(Data.Models.Metadata.Header.NameKey, "name");
Data.Models.Metadata.Header actual = header.GetInternalClone();
Assert.Equal("name", actual[Data.Models.Metadata.Header.NameKey]);
@@ -184,10 +184,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void Equals_MismatchedInternal_False()
{
DatHeader self = new DatHeader();
self.SetFieldValue(Data.Models.Metadata.Header.NameKey, "self");
self.Write(Data.Models.Metadata.Header.NameKey, "self");
DatHeader? other = new DatHeader();
other.SetFieldValue(Data.Models.Metadata.Header.NameKey, "other");
other.Write(Data.Models.Metadata.Header.NameKey, "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.SetFieldValue(Data.Models.Metadata.Header.NameKey, "name");
self.Write(Data.Models.Metadata.Header.NameKey, "name");
DatHeader? other = new DatHeader();
other.SetFieldValue(Data.Models.Metadata.Header.NameKey, "name");
other.Write(Data.Models.Metadata.Header.NameKey, "name");
bool actual = self.Equals(other);
Assert.True(actual);

View File

@@ -253,9 +253,9 @@ namespace SabreTools.Metadata.DatFiles.Test
{
var disk = new Disk();
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Good.AsStringValue());
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
disk.Write<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Good.AsStringValue());
disk.Write<string?>(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
return disk;
}
@@ -284,10 +284,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
var media = new Media();
media.SetFieldValue<string?>(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
media.SetFieldValue<string?>(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
media.SetFieldValue<string?>(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.SetFieldValue<string?>(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.Write<string?>(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
return media;
}
@@ -299,21 +299,21 @@ namespace SabreTools.Metadata.DatFiles.Test
{
var rom = new Rom();
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Good.AsStringValue());
rom.SetFieldValue<long>(Data.Models.Metadata.Rom.SizeKey, 1);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key, HashType.CRC16.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key, HashType.CRC64.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key, HashType.MD2.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key, HashType.MD4.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, HashType.RIPEMD128.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, HashType.RIPEMD160.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, HashType.SHA256.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key, HashType.SHA384.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key, HashType.SHA512.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SpamSumKey, HashType.SpamSum.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Good.AsStringValue());
rom.Write<long>(Data.Models.Metadata.Rom.SizeKey, 1);
rom.Write<string?>(Data.Models.Metadata.Rom.CRC16Key, HashType.CRC16.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.CRC64Key, HashType.CRC64.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.MD2Key, HashType.MD2.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.MD4Key, HashType.MD4.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, HashType.RIPEMD128.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, HashType.RIPEMD160.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA256Key, HashType.SHA256.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA384Key, HashType.SHA384.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA512Key, HashType.SHA512.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SpamSumKey, HashType.SpamSum.ZeroString);
return rom;
}

View File

@@ -18,7 +18,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem disk = new Disk();
disk.SetName("item");
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Disk);
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Disk.StatusKey));
}
[Fact]
@@ -46,7 +46,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Disk);
Assert.Equal("nodump", actual.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey));
Assert.Equal("nodump", actual.ReadString(Data.Models.Metadata.Disk.StatusKey));
}
[Fact]
@@ -96,7 +96,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem media = new Media();
media.SetName("item");
media.SetFieldValue<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -135,8 +135,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -145,9 +145,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Rom);
Assert.Equal(12345, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -158,7 +158,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -167,9 +167,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Rom);
Assert.Equal(12345, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("nodump", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("nodump", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -180,7 +180,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -189,9 +189,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Rom);
Assert.Null(actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Null(actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -210,9 +210,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Assert.True(actual is Rom);
Assert.Equal(0, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(HashType.SHA1.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(0, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -294,16 +294,16 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom2.SetFieldValue<bool?>(DatItem.RemoveKey, true);
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom2.Write<bool?>(DatItem.RemoveKey, true);
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -372,7 +372,7 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.Write<bool?>(DatItem.RemoveKey, true);
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -393,7 +393,7 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.Write<bool?>(DatItem.RemoveKey, true);
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -509,10 +509,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine origMachine = new Machine();
origMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "original");
origMachine.Write(Data.Models.Metadata.Machine.NameKey, "original");
Machine newMachine = new Machine();
newMachine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "new");
newMachine.Write(Data.Models.Metadata.Machine.NameKey, "new");
DatItem datItem = new Rom();
@@ -544,9 +544,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom();
datItem.SetName("rom-1");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -572,9 +572,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom();
datItem.SetName("rom-1");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -624,27 +624,27 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom3 = new Rom();
rom3.SetName("rom-3");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom3.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom3.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom3.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom4 = new Rom();
rom4.SetName("rom-4");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom4.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom4.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom4.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -675,13 +675,13 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -747,13 +747,13 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -781,13 +781,13 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -815,13 +815,13 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -849,13 +849,13 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -883,13 +883,13 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -914,13 +914,13 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -932,8 +932,8 @@ namespace SabreTools.Metadata.DatFiles.Test
// Setup the test item
DatItem rom = new Rom();
rom.SetName("rom-1");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, hasDuplicate ? "1024" : "2048");
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, hasDuplicate ? "1024" : "2048");
var actual = dict.GetDuplicates(new KeyValuePair<long, DatItem>(-1, rom));
Assert.Equal(expected, actual.Count);
@@ -956,13 +956,13 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -974,8 +974,8 @@ namespace SabreTools.Metadata.DatFiles.Test
// Setup the test item
DatItem rom = new Rom();
rom.SetName("rom-1");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, expected ? "1024" : "2048");
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, expected ? "1024" : "2048");
bool actual = dict.HasDuplicates(new KeyValuePair<long, DatItem>(-1, rom));
Assert.Equal(expected, actual);
@@ -995,8 +995,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom();
item.SetName("rom");
item.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
item.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -1009,7 +1009,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(1, dict.DatStatistics.GetHashCount(HashType.CRC32));
Assert.Equal(0, dict.DatStatistics.GetHashCount(HashType.MD5));
item.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
item.Write<string?>(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
dict.RecalculateStats();

View File

@@ -18,16 +18,16 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem disk = new Disk();
disk.SetName("item");
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
disk.SetFieldValue<Source?>(DatItem.SourceKey, source);
disk.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
disk.Write<Source?>(DatItem.SourceKey, source);
disk.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(disk, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Disk);
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Disk.StatusKey));
}
[Fact]
@@ -38,15 +38,15 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem disk = new Disk();
disk.SetName("item");
disk.SetFieldValue<Source?>(DatItem.SourceKey, source);
disk.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
disk.Write<Source?>(DatItem.SourceKey, source);
disk.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(disk, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Disk);
Assert.Equal("nodump", actual.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey));
Assert.Equal("nodump", actual.ReadString(Data.Models.Metadata.Disk.StatusKey));
}
[Fact]
@@ -58,8 +58,8 @@ namespace SabreTools.Metadata.DatFiles.Test
var file = new File();
file.SetName("item");
file.SHA1 = "deadbeef";
file.SetFieldValue<Source?>(DatItem.SourceKey, source);
file.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
file.Write<Source?>(DatItem.SourceKey, source);
file.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(file, statsOnly: false);
@@ -77,8 +77,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem file = new File();
file.SetName("item");
file.SetFieldValue<Source?>(DatItem.SourceKey, source);
file.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
file.Write<Source?>(DatItem.SourceKey, source);
file.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(file, statsOnly: false);
@@ -96,9 +96,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem media = new Media();
media.SetName("item");
media.SetFieldValue<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
media.SetFieldValue<Source?>(DatItem.SourceKey, source);
media.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
media.Write<string?>(Data.Models.Metadata.Media.SHA1Key, "deadbeef");
media.Write<Source?>(DatItem.SourceKey, source);
media.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(media, statsOnly: false);
@@ -116,8 +116,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem media = new Media();
media.SetName("item");
media.SetFieldValue<Source?>(DatItem.SourceKey, source);
media.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
media.Write<Source?>(DatItem.SourceKey, source);
media.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(media, statsOnly: false);
@@ -135,19 +135,19 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.SetFieldValue<Source?>(DatItem.SourceKey, source);
rom.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Write<Source?>(DatItem.SourceKey, source);
rom.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Rom);
Assert.Equal(12345, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -158,18 +158,18 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.SetFieldValue<Source?>(DatItem.SourceKey, source);
rom.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<Source?>(DatItem.SourceKey, source);
rom.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Rom);
Assert.Equal(12345, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("nodump", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("nodump", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -180,18 +180,18 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.SetFieldValue<Source?>(DatItem.SourceKey, source);
rom.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Write<Source?>(DatItem.SourceKey, source);
rom.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Rom);
Assert.Null(actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Null(actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -202,17 +202,17 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom();
rom.SetName("item");
rom.SetFieldValue<Source?>(DatItem.SourceKey, source);
rom.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
rom.Write<Source?>(DatItem.SourceKey, source);
rom.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Assert.True(actual is Rom);
Assert.Equal(0, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(HashType.SHA1.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal(0, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("none", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
}
[Fact]
@@ -223,8 +223,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom();
item.SetName("item");
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: true);
@@ -240,8 +240,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom();
item.SetName("item");
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -262,17 +262,17 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.SetFieldValue<bool?>(DatItem.RemoveKey, true);
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.Write<bool?>(DatItem.RemoveKey, true);
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -299,8 +299,8 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -319,8 +319,8 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -339,9 +339,9 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<bool?>(DatItem.RemoveKey, true);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -360,9 +360,9 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<bool?>(DatItem.RemoveKey, true);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -381,8 +381,8 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.SetName("machine");
DatItem item = new Rom();
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -404,9 +404,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom();
datItem.SetName("rom-1");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.CopyMachineInformation(machine);
var dict = new ItemDictionary();
@@ -430,9 +430,9 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom();
datItem.SetName("rom-1");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
datItem.CopyMachineInformation(machine);
var dict = new ItemDictionary();
@@ -464,30 +464,30 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine1);
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine1);
DatItem rom3 = new Rom();
rom3.SetName("rom-3");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom3.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom3.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom3.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom3.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine2);
DatItem rom4 = new Rom();
rom4.SetName("rom-4");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom4.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom4.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom4.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom4.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine2);
// Setup the dictionary
@@ -514,14 +514,14 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -570,14 +570,14 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
romA.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
romA.Write<Source?>(DatItem.SourceKey, new Source(0));
romA.CopyMachineInformation(machineA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.SetFieldValue<Source?>(DatItem.SourceKey, new Source(1));
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -597,14 +597,14 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write<Source?>(DatItem.SourceKey, new Source(0));
romA.CopyMachineInformation(machineA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.SetFieldValue<Source?>(DatItem.SourceKey, new Source(1));
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -624,14 +624,14 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write<Source?>(DatItem.SourceKey, new Source(0));
romA.CopyMachineInformation(machineA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.SetFieldValue<Source?>(DatItem.SourceKey, new Source(1));
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -651,14 +651,14 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write<Source?>(DatItem.SourceKey, new Source(0));
romA.CopyMachineInformation(machineA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(0));
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -678,14 +678,14 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom();
romA.SetName("same-name");
romA.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Write<Source?>(DatItem.SourceKey, new Source(0));
romA.CopyMachineInformation(machineA);
var romB = new Rom();
romB.SetName("same-name");
romB.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.SetFieldValue<Source?>(DatItem.SourceKey, new Source(0));
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(0));
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -707,14 +707,14 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -725,8 +725,8 @@ namespace SabreTools.Metadata.DatFiles.Test
// Setup the test item
DatItem rom = new Rom();
rom.SetName("rom-1");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, hasDuplicate ? "1024" : "2048");
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, hasDuplicate ? "1024" : "2048");
rom.CopyMachineInformation(machine);
var actual = dict.GetDuplicates(rom);
@@ -748,14 +748,14 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom();
rom2.SetName("rom-2");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
// Setup the dictionary
@@ -766,8 +766,8 @@ namespace SabreTools.Metadata.DatFiles.Test
// Setup the test item
DatItem rom = new Rom();
rom.SetName("rom-1");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, expected ? "1024" : "2048");
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, expected ? "1024" : "2048");
rom1.CopyMachineInformation(machine);
bool actual = dict.HasDuplicates(rom);
@@ -788,10 +788,10 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom();
item.SetName("rom");
item.SetFieldValue<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.SetFieldValue<Machine?>(DatItem.MachineKey, machine);
item.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
item.Write<Source?>(DatItem.SourceKey, source);
item.Write<Machine?>(DatItem.MachineKey, machine);
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -802,7 +802,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(1, dict.DatStatistics.GetHashCount(HashType.CRC32));
Assert.Equal(0, dict.DatStatistics.GetHashCount(HashType.MD5));
item.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
item.Write<string?>(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
dict.RecalculateStats();

View File

@@ -125,7 +125,7 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.GetName();
string? machineDesc = machine.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey);
string? machineDesc = machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey);
if (machineName is null || machineDesc is null)
continue;
@@ -166,7 +166,7 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.Value.GetName();
string? machineDesc = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey);
string? machineDesc = machine.Value.ReadString(Data.Models.Metadata.Machine.DescriptionKey);
if (machineName is null || machineDesc is null)
continue;
@@ -242,7 +242,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (var item in items)
{
if (!item.PassesFilter(filterRunner))
item.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.Write<bool?>(DatItem.RemoveKey, true);
}
}
@@ -263,7 +263,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (var item in items)
{
if (!item.Value.PassesFilterDB(filterRunner))
item.Value.SetFieldValue<bool?>(DatItem.RemoveKey, true);
item.Value.Write<bool?>(DatItem.RemoveKey, true);
}
}
@@ -332,8 +332,8 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the string values
string? cloneOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey)?.ToLowerInvariant();
string? romOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey)?.ToLowerInvariant();
string? cloneOf = machine.ReadString(Data.Models.Metadata.Machine.CloneOfKey)?.ToLowerInvariant();
string? romOf = machine.ReadString(Data.Models.Metadata.Machine.RomOfKey)?.ToLowerInvariant();
// Match on CloneOf first
if (!string.IsNullOrEmpty(cloneOf))
@@ -411,8 +411,8 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the string values
string? cloneOf = machineObj.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey)?.ToLowerInvariant();
string? romOf = machineObj.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey)?.ToLowerInvariant();
string? cloneOf = machineObj.ReadString(Data.Models.Metadata.Machine.CloneOfKey)?.ToLowerInvariant();
string? romOf = machineObj.ReadString(Data.Models.Metadata.Machine.RomOfKey)?.ToLowerInvariant();
// Match on CloneOf first
if (!string.IsNullOrEmpty(cloneOf))
@@ -522,7 +522,7 @@ namespace SabreTools.Metadata.DatFiles
machine = (Machine)machine.Clone();
// Reassign the item to the new machine
datItem.SetFieldValue(DatItem.MachineKey, machine);
datItem.Write(DatItem.MachineKey, machine);
// Remove extensions from File and Rom items
if (datItem is DatItems.Formats.File || datItem is Rom)
@@ -652,13 +652,13 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.GetName();
string? machineDesc = machine.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey);
string? machineDesc = machine.ReadString(Data.Models.Metadata.Machine.DescriptionKey);
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
item.GetMachine()!.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
item.GetMachine()!.SetFieldValue<string?>(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2"));
item.GetMachine()!.Write<string?>(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2"));
}
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
@@ -690,13 +690,13 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.Value.GetName();
string? machineDesc = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.DescriptionKey);
string? machineDesc = machine.Value.ReadString(Data.Models.Metadata.Machine.DescriptionKey);
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
machine.Value.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2"));
machine.Value.Write<string?>(Data.Models.Metadata.Machine.DescriptionKey, Regex.Replace(machineDesc, SceneNamePattern, "$2"));
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
#else
@@ -733,9 +733,9 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.GetName();
string? cloneOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? romOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? sampleOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.SampleOfKey);
string? cloneOf = machine.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
string? romOf = machine.ReadString(Data.Models.Metadata.Machine.RomOfKey);
string? sampleOf = machine.ReadString(Data.Models.Metadata.Machine.SampleOfKey);
// Update machine name
if (machineName is not null && mapping.ContainsKey(machineName))
@@ -743,15 +743,15 @@ namespace SabreTools.Metadata.DatFiles
// Update cloneof
if (cloneOf is not null && mapping.ContainsKey(cloneOf))
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
// Update romof
if (romOf is not null && mapping.ContainsKey(romOf))
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
// Update sampleof
if (sampleOf is not null && mapping.ContainsKey(sampleOf))
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
}
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
@@ -774,9 +774,9 @@ namespace SabreTools.Metadata.DatFiles
// Get the values to check against
string? machineName = machine.Value.GetName();
string? cloneOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? romOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? sampleOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.SampleOfKey);
string? cloneOf = machine.Value.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
string? romOf = machine.Value.ReadString(Data.Models.Metadata.Machine.RomOfKey);
string? sampleOf = machine.Value.ReadString(Data.Models.Metadata.Machine.SampleOfKey);
// Update machine name
if (machineName is not null && mapping.ContainsKey(machineName))
@@ -784,15 +784,15 @@ namespace SabreTools.Metadata.DatFiles
// Update cloneof
if (cloneOf is not null && mapping.ContainsKey(cloneOf))
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
// Update romof
if (romOf is not null && mapping.ContainsKey(romOf))
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
// Update sampleof
if (sampleOf is not null && mapping.ContainsKey(sampleOf))
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
}
}

View File

@@ -70,118 +70,118 @@ namespace SabreTools.Metadata.DatFiles
{
var canOpen = item.Read<Data.Models.OfflineList.CanOpen>(Data.Models.Metadata.Header.CanOpenKey);
if (canOpen?.Extension is not null)
Header.SetFieldValue<string[]?>(Data.Models.Metadata.Header.CanOpenKey, canOpen.Extension);
Header.Write<string[]?>(Data.Models.Metadata.Header.CanOpenKey, canOpen.Extension);
}
if (item.ContainsKey(Data.Models.Metadata.Header.ImagesKey))
{
var images = item.Read<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey);
Header.SetFieldValue<Data.Models.OfflineList.Images?>(Data.Models.Metadata.Header.ImagesKey, images);
Header.Write<Data.Models.OfflineList.Images?>(Data.Models.Metadata.Header.ImagesKey, images);
}
if (item.ContainsKey(Data.Models.Metadata.Header.InfosKey))
{
var infos = item.Read<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey);
Header.SetFieldValue<Data.Models.OfflineList.Infos?>(Data.Models.Metadata.Header.InfosKey, infos);
Header.Write<Data.Models.OfflineList.Infos?>(Data.Models.Metadata.Header.InfosKey, infos);
}
if (item.ContainsKey(Data.Models.Metadata.Header.NewDatKey))
{
var newDat = item.Read<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey);
Header.SetFieldValue<Data.Models.OfflineList.NewDat?>(Data.Models.Metadata.Header.NewDatKey, newDat);
Header.Write<Data.Models.OfflineList.NewDat?>(Data.Models.Metadata.Header.NewDatKey, newDat);
}
if (item.ContainsKey(Data.Models.Metadata.Header.SearchKey))
{
var search = item.Read<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey);
Header.SetFieldValue<Data.Models.OfflineList.Search?>(Data.Models.Metadata.Header.SearchKey, search);
Header.Write<Data.Models.OfflineList.Search?>(Data.Models.Metadata.Header.SearchKey, search);
}
// Selectively set all possible fields -- TODO: Figure out how to make this less manual
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.AuthorKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.AuthorKey, header.GetStringFieldValue(Data.Models.Metadata.Header.AuthorKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.BiosModeKey).AsMergingFlag() == MergingFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.BiosModeKey, header.GetStringFieldValue(Data.Models.Metadata.Header.BiosModeKey).AsMergingFlag().AsStringValue());
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.BuildKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.BuildKey, header.GetStringFieldValue(Data.Models.Metadata.Header.BuildKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.CategoryKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.CategoryKey, header.GetStringFieldValue(Data.Models.Metadata.Header.CategoryKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.CommentKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.CommentKey, header.GetStringFieldValue(Data.Models.Metadata.Header.CommentKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.DateKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.DateKey, header.GetStringFieldValue(Data.Models.Metadata.Header.DateKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.DatVersionKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.DatVersionKey, header.GetStringFieldValue(Data.Models.Metadata.Header.DatVersionKey));
if (Header.GetBoolFieldValue(Data.Models.Metadata.Header.DebugKey) is null)
Header.SetFieldValue(Data.Models.Metadata.Header.DebugKey, header.GetBoolFieldValue(Data.Models.Metadata.Header.DebugKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.DescriptionKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.DescriptionKey, header.GetStringFieldValue(Data.Models.Metadata.Header.DescriptionKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.EmailKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.EmailKey, header.GetStringFieldValue(Data.Models.Metadata.Header.EmailKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.EmulatorVersionKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.EmulatorVersionKey, header.GetStringFieldValue(Data.Models.Metadata.Header.EmulatorVersionKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ForceMergingKey).AsMergingFlag() == MergingFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ForceMergingKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ForceMergingKey).AsMergingFlag().AsStringValue());
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ForceNodumpKey).AsNodumpFlag() == NodumpFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ForceNodumpKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ForceNodumpKey).AsNodumpFlag().AsStringValue());
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ForcePackingKey).AsPackingFlag() == PackingFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ForcePackingKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ForcePackingKey).AsPackingFlag().AsStringValue());
if (Header.GetBoolFieldValue(Data.Models.Metadata.Header.ForceZippingKey) is null)
Header.SetFieldValue(Data.Models.Metadata.Header.ForceZippingKey, header.GetBoolFieldValue(Data.Models.Metadata.Header.ForceZippingKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.HeaderKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.HeaderKey, header.GetStringFieldValue(Data.Models.Metadata.Header.HeaderKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.HomepageKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.HomepageKey, header.GetStringFieldValue(Data.Models.Metadata.Header.HomepageKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.IdKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.IdKey, header.GetStringFieldValue(Data.Models.Metadata.Header.IdKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ImFolderKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ImFolderKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ImFolderKey));
if (Header.GetBoolFieldValue(Data.Models.Metadata.Header.LockBiosModeKey) is null)
Header.SetFieldValue(Data.Models.Metadata.Header.LockBiosModeKey, header.GetBoolFieldValue(Data.Models.Metadata.Header.LockBiosModeKey));
if (Header.GetBoolFieldValue(Data.Models.Metadata.Header.LockRomModeKey) is null)
Header.SetFieldValue(Data.Models.Metadata.Header.LockRomModeKey, header.GetBoolFieldValue(Data.Models.Metadata.Header.LockRomModeKey));
if (Header.GetBoolFieldValue(Data.Models.Metadata.Header.LockSampleModeKey) is null)
Header.SetFieldValue(Data.Models.Metadata.Header.LockSampleModeKey, header.GetBoolFieldValue(Data.Models.Metadata.Header.LockSampleModeKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.MameConfigKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.MameConfigKey, header.GetStringFieldValue(Data.Models.Metadata.Header.MameConfigKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.NameKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.NameKey, header.GetStringFieldValue(Data.Models.Metadata.Header.NameKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.NotesKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.NotesKey, header.GetStringFieldValue(Data.Models.Metadata.Header.NotesKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.PluginKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.PluginKey, header.GetStringFieldValue(Data.Models.Metadata.Header.PluginKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.RefNameKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.RefNameKey, header.GetStringFieldValue(Data.Models.Metadata.Header.RefNameKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.RomModeKey).AsMergingFlag() == MergingFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.RomModeKey, header.GetStringFieldValue(Data.Models.Metadata.Header.RomModeKey).AsMergingFlag().AsStringValue());
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.RomTitleKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.RomTitleKey, header.GetStringFieldValue(Data.Models.Metadata.Header.RomTitleKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.RootDirKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.RootDirKey, header.GetStringFieldValue(Data.Models.Metadata.Header.RootDirKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.SampleModeKey).AsMergingFlag() == MergingFlag.None)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.SampleModeKey, header.GetStringFieldValue(Data.Models.Metadata.Header.SampleModeKey).AsMergingFlag().AsStringValue());
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.SchemaLocationKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.SchemaLocationKey, header.GetStringFieldValue(Data.Models.Metadata.Header.SchemaLocationKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ScreenshotsHeightKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ScreenshotsHeightKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ScreenshotsHeightKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.ScreenshotsWidthKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.ScreenshotsWidthKey, header.GetStringFieldValue(Data.Models.Metadata.Header.ScreenshotsWidthKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.SystemKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.SystemKey, header.GetStringFieldValue(Data.Models.Metadata.Header.SystemKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.TimestampKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.TimestampKey, header.GetStringFieldValue(Data.Models.Metadata.Header.TimestampKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.TypeKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.TypeKey, header.GetStringFieldValue(Data.Models.Metadata.Header.TypeKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.UrlKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.UrlKey, header.GetStringFieldValue(Data.Models.Metadata.Header.UrlKey));
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.VersionKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.VersionKey, header.GetStringFieldValue(Data.Models.Metadata.Header.VersionKey));
if (Header.ReadString(Data.Models.Metadata.Header.AuthorKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.AuthorKey, header.ReadString(Data.Models.Metadata.Header.AuthorKey));
if (Header.ReadString(Data.Models.Metadata.Header.BiosModeKey).AsMergingFlag() == MergingFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.BiosModeKey, header.ReadString(Data.Models.Metadata.Header.BiosModeKey).AsMergingFlag().AsStringValue());
if (Header.ReadString(Data.Models.Metadata.Header.BuildKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.BuildKey, header.ReadString(Data.Models.Metadata.Header.BuildKey));
if (Header.ReadString(Data.Models.Metadata.Header.CategoryKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.CategoryKey, header.ReadString(Data.Models.Metadata.Header.CategoryKey));
if (Header.ReadString(Data.Models.Metadata.Header.CommentKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.CommentKey, header.ReadString(Data.Models.Metadata.Header.CommentKey));
if (Header.ReadString(Data.Models.Metadata.Header.DateKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.DateKey, header.ReadString(Data.Models.Metadata.Header.DateKey));
if (Header.ReadString(Data.Models.Metadata.Header.DatVersionKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.DatVersionKey, header.ReadString(Data.Models.Metadata.Header.DatVersionKey));
if (Header.ReadBool(Data.Models.Metadata.Header.DebugKey) is null)
Header.Write(Data.Models.Metadata.Header.DebugKey, header.ReadBool(Data.Models.Metadata.Header.DebugKey));
if (Header.ReadString(Data.Models.Metadata.Header.DescriptionKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.DescriptionKey, header.ReadString(Data.Models.Metadata.Header.DescriptionKey));
if (Header.ReadString(Data.Models.Metadata.Header.EmailKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.EmailKey, header.ReadString(Data.Models.Metadata.Header.EmailKey));
if (Header.ReadString(Data.Models.Metadata.Header.EmulatorVersionKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.EmulatorVersionKey, header.ReadString(Data.Models.Metadata.Header.EmulatorVersionKey));
if (Header.ReadString(Data.Models.Metadata.Header.ForceMergingKey).AsMergingFlag() == MergingFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.ForceMergingKey, header.ReadString(Data.Models.Metadata.Header.ForceMergingKey).AsMergingFlag().AsStringValue());
if (Header.ReadString(Data.Models.Metadata.Header.ForceNodumpKey).AsNodumpFlag() == NodumpFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.ForceNodumpKey, header.ReadString(Data.Models.Metadata.Header.ForceNodumpKey).AsNodumpFlag().AsStringValue());
if (Header.ReadString(Data.Models.Metadata.Header.ForcePackingKey).AsPackingFlag() == PackingFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.ForcePackingKey, header.ReadString(Data.Models.Metadata.Header.ForcePackingKey).AsPackingFlag().AsStringValue());
if (Header.ReadBool(Data.Models.Metadata.Header.ForceZippingKey) is null)
Header.Write(Data.Models.Metadata.Header.ForceZippingKey, header.ReadBool(Data.Models.Metadata.Header.ForceZippingKey));
if (Header.ReadString(Data.Models.Metadata.Header.HeaderKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.HeaderKey, header.ReadString(Data.Models.Metadata.Header.HeaderKey));
if (Header.ReadString(Data.Models.Metadata.Header.HomepageKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.HomepageKey, header.ReadString(Data.Models.Metadata.Header.HomepageKey));
if (Header.ReadString(Data.Models.Metadata.Header.IdKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.IdKey, header.ReadString(Data.Models.Metadata.Header.IdKey));
if (Header.ReadString(Data.Models.Metadata.Header.ImFolderKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.ImFolderKey, header.ReadString(Data.Models.Metadata.Header.ImFolderKey));
if (Header.ReadBool(Data.Models.Metadata.Header.LockBiosModeKey) is null)
Header.Write(Data.Models.Metadata.Header.LockBiosModeKey, header.ReadBool(Data.Models.Metadata.Header.LockBiosModeKey));
if (Header.ReadBool(Data.Models.Metadata.Header.LockRomModeKey) is null)
Header.Write(Data.Models.Metadata.Header.LockRomModeKey, header.ReadBool(Data.Models.Metadata.Header.LockRomModeKey));
if (Header.ReadBool(Data.Models.Metadata.Header.LockSampleModeKey) is null)
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<string?>(Data.Models.Metadata.Header.MameConfigKey, header.ReadString(Data.Models.Metadata.Header.MameConfigKey));
if (Header.ReadString(Data.Models.Metadata.Header.NameKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.NameKey, header.ReadString(Data.Models.Metadata.Header.NameKey));
if (Header.ReadString(Data.Models.Metadata.Header.NotesKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.NotesKey, header.ReadString(Data.Models.Metadata.Header.NotesKey));
if (Header.ReadString(Data.Models.Metadata.Header.PluginKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.PluginKey, header.ReadString(Data.Models.Metadata.Header.PluginKey));
if (Header.ReadString(Data.Models.Metadata.Header.RefNameKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.RefNameKey, header.ReadString(Data.Models.Metadata.Header.RefNameKey));
if (Header.ReadString(Data.Models.Metadata.Header.RomModeKey).AsMergingFlag() == MergingFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.RomModeKey, header.ReadString(Data.Models.Metadata.Header.RomModeKey).AsMergingFlag().AsStringValue());
if (Header.ReadString(Data.Models.Metadata.Header.RomTitleKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.RomTitleKey, header.ReadString(Data.Models.Metadata.Header.RomTitleKey));
if (Header.ReadString(Data.Models.Metadata.Header.RootDirKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.RootDirKey, header.ReadString(Data.Models.Metadata.Header.RootDirKey));
if (Header.ReadString(Data.Models.Metadata.Header.SampleModeKey).AsMergingFlag() == MergingFlag.None)
Header.Write<string?>(Data.Models.Metadata.Header.SampleModeKey, header.ReadString(Data.Models.Metadata.Header.SampleModeKey).AsMergingFlag().AsStringValue());
if (Header.ReadString(Data.Models.Metadata.Header.SchemaLocationKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.SchemaLocationKey, header.ReadString(Data.Models.Metadata.Header.SchemaLocationKey));
if (Header.ReadString(Data.Models.Metadata.Header.ScreenshotsHeightKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.ScreenshotsHeightKey, header.ReadString(Data.Models.Metadata.Header.ScreenshotsHeightKey));
if (Header.ReadString(Data.Models.Metadata.Header.ScreenshotsWidthKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.ScreenshotsWidthKey, header.ReadString(Data.Models.Metadata.Header.ScreenshotsWidthKey));
if (Header.ReadString(Data.Models.Metadata.Header.SystemKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.SystemKey, header.ReadString(Data.Models.Metadata.Header.SystemKey));
if (Header.ReadString(Data.Models.Metadata.Header.TimestampKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.TimestampKey, header.ReadString(Data.Models.Metadata.Header.TimestampKey));
if (Header.ReadString(Data.Models.Metadata.Header.TypeKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.TypeKey, header.ReadString(Data.Models.Metadata.Header.TypeKey));
if (Header.ReadString(Data.Models.Metadata.Header.UrlKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.UrlKey, header.ReadString(Data.Models.Metadata.Header.UrlKey));
if (Header.ReadString(Data.Models.Metadata.Header.VersionKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.VersionKey, header.ReadString(Data.Models.Metadata.Header.VersionKey));
// Handle implied SuperDAT
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.NameKey)?.Contains(" - SuperDAT") == true && keep)
if (Header.ReadString(Data.Models.Metadata.Header.NameKey)?.Contains(" - SuperDAT") == true && keep)
{
if (Header.GetStringFieldValue(Data.Models.Metadata.Header.TypeKey) is null)
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.TypeKey, "SuperDAT");
if (Header.ReadString(Data.Models.Metadata.Header.TypeKey) is null)
Header.Write<string?>(Data.Models.Metadata.Header.TypeKey, "SuperDAT");
}
}
@@ -488,7 +488,7 @@ namespace SabreTools.Metadata.DatFiles
Array.ForEach(filtered, item =>
{
var datItem = new Rom(item, machine, source);
datItem.SetFieldValue<Source?>(DatItem.SourceKey, source);
datItem.Write<Source?>(DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly);
@@ -617,7 +617,7 @@ namespace SabreTools.Metadata.DatFiles
// Convert the item
var romItem = new Rom(rom, machine, source);
long? size = romItem.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey);
long? size = romItem.ReadLong(Data.Models.Metadata.Rom.SizeKey);
// If the rom is a continue or ignore
string? loadFlag = rom.ReadString(Data.Models.Metadata.Rom.LoadFlagKey);
@@ -626,13 +626,13 @@ namespace SabreTools.Metadata.DatFiles
|| loadFlag.Equals("ignore", StringComparison.OrdinalIgnoreCase)))
{
var lastRom = addRoms[addRoms.Count - 1];
long? lastSize = lastRom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey);
lastRom.SetFieldValue(Data.Models.Metadata.Rom.SizeKey, lastSize + size);
long? lastSize = lastRom.ReadLong(Data.Models.Metadata.Rom.SizeKey);
lastRom.Write(Data.Models.Metadata.Rom.SizeKey, lastSize + size);
continue;
}
romItem.SetFieldValue<DataArea?>(Rom.DataAreaKey, dataAreaItem);
romItem.SetFieldValue<Part?>(Rom.PartKey, partItem);
romItem.Write<DataArea?>(Rom.DataAreaKey, dataAreaItem);
romItem.Write<Part?>(Rom.PartKey, partItem);
addRoms.Add(romItem);
}
@@ -663,8 +663,8 @@ namespace SabreTools.Metadata.DatFiles
continue;
var diskItem = new Disk(disk, machine, source);
diskItem.SetFieldValue<DiskArea?>(Disk.DiskAreaKey, diskAreaitem);
diskItem.SetFieldValue<Part?>(Disk.PartKey, partItem);
diskItem.Write<DiskArea?>(Disk.DiskAreaKey, diskAreaitem);
diskItem.Write<Part?>(Disk.PartKey, partItem);
AddItem(diskItem, statsOnly);
// AddItemDB(diskItem, machineIndex, sourceIndex, statsOnly);
@@ -682,7 +682,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
var dipSwitchItem = new DipSwitch(dipSwitch, machine, source);
dipSwitchItem.SetFieldValue<Part?>(DipSwitch.PartKey, partItem);
dipSwitchItem.Write<Part?>(DipSwitch.PartKey, partItem);
AddItem(dipSwitchItem, statsOnly);
// AddItemDB(dipSwitchItem, machineIndex, sourceIndex, statsOnly);
@@ -699,8 +699,8 @@ namespace SabreTools.Metadata.DatFiles
continue;
var partFeatureItem = new PartFeature(partFeature);
partFeatureItem.SetFieldValue<Part?>(DipSwitch.PartKey, partItem);
partFeatureItem.SetFieldValue<Source?>(DatItem.SourceKey, source);
partFeatureItem.Write<Part?>(DipSwitch.PartKey, partItem);
partFeatureItem.Write<Source?>(DatItem.SourceKey, source);
partFeatureItem.CopyMachineInformation(machine);
AddItem(partFeatureItem, statsOnly);

View File

@@ -273,7 +273,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the cloneof parent items
string? cloneOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
List<DatItem> parentItems = GetItemsForBucket(cloneOf);
if (cloneOf is null)
continue;
@@ -284,7 +284,7 @@ namespace SabreTools.Metadata.DatFiles
{
copyFrom = new Rom();
copyFrom.GetMachine()!.SetName(cloneOf);
copyFrom.GetMachine()!.SetFieldValue<string?>(Data.Models.Metadata.Machine.DescriptionKey, cloneOf);
copyFrom.GetMachine()!.Write<string?>(Data.Models.Metadata.Machine.DescriptionKey, cloneOf);
}
else
{
@@ -297,7 +297,7 @@ namespace SabreTools.Metadata.DatFiles
// Special disk handling
if (item is Disk disk)
{
string? mergeTag = disk.GetStringFieldValue(Data.Models.Metadata.Disk.MergeKey);
string? mergeTag = disk.ReadString(Data.Models.Metadata.Disk.MergeKey);
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucket(cloneOf)
@@ -332,7 +332,7 @@ namespace SabreTools.Metadata.DatFiles
// Special rom handling
else if (item is Rom rom)
{
string? mergeTag = rom.GetStringFieldValue(Data.Models.Metadata.Rom.MergeKey);
string? mergeTag = rom.ReadString(Data.Models.Metadata.Rom.MergeKey);
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucket(cloneOf)
@@ -408,7 +408,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the clone parent
string? cloneOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.Value.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
if (string.IsNullOrEmpty(cloneOf))
continue;
@@ -434,7 +434,7 @@ namespace SabreTools.Metadata.DatFiles
// Special disk handling
if (item.Value is Disk disk)
{
string? mergeTag = disk.GetStringFieldValue(Data.Models.Metadata.Disk.MergeKey);
string? mergeTag = disk.ReadString(Data.Models.Metadata.Disk.MergeKey);
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucketDB(cloneOf).Values
@@ -469,7 +469,7 @@ namespace SabreTools.Metadata.DatFiles
// Special rom handling
else if (item.Value is Rom rom)
{
string? mergeTag = rom.GetStringFieldValue(Data.Models.Metadata.Rom.MergeKey);
string? mergeTag = rom.ReadString(Data.Models.Metadata.Rom.MergeKey);
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucketDB(cloneOf).Values
@@ -543,7 +543,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the cloneof parent items
string? cloneOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
List<DatItem> parentItems = GetItemsForBucket(cloneOf);
if (parentItems.Count == 0)
continue;
@@ -563,10 +563,10 @@ namespace SabreTools.Metadata.DatFiles
// Now we want to get the parent romof tag and put it in each of the items
items = GetItemsForBucket(bucket);
string? romof = GetItemsForBucket(cloneOf)[0].GetMachine()!.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romof = GetItemsForBucket(cloneOf)[0].GetMachine()!.ReadString(Data.Models.Metadata.Machine.RomOfKey);
foreach (DatItem item in items)
{
item.GetMachine()!.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
item.GetMachine()!.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
}
}
}
@@ -597,7 +597,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the clone parent
string? cloneOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.Value.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
if (string.IsNullOrEmpty(cloneOf))
continue;
@@ -624,7 +624,7 @@ namespace SabreTools.Metadata.DatFiles
// Now we want to get the parent romof tag and put it in each of the items
items = GetItemsForBucketDB(bucket);
string? romof = parentMachine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romof = parentMachine.Value.ReadString(Data.Models.Metadata.Machine.RomOfKey);
foreach (var key in items.Keys)
{
var itemMachine = GetMachineForItemDB(key);
@@ -632,7 +632,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// TODO: Remove merge tags here
itemMachine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
itemMachine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
}
}
}
@@ -660,7 +660,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// If the machine (is/is not) a device, we want to continue
if (deviceOnly ^ (datItems[0].GetMachine()!.GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey) == true))
if (deviceOnly ^ (datItems[0].GetMachine()!.ReadBool(Data.Models.Metadata.Machine.IsDeviceKey) == true))
continue;
// Get the first item from the bucket
@@ -679,8 +679,8 @@ namespace SabreTools.Metadata.DatFiles
.FindAll(i => i is Slot)
.ConvertAll(i => i as Slot)
.FindAll(s => s!.SlotOptionsSpecified)
.SelectMany(s => s!.GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(so => so.GetStringFieldValue(Data.Models.Metadata.SlotOption.DevNameKey)));
.SelectMany(s => s!.Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(so => so.ReadString(Data.Models.Metadata.SlotOption.DevNameKey)));
// If we're checking device references
if (deviceReferences.Count > 0)
@@ -702,7 +702,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (DatItem item in devItems)
{
// If the parent machine doesn't already contain this item, add it
if (!datItems.Exists(i => i.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
if (!datItems.Exists(i => i.ReadString(Data.Models.Metadata.DatItem.TypeKey) == item.ReadString(Data.Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
{
// Set that we found new items
foundnew = true;
@@ -745,14 +745,14 @@ namespace SabreTools.Metadata.DatFiles
newSlotOptions.UnionWith(slotItems
.FindAll(i => i is Slot)
.FindAll(s => (s as Slot)!.SlotOptionsSpecified)
.SelectMany(s => (s as Slot)!.GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(o => o.GetStringFieldValue(Data.Models.Metadata.SlotOption.DevNameKey)!));
.SelectMany(s => (s as Slot)!.Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(o => o.ReadString(Data.Models.Metadata.SlotOption.DevNameKey)!));
// Set new machine information and add to the current machine
foreach (DatItem item in slotItems)
{
// If the parent machine doesn't already contain this item, add it
if (!datItems.Exists(i => i.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
if (!datItems.Exists(i => i.ReadString(Data.Models.Metadata.DatItem.TypeKey) == item.ReadString(Data.Models.Metadata.DatItem.TypeKey) && i.GetName() == item.GetName()))
{
// Set that we found new items
foundnew = true;
@@ -773,11 +773,11 @@ namespace SabreTools.Metadata.DatFiles
{
slotOptions.Add(slotOption);
var slotOptionItem = new SlotOption();
slotOptionItem.SetFieldValue<string?>(Data.Models.Metadata.SlotOption.DevNameKey, slotOption);
slotOptionItem.Write<string?>(Data.Models.Metadata.SlotOption.DevNameKey, slotOption);
slotOptionItem.CopyMachineInformation(copyFrom);
var slotItem = new Slot();
slotItem.SetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, [slotOptionItem]);
slotItem.Write<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, [slotOptionItem]);
slotItem.CopyMachineInformation(copyFrom);
Items.AddItem(slotItem, statsOnly: false);
@@ -820,7 +820,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// If the machine (is/is not) a device, we want to continue
if (deviceOnly ^ (machine.Value.GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey) == true))
if (deviceOnly ^ (machine.Value.ReadBool(Data.Models.Metadata.Machine.IsDeviceKey) == true))
continue;
// Get all device reference names from the current machine
@@ -836,8 +836,8 @@ namespace SabreTools.Metadata.DatFiles
.Where(i => i is Slot)
.Select(i => i as Slot)
.Where(s => s!.SlotOptionsSpecified)
.SelectMany(s => s!.GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(so => so.GetStringFieldValue(Data.Models.Metadata.SlotOption.DevNameKey))
.SelectMany(s => s!.Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(so => so.ReadString(Data.Models.Metadata.SlotOption.DevNameKey))
.Distinct()
.ToList();
@@ -870,7 +870,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (var item in devItems.Values)
{
// If the parent machine doesn't already contain this item, add it
if (!items.Values.Any(i => i.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey)
if (!items.Values.Any(i => i.ReadString(Data.Models.Metadata.DatItem.TypeKey) == item.ReadString(Data.Models.Metadata.DatItem.TypeKey)
&& i.GetName() == item.GetName()))
{
// Set that we found new items
@@ -915,8 +915,8 @@ namespace SabreTools.Metadata.DatFiles
newSlotOptions.UnionWith(slotItems.Values
.Where(i => i is Slot)
.Where(s => (s as Slot)!.SlotOptionsSpecified)
.SelectMany(s => (s as Slot)!.GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(o => o.GetStringFieldValue(Data.Models.Metadata.SlotOption.DevNameKey)!));
.SelectMany(s => (s as Slot)!.Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey)!)
.Select(o => o.ReadString(Data.Models.Metadata.SlotOption.DevNameKey)!));
// Set new machine information and add to the current machine
var copyFrom = GetMachineForItemDB(GetItemsForBucketDB(bucket).First().Key);
@@ -926,7 +926,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (var item in slotItems.Values)
{
// If the parent machine doesn't already contain this item, add it
if (!items.Values.Any(i => i.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) == item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey)
if (!items.Values.Any(i => i.ReadString(Data.Models.Metadata.DatItem.TypeKey) == item.ReadString(Data.Models.Metadata.DatItem.TypeKey)
&& i.GetName() == item.GetName()))
{
// Set that we found new items
@@ -945,10 +945,10 @@ namespace SabreTools.Metadata.DatFiles
if (!slotOptions.Contains(slotOption))
{
var slotOptionItem = new SlotOption();
slotOptionItem.SetFieldValue<string?>(Data.Models.Metadata.SlotOption.DevNameKey, slotOption);
slotOptionItem.Write<string?>(Data.Models.Metadata.SlotOption.DevNameKey, slotOption);
var slotItem = new Slot();
slotItem.SetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, [slotOptionItem]);
slotItem.Write<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, [slotOptionItem]);
ItemsDB.AddItem(slotItem, machine.Key, source.Key);
}
@@ -982,7 +982,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the romof parent items
string? romOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romOf = machine.ReadString(Data.Models.Metadata.Machine.RomOfKey);
List<DatItem> parentItems = GetItemsForBucket(romOf);
if (parentItems.Count == 0)
continue;
@@ -1025,7 +1025,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the romof parent items
string? romOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romOf = machine.Value.ReadString(Data.Models.Metadata.Machine.RomOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf);
if (parentItems.Count == 0)
continue;
@@ -1079,8 +1079,8 @@ namespace SabreTools.Metadata.DatFiles
#endif
// Remove flagged items
if ((machine.GetBoolFieldValue(Data.Models.Metadata.Machine.IsBiosKey) == true)
|| (machine.GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey) == true))
if ((machine.ReadBool(Data.Models.Metadata.Machine.IsBiosKey) == true)
|| (machine.ReadBool(Data.Models.Metadata.Machine.IsDeviceKey) == true))
{
RemoveBucket(bucket);
}
@@ -1127,8 +1127,8 @@ namespace SabreTools.Metadata.DatFiles
#endif
// Remove flagged items
if ((machine.Value.GetBoolFieldValue(Data.Models.Metadata.Machine.IsBiosKey) == true)
|| (machine.Value.GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey) == true))
if ((machine.Value.ReadBool(Data.Models.Metadata.Machine.IsBiosKey) == true)
|| (machine.Value.ReadBool(Data.Models.Metadata.Machine.IsDeviceKey) == true))
{
foreach (var key in items.Keys)
{
@@ -1168,7 +1168,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the cloneof parent items
string? cloneOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
List<DatItem> parentItems = GetItemsForBucket(cloneOf);
if (parentItems.Count == 0)
continue;
@@ -1191,10 +1191,10 @@ namespace SabreTools.Metadata.DatFiles
// Now we want to get the parent romof tag and put it in each of the remaining items
items = GetItemsForBucket(bucket);
string? romof = GetItemsForBucket(cloneOf)[0].GetMachine()!.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romof = GetItemsForBucket(cloneOf)[0].GetMachine()!.ReadString(Data.Models.Metadata.Machine.RomOfKey);
foreach (DatItem item in items)
{
item.GetMachine()!.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
item.GetMachine()!.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
}
}
}
@@ -1222,7 +1222,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the cloneof parent items
string? cloneOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey);
string? cloneOf = machine.Value.ReadString(Data.Models.Metadata.Machine.CloneOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(cloneOf);
if (parentItems is null || parentItems.Count == 0)
continue;
@@ -1243,14 +1243,14 @@ namespace SabreTools.Metadata.DatFiles
if (machine.Value is null)
continue;
string? romof = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romof = machine.Value.ReadString(Data.Models.Metadata.Machine.RomOfKey);
foreach (var item in items)
{
machine = GetMachineForItemDB(item.Key);
if (machine.Value is null)
continue;
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, romof);
}
}
}
@@ -1278,7 +1278,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the romof parent items
string? romOf = machine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romOf = machine.ReadString(Data.Models.Metadata.Machine.RomOfKey);
List<DatItem> parentItems = GetItemsForBucket(romOf);
if (parentItems.Count == 0)
continue;
@@ -1325,7 +1325,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
// Get the romof parent items
string? romOf = machine.Value.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey);
string? romOf = machine.Value.ReadString(Data.Models.Metadata.Machine.RomOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf);
if (parentItems.Count == 0)
continue;
@@ -1368,16 +1368,16 @@ namespace SabreTools.Metadata.DatFiles
foreach (DatItem item in items)
{
// Remove the merge tag
item.RemoveField(Data.Models.Metadata.Rom.MergeKey);
item.Remove(Data.Models.Metadata.Rom.MergeKey);
// Get the machine
var machine = item.GetMachine();
if (machine is null)
continue;
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, null);
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, null);
machine.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, null);
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, null);
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, null);
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, null);
}
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
@@ -1409,9 +1409,9 @@ namespace SabreTools.Metadata.DatFiles
continue;
#endif
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.CloneOfKey, null);
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.RomOfKey, null);
machine.Value.SetFieldValue<string?>(Data.Models.Metadata.Machine.SampleOfKey, null);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, null);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, null);
machine.Value.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, null);
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
#else

View File

@@ -95,9 +95,9 @@ namespace SabreTools.Metadata.DatFiles
public void FillHeaderFromPath(string path, bool bare)
{
// Get the header strings
string? name = Header.GetStringFieldValue(Data.Models.Metadata.Header.NameKey);
string? description = Header.GetStringFieldValue(Data.Models.Metadata.Header.DescriptionKey);
string? date = Header.GetStringFieldValue(Data.Models.Metadata.Header.DateKey);
string? name = Header.ReadString(Data.Models.Metadata.Header.NameKey);
string? description = Header.ReadString(Data.Models.Metadata.Header.DescriptionKey);
string? date = Header.ReadString(Data.Models.Metadata.Header.DateKey);
// If the description is defined but not the name, set the name from the description
if (string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(description))
@@ -129,8 +129,8 @@ namespace SabreTools.Metadata.DatFiles
description = description?.Trim();
// Set the fields back
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.NameKey, name);
Header.SetFieldValue<string?>(Data.Models.Metadata.Header.DescriptionKey, description);
Header.Write<string?>(Data.Models.Metadata.Header.NameKey, name);
Header.Write<string?>(Data.Models.Metadata.Header.DescriptionKey, description);
}
#endregion
@@ -503,7 +503,7 @@ namespace SabreTools.Metadata.DatFiles
if (item is Disk disk)
{
// We can only write out if there's a SHA-1
string? sha1 = disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key);
string? sha1 = disk.ReadString(Data.Models.Metadata.Disk.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
@@ -523,7 +523,7 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Media media)
{
// We can only write out if there's a SHA-1
string? sha1 = media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key);
string? sha1 = media.ReadString(Data.Models.Metadata.Media.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
@@ -533,7 +533,7 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Rom rom)
{
// We can only write out if there's a SHA-1
string? sha1 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key);
string? sha1 = rom.ReadString(Data.Models.Metadata.Rom.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
@@ -581,12 +581,12 @@ namespace SabreTools.Metadata.DatFiles
protected internal static string FormatPrefixPostfix(DatItem item, Machine? machine, string fix)
{
// Initialize strings
string? type = item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? type = item.ReadString(Data.Models.Metadata.DatItem.TypeKey);
string
game = machine?.GetName() ?? string.Empty,
manufacturer = machine?.GetStringFieldValue(Data.Models.Metadata.Machine.ManufacturerKey) ?? string.Empty,
publisher = machine?.GetStringFieldValue(Data.Models.Metadata.Machine.PublisherKey) ?? string.Empty,
category = machine?.GetStringFieldValue(Data.Models.Metadata.Machine.CategoryKey) ?? string.Empty,
manufacturer = machine?.ReadString(Data.Models.Metadata.Machine.ManufacturerKey) ?? string.Empty,
publisher = machine?.ReadString(Data.Models.Metadata.Machine.PublisherKey) ?? string.Empty,
category = machine?.ReadString(Data.Models.Metadata.Machine.CategoryKey) ?? string.Empty,
name = item.GetName() ?? type.AsItemType().AsStringValue() ?? string.Empty,
crc16 = string.Empty,
crc = string.Empty,
@@ -606,8 +606,8 @@ namespace SabreTools.Metadata.DatFiles
// Ensure we have the proper values for replacement
if (item is Disk disk)
{
md5 = disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key) ?? string.Empty;
sha1 = disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key) ?? string.Empty;
md5 = disk.ReadString(Data.Models.Metadata.Disk.MD5Key) ?? string.Empty;
sha1 = disk.ReadString(Data.Models.Metadata.Disk.SHA1Key) ?? string.Empty;
}
else if (item is DatItems.Formats.File file)
{
@@ -620,27 +620,27 @@ namespace SabreTools.Metadata.DatFiles
}
else if (item is Media media)
{
md5 = media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key) ?? string.Empty;
sha1 = media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key) ?? string.Empty;
sha256 = media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key) ?? string.Empty;
spamsum = media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey) ?? string.Empty;
md5 = media.ReadString(Data.Models.Metadata.Media.MD5Key) ?? string.Empty;
sha1 = media.ReadString(Data.Models.Metadata.Media.SHA1Key) ?? string.Empty;
sha256 = media.ReadString(Data.Models.Metadata.Media.SHA256Key) ?? string.Empty;
spamsum = media.ReadString(Data.Models.Metadata.Media.SpamSumKey) ?? string.Empty;
}
else if (item is Rom rom)
{
crc16 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key) ?? string.Empty;
crc = rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey) ?? string.Empty;
crc64 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key) ?? string.Empty;
md2 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key) ?? string.Empty;
md4 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key) ?? string.Empty;
md5 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key) ?? string.Empty;
ripemd128 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key) ?? string.Empty;
ripemd160 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key) ?? string.Empty;
sha1 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key) ?? string.Empty;
sha256 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key) ?? string.Empty;
sha384 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key) ?? string.Empty;
sha512 = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key) ?? string.Empty;
size = rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey).ToString() ?? string.Empty;
spamsum = rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey) ?? string.Empty;
crc16 = rom.ReadString(Data.Models.Metadata.Rom.CRC16Key) ?? string.Empty;
crc = rom.ReadString(Data.Models.Metadata.Rom.CRCKey) ?? string.Empty;
crc64 = rom.ReadString(Data.Models.Metadata.Rom.CRC64Key) ?? string.Empty;
md2 = rom.ReadString(Data.Models.Metadata.Rom.MD2Key) ?? string.Empty;
md4 = rom.ReadString(Data.Models.Metadata.Rom.MD4Key) ?? string.Empty;
md5 = rom.ReadString(Data.Models.Metadata.Rom.MD5Key) ?? string.Empty;
ripemd128 = rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) ?? string.Empty;
ripemd160 = rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) ?? string.Empty;
sha1 = rom.ReadString(Data.Models.Metadata.Rom.SHA1Key) ?? string.Empty;
sha256 = rom.ReadString(Data.Models.Metadata.Rom.SHA256Key) ?? string.Empty;
sha384 = rom.ReadString(Data.Models.Metadata.Rom.SHA384Key) ?? string.Empty;
sha512 = rom.ReadString(Data.Models.Metadata.Rom.SHA512Key) ?? string.Empty;
size = rom.ReadLong(Data.Models.Metadata.Rom.SizeKey).ToString() ?? string.Empty;
spamsum = rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey) ?? string.Empty;
}
// Now do bulk replacement where possible
@@ -681,42 +681,42 @@ namespace SabreTools.Metadata.DatFiles
return item;
// If the item has a size
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is not null)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is not null)
return rom;
// If the item CRC isn't "null"
if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey) != "null")
if (rom.ReadString(Data.Models.Metadata.Rom.CRCKey) != "null")
return rom;
// If the Rom has "null" characteristics, ensure all fields
rom.SetName(rom.GetName() == "null" ? "-" : rom.GetName());
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key) == "null" ? HashType.CRC16.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey) == "null" ? HashType.CRC32.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key) == "null" ? HashType.CRC64.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key) == "null" ? HashType.MD2.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key) == "null" ? HashType.MD4.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key) == "null" ? HashType.MD5.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key) == "null" ? HashType.RIPEMD128.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key) == "null" ? HashType.RIPEMD160.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key) == "null" ? HashType.SHA1.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key) == "null" ? HashType.SHA256.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key) == "null" ? HashType.SHA384.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key) == "null" ? HashType.SHA512.ZeroString : null);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SpamSumKey,
rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey) == "null" ? HashType.SpamSum.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.Write<string?>(Data.Models.Metadata.Rom.CRC16Key,
rom.ReadString(Data.Models.Metadata.Rom.CRC16Key) == "null" ? HashType.CRC16.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.CRCKey,
rom.ReadString(Data.Models.Metadata.Rom.CRCKey) == "null" ? HashType.CRC32.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.CRC64Key,
rom.ReadString(Data.Models.Metadata.Rom.CRC64Key) == "null" ? HashType.CRC64.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.MD2Key,
rom.ReadString(Data.Models.Metadata.Rom.MD2Key) == "null" ? HashType.MD2.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.MD4Key,
rom.ReadString(Data.Models.Metadata.Rom.MD4Key) == "null" ? HashType.MD4.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.MD5Key,
rom.ReadString(Data.Models.Metadata.Rom.MD5Key) == "null" ? HashType.MD5.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key,
rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) == "null" ? HashType.RIPEMD128.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key,
rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) == "null" ? HashType.RIPEMD160.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key,
rom.ReadString(Data.Models.Metadata.Rom.SHA1Key) == "null" ? HashType.SHA1.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA256Key,
rom.ReadString(Data.Models.Metadata.Rom.SHA256Key) == "null" ? HashType.SHA256.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA384Key,
rom.ReadString(Data.Models.Metadata.Rom.SHA384Key) == "null" ? HashType.SHA384.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA512Key,
rom.ReadString(Data.Models.Metadata.Rom.SHA512Key) == "null" ? HashType.SHA512.ZeroString : null);
rom.Write<string?>(Data.Models.Metadata.Rom.SpamSumKey,
rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey) == "null" ? HashType.SpamSum.ZeroString : null);
return rom;
}
@@ -741,7 +741,7 @@ namespace SabreTools.Metadata.DatFiles
foreach (DatItem datItem in datItems)
{
ItemType itemType = datItem.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType itemType = datItem.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
if (Array.Exists(SupportedTypes, t => t == itemType))
return true;
}
@@ -800,12 +800,12 @@ namespace SabreTools.Metadata.DatFiles
// Get the last item name, if applicable
string lastItemName = lastItem.GetName()
?? lastItem.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? lastItem.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? string.Empty;
// Get the current item name, if applicable
string datItemName = datItem.GetName()
?? datItem.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? datItem.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? string.Empty;
// If the current item exactly matches the last item, then we don't add it
@@ -897,12 +897,12 @@ namespace SabreTools.Metadata.DatFiles
// Get the last item name, if applicable
string lastItemName = lastItem.Value.Value.GetName()
?? lastItem.Value.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? lastItem.Value.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? string.Empty;
// Get the current item name, if applicable
string datItemName = datItem.Value.GetName()
?? datItem.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? datItem.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue()
?? string.Empty;
// Get sources for both items
@@ -980,7 +980,7 @@ namespace SabreTools.Metadata.DatFiles
}
// If the item is supposed to be removed, we ignore
if (datItem.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (datItem.ReadBool(DatItem.RemoveKey) == true)
{
string itemString = JsonConvert.SerializeObject(datItem, Formatting.None);
_logger.Verbose($"Item '{itemString}' was skipped because it was marked for removal");
@@ -999,7 +999,7 @@ namespace SabreTools.Metadata.DatFiles
if (ignoreBlanks && datItem is Rom rom)
{
// If we have a 0-size or blank rom, then we ignore
long? size = rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey);
long? size = rom.ReadLong(Data.Models.Metadata.Rom.SizeKey);
if (size == 0 || size is null)
{
string itemString = JsonConvert.SerializeObject(datItem, Formatting.None);
@@ -1009,7 +1009,7 @@ namespace SabreTools.Metadata.DatFiles
}
// If we have an item type not in the list of supported values
ItemType itemType = datItem.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType itemType = datItem.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
if (!Array.Exists(SupportedTypes, t => t == itemType))
{
string itemString = JsonConvert.SerializeObject(datItem, Formatting.None);
@@ -1038,11 +1038,11 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
private static string GetDuplicateSuffix(Disk datItem)
{
string? md5 = datItem.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key);
string? md5 = datItem.ReadString(Data.Models.Metadata.Disk.MD5Key);
if (!string.IsNullOrEmpty(md5))
return $"_{md5}";
string? sha1 = datItem.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key);
string? sha1 = datItem.ReadString(Data.Models.Metadata.Disk.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
return $"_{sha1}";
@@ -1072,19 +1072,19 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
private static string GetDuplicateSuffix(Media datItem)
{
string? md5 = datItem.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key);
string? md5 = datItem.ReadString(Data.Models.Metadata.Media.MD5Key);
if (!string.IsNullOrEmpty(md5))
return $"_{md5}";
string? sha1 = datItem.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key);
string? sha1 = datItem.ReadString(Data.Models.Metadata.Media.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
return $"_{sha1}";
string? sha256 = datItem.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key);
string? sha256 = datItem.ReadString(Data.Models.Metadata.Media.SHA256Key);
if (!string.IsNullOrEmpty(sha256))
return $"_{sha256}";
string? spamSum = datItem.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey);
string? spamSum = datItem.ReadString(Data.Models.Metadata.Media.SpamSumKey);
if (!string.IsNullOrEmpty(spamSum))
return $"_{spamSum}";
@@ -1096,55 +1096,55 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
private static string GetDuplicateSuffix(Rom datItem)
{
string? crc16 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key);
string? crc16 = datItem.ReadString(Data.Models.Metadata.Rom.CRC16Key);
if (!string.IsNullOrEmpty(crc16))
return $"_{crc16}";
string? crc = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey);
string? crc = datItem.ReadString(Data.Models.Metadata.Rom.CRCKey);
if (!string.IsNullOrEmpty(crc))
return $"_{crc}";
string? crc64 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key);
string? crc64 = datItem.ReadString(Data.Models.Metadata.Rom.CRC64Key);
if (!string.IsNullOrEmpty(crc64))
return $"_{crc64}";
string? md2 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key);
string? md2 = datItem.ReadString(Data.Models.Metadata.Rom.MD2Key);
if (!string.IsNullOrEmpty(md2))
return $"_{md2}";
string? md4 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key);
string? md4 = datItem.ReadString(Data.Models.Metadata.Rom.MD4Key);
if (!string.IsNullOrEmpty(md4))
return $"_{md4}";
string? md5 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key);
string? md5 = datItem.ReadString(Data.Models.Metadata.Rom.MD5Key);
if (!string.IsNullOrEmpty(md5))
return $"_{md5}";
string? ripemd128 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key);
string? ripemd128 = datItem.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
if (!string.IsNullOrEmpty(ripemd128))
return $"_{ripemd128}";
string? ripemd160 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key);
string? ripemd160 = datItem.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
if (!string.IsNullOrEmpty(ripemd160))
return $"_{ripemd160}";
string? sha1 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key);
string? sha1 = datItem.ReadString(Data.Models.Metadata.Rom.SHA1Key);
if (!string.IsNullOrEmpty(sha1))
return $"_{sha1}";
string? sha256 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key);
string? sha256 = datItem.ReadString(Data.Models.Metadata.Rom.SHA256Key);
if (!string.IsNullOrEmpty(sha256))
return $"_{sha256}";
string? sha384 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key);
string? sha384 = datItem.ReadString(Data.Models.Metadata.Rom.SHA384Key);
if (!string.IsNullOrEmpty(sha384))
return $"_{sha384}";
string? sha512 = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key);
string? sha512 = datItem.ReadString(Data.Models.Metadata.Rom.SHA512Key);
if (!string.IsNullOrEmpty(sha512))
return $"_{sha512}";
string? spamSum = datItem.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey);
string? spamSum = datItem.ReadString(Data.Models.Metadata.Rom.SpamSumKey);
if (!string.IsNullOrEmpty(spamSum))
return $"_{spamSum}";
@@ -1169,8 +1169,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int xSourceIndex = x.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
@@ -1182,8 +1182,8 @@ namespace SabreTools.Metadata.DatFiles
return nc.Compare(xMachineName, yMachineName);
// If types don't match
string? xType = x.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? xType = x.ReadString(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.ReadString(Data.Models.Metadata.DatItem.TypeKey);
if (xType != yType)
return xType.AsItemType() - yType.AsItemType();
@@ -1239,8 +1239,8 @@ namespace SabreTools.Metadata.DatFiles
return nc.Compare(xMachineName, yMachineName);
// If types don't match
string? xType = x.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? xType = x.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey);
if (xType != yType)
return xType.AsItemType() - yType.AsItemType();

View File

@@ -32,7 +32,7 @@ namespace SabreTools.Metadata.DatFiles
{
get
{
var canOpen = GetStringArrayFieldValue(Data.Models.Metadata.Header.CanOpenKey);
var canOpen = ReadStringArray(Data.Models.Metadata.Header.CanOpenKey);
return canOpen is not null && canOpen.Length > 0;
}
}
@@ -42,7 +42,7 @@ namespace SabreTools.Metadata.DatFiles
{
get
{
return GetFieldValue<Data.Models.OfflineList.Images?>(Data.Models.Metadata.Header.ImagesKey) is not null;
return Read<Data.Models.OfflineList.Images?>(Data.Models.Metadata.Header.ImagesKey) is not null;
}
}
@@ -51,7 +51,7 @@ namespace SabreTools.Metadata.DatFiles
{
get
{
return GetFieldValue<Data.Models.OfflineList.Infos?>(Data.Models.Metadata.Header.InfosKey) is not null;
return Read<Data.Models.OfflineList.Infos?>(Data.Models.Metadata.Header.InfosKey) is not null;
}
}
@@ -60,7 +60,7 @@ namespace SabreTools.Metadata.DatFiles
{
get
{
return GetFieldValue<Data.Models.OfflineList.NewDat?>(Data.Models.Metadata.Header.NewDatKey) is not null;
return Read<Data.Models.OfflineList.NewDat?>(Data.Models.Metadata.Header.NewDatKey) is not null;
}
}
@@ -69,7 +69,7 @@ namespace SabreTools.Metadata.DatFiles
{
get
{
return GetFieldValue<Data.Models.OfflineList.Search?>(Data.Models.Metadata.Header.SearchKey) is not null;
return Read<Data.Models.OfflineList.Search?>(Data.Models.Metadata.Header.SearchKey) is not null;
}
}
@@ -137,7 +137,7 @@ namespace SabreTools.Metadata.DatFiles
{
var header = new DatHeader();
header.SetFieldValue(DatFormatKey, GetFieldValue<DatFormat>(DatFormatKey));
header.Write(DatFormatKey, Read<DatFormat>(DatFormatKey));
return header;
}
@@ -165,15 +165,15 @@ namespace SabreTools.Metadata.DatFiles
// Convert subheader values
if (CanOpenSpecified)
header[Data.Models.Metadata.Header.CanOpenKey] = new Data.Models.OfflineList.CanOpen { Extension = GetStringArrayFieldValue(Data.Models.Metadata.Header.CanOpenKey) };
header[Data.Models.Metadata.Header.CanOpenKey] = new Data.Models.OfflineList.CanOpen { Extension = ReadStringArray(Data.Models.Metadata.Header.CanOpenKey) };
if (ImagesSpecified)
header[Data.Models.Metadata.Header.ImagesKey] = GetFieldValue<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey);
header[Data.Models.Metadata.Header.ImagesKey] = Read<Data.Models.OfflineList.Images>(Data.Models.Metadata.Header.ImagesKey);
if (InfosSpecified)
header[Data.Models.Metadata.Header.InfosKey] = GetFieldValue<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey);
header[Data.Models.Metadata.Header.InfosKey] = Read<Data.Models.OfflineList.Infos>(Data.Models.Metadata.Header.InfosKey);
if (NewDatSpecified)
header[Data.Models.Metadata.Header.NewDatKey] = GetFieldValue<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey);
header[Data.Models.Metadata.Header.NewDatKey] = Read<Data.Models.OfflineList.NewDat>(Data.Models.Metadata.Header.NewDatKey);
if (SearchSpecified)
header[Data.Models.Metadata.Header.SearchKey] = GetFieldValue<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey);
header[Data.Models.Metadata.Header.SearchKey] = Read<Data.Models.OfflineList.Search>(Data.Models.Metadata.Header.SearchKey);
return header;
}

View File

@@ -112,11 +112,11 @@ namespace SabreTools.Metadata.DatFiles
TotalCount++;
// Increment removal count
if (item.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (item.ReadBool(DatItem.RemoveKey) == true)
RemovedCount++;
// Increment the item count for the type
AddItemCount(item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType());
AddItemCount(item.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType());
// Some item types require special processing
switch (item)
@@ -274,11 +274,11 @@ namespace SabreTools.Metadata.DatFiles
TotalCount--;
// Decrement removal count
if (item.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (item.ReadBool(DatItem.RemoveKey) == true)
RemovedCount--;
// Decrement the item count for the type
RemoveItemCount(item.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType());
RemoveItemCount(item.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType());
// Some item types require special processing
switch (item)
@@ -402,16 +402,16 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="disk">Item to add info from</param>
private void AddItemStatistics(Disk disk)
{
if (disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump)
if (disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump)
{
AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
AddHashCount(HashType.MD5, string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
}
AddStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
AddStatusCount(ItemStatus.BadDump, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
}
/// <summary>
@@ -451,10 +451,10 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="media">Item to add info from</param>
private void AddItemStatistics(Media media)
{
AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key)) ? 0 : 1);
AddHashCount(HashType.SHA256, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key)) ? 0 : 1);
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
AddHashCount(HashType.MD5, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key)) ? 0 : 1);
AddHashCount(HashType.SHA256, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key)) ? 0 : 1);
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
}
/// <summary>
@@ -475,28 +475,28 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="rom">Item to add info from</param>
private void AddItemStatistics(Rom rom)
{
if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump)
if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump)
{
TotalSize += rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) ?? 0;
AddHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
AddHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
AddHashCount(HashType.MD2, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
AddHashCount(HashType.MD4, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
AddHashCount(HashType.MD5, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
AddHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
AddHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
AddHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
AddHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
AddHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
TotalSize += rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) ?? 0;
AddHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
AddHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
AddHashCount(HashType.MD2, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
AddHashCount(HashType.MD4, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
AddHashCount(HashType.MD5, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
AddHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
AddHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
AddHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
AddHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
AddHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
AddHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
}
AddStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
AddStatusCount(ItemStatus.BadDump, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
AddStatusCount(ItemStatus.Good, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
AddStatusCount(ItemStatus.Nodump, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
AddStatusCount(ItemStatus.Verified, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
}
/// <summary>
@@ -589,16 +589,16 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="disk">Item to remove info for</param>
private void RemoveItemStatistics(Disk disk)
{
if (disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump)
if (disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump)
{
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)) ? 0 : 1);
}
RemoveStatusCount(ItemStatus.BadDump, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
RemoveStatusCount(ItemStatus.BadDump, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
}
/// <summary>
@@ -638,10 +638,10 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="media">Item to remove info for</param>
private void RemoveItemStatistics(Media media)
{
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key)) ? 0 : 1);
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key)) ? 0 : 1);
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)) ? 0 : 1);
}
/// <summary>
@@ -662,28 +662,28 @@ namespace SabreTools.Metadata.DatFiles
/// <param name="rom">Item to remove info for</param>
private void RemoveItemStatistics(Rom rom)
{
if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump)
if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump)
{
TotalSize -= rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) ?? 0;
RemoveHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
RemoveHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
RemoveHashCount(HashType.MD2, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
RemoveHashCount(HashType.MD4, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
RemoveHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
TotalSize -= rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) ?? 0;
RemoveHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
RemoveHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
RemoveHashCount(HashType.MD2, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
RemoveHashCount(HashType.MD4, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
RemoveHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
RemoveHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
RemoveHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
}
RemoveStatusCount(ItemStatus.BadDump, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
RemoveStatusCount(ItemStatus.BadDump, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.BadDump ? 1 : 0);
RemoveStatusCount(ItemStatus.Good, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Good ? 1 : 0);
RemoveStatusCount(ItemStatus.Nodump, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump ? 1 : 0);
RemoveStatusCount(ItemStatus.Verified, rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Verified ? 1 : 0);
}
/// <summary>

View File

@@ -19,7 +19,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public ArchiveDotOrg(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.ArchiveDotOrg);
Header.Write(DatHeader.DatFormatKey, DatFormat.ArchiveDotOrg);
}
}
}

View File

@@ -20,7 +20,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public AttractMode(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.AttractMode);
Header.Write(DatHeader.DatFormatKey, DatFormat.AttractMode);
}
/// <inheritdoc/>

View File

@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public ClrMamePro(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.ClrMamePro);
Header.Write(DatHeader.DatFormatKey, DatFormat.ClrMamePro);
}
/// <inheritdoc/>
@@ -76,35 +76,35 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Release release:
if (string.IsNullOrEmpty(release.GetName()))
missingFields.Add(Data.Models.Metadata.Release.NameKey);
if (string.IsNullOrEmpty(release.GetStringFieldValue(Data.Models.Metadata.Release.RegionKey)))
if (string.IsNullOrEmpty(release.ReadString(Data.Models.Metadata.Release.RegionKey)))
missingFields.Add(Data.Models.Metadata.Release.RegionKey);
break;
case BiosSet biosset:
if (string.IsNullOrEmpty(biosset.GetName()))
missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
if (string.IsNullOrEmpty(biosset.GetStringFieldValue(Data.Models.Metadata.BiosSet.DescriptionKey)))
if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetName()))
missingFields.Add(Data.Models.Metadata.Rom.NameKey);
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
{
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
}
@@ -114,8 +114,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Disk disk:
if (string.IsNullOrEmpty(disk.GetName()))
missingFields.Add(Data.Models.Metadata.Disk.NameKey);
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
}
@@ -133,26 +133,26 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Chip chip:
if (chip.GetStringFieldValue(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() == ChipType.NULL)
if (chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() == ChipType.NULL)
missingFields.Add(Data.Models.Metadata.Chip.ChipTypeKey);
if (string.IsNullOrEmpty(chip.GetName()))
missingFields.Add(Data.Models.Metadata.Chip.NameKey);
break;
case Display display:
if (display.GetStringFieldValue(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType() == DisplayType.NULL)
if (display.ReadString(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType() == DisplayType.NULL)
missingFields.Add(Data.Models.Metadata.Display.DisplayTypeKey);
if (display.GetInt64FieldValue(Data.Models.Metadata.Display.RotateKey) is null)
if (display.ReadLong(Data.Models.Metadata.Display.RotateKey) is null)
missingFields.Add(Data.Models.Metadata.Display.RotateKey);
break;
case Sound sound:
if (sound.GetInt64FieldValue(Data.Models.Metadata.Sound.ChannelsKey) is null)
if (sound.ReadLong(Data.Models.Metadata.Sound.ChannelsKey) is null)
missingFields.Add(Data.Models.Metadata.Sound.ChannelsKey);
break;
case Input input:
if (input.GetInt64FieldValue(Data.Models.Metadata.Input.PlayersKey) is null)
if (input.ReadLong(Data.Models.Metadata.Input.PlayersKey) is null)
missingFields.Add(Data.Models.Metadata.Input.PlayersKey);
if (!input.ControlsSpecified)
missingFields.Add(Data.Models.Metadata.Input.ControlKey);
@@ -164,9 +164,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Driver driver:
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.StatusKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.EmulationKey);
break;

View File

@@ -13,7 +13,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public CommaSeparatedValue(DatFile? datFile) : base(datFile)
{
_delim = ',';
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.CSV);
Header.Write(DatHeader.DatFormatKey, DatFormat.CSV);
}
}
}

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public DosCenter(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.DOSCenter);
Header.Write(DatHeader.DatFormatKey, DatFormat.DOSCenter);
}
/// <inheritdoc/>
@@ -36,11 +36,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
// if (string.IsNullOrEmpty(rom.Date))
// missingFields.Add(Data.Models.Metadata.Rom.DateKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
// if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
// missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public EverdriveSMDB(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.EverdriveSMDB);
Header.Write(DatHeader.DatFormatKey, DatFormat.EverdriveSMDB);
}
/// <inheritdoc/>
@@ -36,13 +36,13 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA256Key);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)))
missingFields.Add(Data.Models.Metadata.Rom.MD5Key);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
break;

View File

@@ -22,7 +22,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public Listrom(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.Listrom);
Header.Write(DatHeader.DatFormatKey, DatFormat.Listrom);
}
/// <inheritdoc/>
@@ -37,8 +37,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Disk disk:
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
}
@@ -46,11 +46,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
break;

View File

@@ -216,7 +216,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public Listxml(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.Listxml);
Header.Write(DatHeader.DatFormatKey, DatFormat.Listxml);
}
/// <inheritdoc/>
@@ -262,17 +262,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
case BiosSet biosset:
if (string.IsNullOrEmpty(biosset.GetName()))
missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
if (string.IsNullOrEmpty(biosset.GetStringFieldValue(Data.Models.Metadata.BiosSet.DescriptionKey)))
if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetName()))
missingFields.Add(Data.Models.Metadata.Rom.NameKey);
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
}
@@ -282,8 +282,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Disk disk:
if (string.IsNullOrEmpty(disk.GetName()))
missingFields.Add(Data.Models.Metadata.Disk.NameKey);
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
}
@@ -303,43 +303,43 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Chip chip:
if (string.IsNullOrEmpty(chip.GetName()))
missingFields.Add(Data.Models.Metadata.Chip.NameKey);
if (chip.GetStringFieldValue(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() == ChipType.NULL)
if (chip.ReadString(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType() == ChipType.NULL)
missingFields.Add(Data.Models.Metadata.Chip.ChipTypeKey);
break;
case Display display:
if (display.GetStringFieldValue(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType() == DisplayType.NULL)
if (display.ReadString(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType() == DisplayType.NULL)
missingFields.Add(Data.Models.Metadata.Display.DisplayTypeKey);
if (display.GetDoubleFieldValue(Data.Models.Metadata.Display.RefreshKey) is null)
if (display.ReadDouble(Data.Models.Metadata.Display.RefreshKey) is null)
missingFields.Add(Data.Models.Metadata.Display.RefreshKey);
break;
case Sound sound:
if (sound.GetInt64FieldValue(Data.Models.Metadata.Sound.ChannelsKey) is null)
if (sound.ReadLong(Data.Models.Metadata.Sound.ChannelsKey) is null)
missingFields.Add(Data.Models.Metadata.Sound.ChannelsKey);
break;
case Input input:
if (input.GetInt64FieldValue(Data.Models.Metadata.Input.PlayersKey) is null)
if (input.ReadLong(Data.Models.Metadata.Input.PlayersKey) is null)
missingFields.Add(Data.Models.Metadata.Input.PlayersKey);
break;
case DipSwitch dipswitch:
if (string.IsNullOrEmpty(dipswitch.GetName()))
missingFields.Add(Data.Models.Metadata.DipSwitch.NameKey);
if (string.IsNullOrEmpty(dipswitch.GetStringFieldValue(Data.Models.Metadata.DipSwitch.TagKey)))
if (string.IsNullOrEmpty(dipswitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)))
missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey);
break;
case Configuration configuration:
if (string.IsNullOrEmpty(configuration.GetName()))
missingFields.Add(Data.Models.Metadata.Configuration.NameKey);
if (string.IsNullOrEmpty(configuration.GetStringFieldValue(Data.Models.Metadata.Configuration.TagKey)))
if (string.IsNullOrEmpty(configuration.ReadString(Data.Models.Metadata.Configuration.TagKey)))
missingFields.Add(Data.Models.Metadata.Configuration.TagKey);
break;
case Port port:
if (string.IsNullOrEmpty(port.GetStringFieldValue(Data.Models.Metadata.Port.TagKey)))
if (string.IsNullOrEmpty(port.ReadString(Data.Models.Metadata.Port.TagKey)))
missingFields.Add(Data.Models.Metadata.Port.TagKey);
break;
@@ -349,23 +349,23 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Driver driver:
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.StatusKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.EmulationKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.CocktailKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.SaveStateKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.SaveStateKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.SaveStateKey);
break;
case Feature feature:
if (feature.GetStringFieldValue(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType() == FeatureType.NULL)
if (feature.ReadString(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType() == FeatureType.NULL)
missingFields.Add(Data.Models.Metadata.Feature.FeatureTypeKey);
break;
case Device device:
if (device.GetStringFieldValue(Data.Models.Metadata.Device.DeviceTypeKey).AsDeviceType() == DeviceType.NULL)
if (device.ReadString(Data.Models.Metadata.Device.DeviceTypeKey).AsDeviceType() == DeviceType.NULL)
missingFields.Add(Data.Models.Metadata.Device.DeviceTypeKey);
break;
@@ -375,11 +375,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case DatItems.Formats.SoftwareList softwarelist:
if (string.IsNullOrEmpty(softwarelist.GetStringFieldValue(Data.Models.Metadata.SoftwareList.TagKey)))
if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey)))
missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey);
if (string.IsNullOrEmpty(softwarelist.GetName()))
missingFields.Add(Data.Models.Metadata.SoftwareList.NameKey);
if (softwarelist.GetStringFieldValue(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == SoftwareListStatus.None)
if (softwarelist.ReadString(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == SoftwareListStatus.None)
missingFields.Add(Data.Models.Metadata.SoftwareList.StatusKey);
break;

View File

@@ -253,9 +253,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
{
_useGame = useGame;
if (useGame)
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.LogiqxDeprecated);
Header.Write(DatHeader.DatFormatKey, DatFormat.LogiqxDeprecated);
else
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.Logiqx);
Header.Write(DatHeader.DatFormatKey, DatFormat.Logiqx);
}
/// <inheritdoc/>
@@ -268,35 +268,35 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Release release:
if (string.IsNullOrEmpty(release.GetName()))
missingFields.Add(Data.Models.Metadata.Release.NameKey);
if (string.IsNullOrEmpty(release.GetStringFieldValue(Data.Models.Metadata.Release.RegionKey)))
if (string.IsNullOrEmpty(release.ReadString(Data.Models.Metadata.Release.RegionKey)))
missingFields.Add(Data.Models.Metadata.Release.RegionKey);
break;
case BiosSet biosset:
if (string.IsNullOrEmpty(biosset.GetName()))
missingFields.Add(Data.Models.Metadata.BiosSet.NameKey);
if (string.IsNullOrEmpty(biosset.GetStringFieldValue(Data.Models.Metadata.BiosSet.DescriptionKey)))
if (string.IsNullOrEmpty(biosset.ReadString(Data.Models.Metadata.BiosSet.DescriptionKey)))
missingFields.Add(Data.Models.Metadata.BiosSet.DescriptionKey);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetName()))
missingFields.Add(Data.Models.Metadata.Rom.NameKey);
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
{
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
}
@@ -306,8 +306,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Disk disk:
if (string.IsNullOrEmpty(disk.GetName()))
missingFields.Add(Data.Models.Metadata.Disk.NameKey);
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
}
@@ -317,10 +317,10 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Media media:
if (string.IsNullOrEmpty(media.GetName()))
missingFields.Add(Data.Models.Metadata.Media.NameKey);
if (string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)))
if (string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)))
{
missingFields.Add(Data.Models.Metadata.Media.SHA1Key);
}
@@ -343,22 +343,22 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Driver driver:
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.StatusKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.EmulationKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.CocktailKey);
if (driver.GetStringFieldValue(Data.Models.Metadata.Driver.SaveStateKey).AsSupportStatus() == SupportStatus.NULL)
if (driver.ReadString(Data.Models.Metadata.Driver.SaveStateKey).AsSupportStatus() == SupportStatus.NULL)
missingFields.Add(Data.Models.Metadata.Driver.SaveStateKey);
break;
case DatItems.Formats.SoftwareList softwarelist:
if (string.IsNullOrEmpty(softwarelist.GetStringFieldValue(Data.Models.Metadata.SoftwareList.TagKey)))
if (string.IsNullOrEmpty(softwarelist.ReadString(Data.Models.Metadata.SoftwareList.TagKey)))
missingFields.Add(Data.Models.Metadata.SoftwareList.TagKey);
if (string.IsNullOrEmpty(softwarelist.GetName()))
missingFields.Add(Data.Models.Metadata.SoftwareList.NameKey);
if (softwarelist.GetStringFieldValue(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == SoftwareListStatus.None)
if (softwarelist.ReadString(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus() == SoftwareListStatus.None)
missingFields.Add(Data.Models.Metadata.SoftwareList.StatusKey);
break;
@@ -384,7 +384,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
// TODO: Reenable doctype writing
// Only write the doctype if we don't have No-Intro data
bool success;
if (string.IsNullOrEmpty(Header.GetStringFieldValue(Data.Models.Metadata.Header.IdKey)))
if (string.IsNullOrEmpty(Header.ReadString(Data.Models.Metadata.Header.IdKey)))
success = new Serialization.Writers.Logiqx().Serialize(datafile, outfile, null, null, null, null);
else
success = new Serialization.Writers.Logiqx().Serialize(datafile, outfile, null, null, null, null);

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Md2File(DatFile? datFile) : base(datFile)
{
_hash = HashType.MD2;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpMD2);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpMD2);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)))
missingFields.Add(Data.Models.Metadata.Rom.MD2Key);
break;

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Md4File(DatFile? datFile) : base(datFile)
{
_hash = HashType.MD4;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpMD4);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpMD4);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)))
missingFields.Add(Data.Models.Metadata.Rom.MD4Key);
break;

View File

@@ -26,7 +26,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Md5File(DatFile? datFile) : base(datFile)
{
_hash = HashType.MD5;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpMD5);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpMD5);
}
/// <inheritdoc/>
@@ -41,17 +41,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Disk disk:
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key)))
missingFields.Add(Data.Models.Metadata.Disk.MD5Key);
break;
case Media medium:
if (string.IsNullOrEmpty(medium.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key)))
if (string.IsNullOrEmpty(medium.ReadString(Data.Models.Metadata.Media.MD5Key)))
missingFields.Add(Data.Models.Metadata.Media.MD5Key);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)))
missingFields.Add(Data.Models.Metadata.Rom.MD5Key);
break;

View File

@@ -22,7 +22,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public Missfile(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.MissFile);
Header.Write(DatHeader.DatFormatKey, DatFormat.MissFile);
}
/// <inheritdoc/>

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public OfflineList(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.OfflineList);
Header.Write(DatHeader.DatFormatKey, DatFormat.OfflineList);
}
/// <inheritdoc/>
@@ -32,9 +32,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
break;

View File

@@ -60,7 +60,7 @@ The softwaredb.xml file contains information about rom mapper types
/// <param name="datFile">Parent DatFile to copy from</param>
public OpenMSX(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.OpenMSX);
Header.Write(DatHeader.DatFormatKey, DatFormat.OpenMSX);
}
/// <inheritdoc/>
@@ -75,7 +75,7 @@ The softwaredb.xml file contains information about rom mapper types
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
break;

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public RipeMD128File(DatFile? datFile) : base(datFile)
{
_hash = HashType.RIPEMD128;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpRIPEMD128);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpRIPEMD128);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)))
missingFields.Add(Data.Models.Metadata.Rom.RIPEMD128Key);
break;

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public RipeMD160File(DatFile? datFile) : base(datFile)
{
_hash = HashType.RIPEMD160;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpRIPEMD160);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpRIPEMD160);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)))
missingFields.Add(Data.Models.Metadata.Rom.RIPEMD160Key);
break;

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public RomCenter(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RomCenter);
Header.Write(DatHeader.DatFormatKey, DatFormat.RomCenter);
}
/// <inheritdoc/>
@@ -36,9 +36,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
break;

View File

@@ -28,7 +28,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public SabreJSON(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.SabreJSON);
Header.Write(DatHeader.DatFormatKey, DatFormat.SabreJSON);
}
/// <inheritdoc/>
@@ -398,7 +398,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
return;
datItem.CopyMachineInformation(machine);
datItem.SetFieldValue<Source?>(DatItem.SourceKey, source);
datItem.Write<Source?>(DatItem.SourceKey, source);
AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
}

View File

@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public SabreXML(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.SabreXML);
Header.Write(DatHeader.DatFormatKey, DatFormat.SabreXML);
}
/// <inheritdoc/>
@@ -219,7 +219,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
item.CopyMachineInformation(machine);
item.SetFieldValue<Source?>(DatItem.SourceKey, source);
item.Write<Source?>(DatItem.SourceKey, source);
AddItem(item, statsOnly);
// AddItemDB(item, machineIndex, sourceIndex, statsOnly);
}

View File

@@ -13,7 +13,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public SemicolonSeparatedValue(DatFile? datFile) : base(datFile)
{
_delim = ';';
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.SSV);
Header.Write(DatHeader.DatFormatKey, DatFormat.SSV);
}
}
}

View File

@@ -73,8 +73,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Disk disk:
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
}
@@ -82,10 +82,10 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Media media:
if (string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)))
if (string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)))
{
missingFields.Add(Data.Models.Metadata.Media.SHA1Key);
}
@@ -93,15 +93,15 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
if (rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is null || rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) < 0)
if (rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) is null || rom.ReadLong(Data.Models.Metadata.Rom.SizeKey) < 0)
missingFields.Add(Data.Models.Metadata.Rom.SizeKey);
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
&& string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
{
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
}

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public SfvFile(DatFile? datFile) : base(datFile)
{
_hash = HashType.CRC32;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSFV);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSFV);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
break;

View File

@@ -26,7 +26,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Sha1File(DatFile? datFile) : base(datFile)
{
_hash = HashType.SHA1;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSHA1);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSHA1);
}
/// <inheritdoc/>
@@ -41,17 +41,17 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Disk disk:
if (string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Disk.SHA1Key);
break;
case Media medium:
if (string.IsNullOrEmpty(medium.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key)))
if (string.IsNullOrEmpty(medium.ReadString(Data.Models.Metadata.Media.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Media.SHA1Key);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
break;

View File

@@ -25,7 +25,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Sha256File(DatFile? datFile) : base(datFile)
{
_hash = HashType.SHA256;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSHA256);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSHA256);
}
/// <inheritdoc/>
@@ -40,12 +40,12 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Media medium:
if (string.IsNullOrEmpty(medium.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key)))
if (string.IsNullOrEmpty(medium.ReadString(Data.Models.Metadata.Media.SHA256Key)))
missingFields.Add(Data.Models.Metadata.Media.SHA256Key);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA256Key);
break;

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Sha384File(DatFile? datFile) : base(datFile)
{
_hash = HashType.SHA384;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSHA384);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSHA384);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA384Key);
break;

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public Sha512File(DatFile? datFile) : base(datFile)
{
_hash = HashType.SHA512;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSHA512);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSHA512);
}
/// <inheritdoc/>
@@ -39,7 +39,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)))
missingFields.Add(Data.Models.Metadata.Rom.SHA512Key);
break;

View File

@@ -96,7 +96,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
/// <param name="datFile">Parent DatFile to copy from</param>
public SoftwareList(DatFile? datFile) : base(datFile)
{
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.SoftwareList);
Header.Write(DatHeader.DatFormatKey, DatFormat.SoftwareList);
}
/// <inheritdoc/>
@@ -114,24 +114,24 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
else
{
if (string.IsNullOrEmpty(dipSwitch.GetFieldValue<Part?>(DipSwitch.PartKey)!.GetName()))
if (string.IsNullOrEmpty(dipSwitch.Read<Part?>(DipSwitch.PartKey)!.GetName()))
missingFields.Add(Data.Models.Metadata.Part.NameKey);
if (string.IsNullOrEmpty(dipSwitch.GetFieldValue<Part?>(DipSwitch.PartKey)!.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)))
if (string.IsNullOrEmpty(dipSwitch.Read<Part?>(DipSwitch.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
}
if (string.IsNullOrEmpty(dipSwitch.GetName()))
missingFields.Add(Data.Models.Metadata.DipSwitch.NameKey);
if (string.IsNullOrEmpty(dipSwitch.GetStringFieldValue(Data.Models.Metadata.DipSwitch.TagKey)))
if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.TagKey)))
missingFields.Add(Data.Models.Metadata.DipSwitch.TagKey);
if (string.IsNullOrEmpty(dipSwitch.GetStringFieldValue(Data.Models.Metadata.DipSwitch.MaskKey)))
if (string.IsNullOrEmpty(dipSwitch.ReadString(Data.Models.Metadata.DipSwitch.MaskKey)))
missingFields.Add(Data.Models.Metadata.DipSwitch.MaskKey);
if (dipSwitch.ValuesSpecified)
{
var dipValues = dipSwitch.GetFieldValue<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
var dipValues = dipSwitch.Read<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.GetName())) is not null)
missingFields.Add(Data.Models.Metadata.DipValue.NameKey);
if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.GetStringFieldValue(Data.Models.Metadata.DipValue.ValueKey))) is not null)
if (Array.Find(dipValues!, dv => string.IsNullOrEmpty(dv.ReadString(Data.Models.Metadata.DipValue.ValueKey))) is not null)
missingFields.Add(Data.Models.Metadata.DipValue.ValueKey);
}
@@ -145,9 +145,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
else
{
if (string.IsNullOrEmpty(disk.GetFieldValue<Part?>(Disk.PartKey)!.GetName()))
if (string.IsNullOrEmpty(disk.Read<Part?>(Disk.PartKey)!.GetName()))
missingFields.Add(Data.Models.Metadata.Part.NameKey);
if (string.IsNullOrEmpty(disk.GetFieldValue<Part?>(Disk.PartKey)!.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)))
if (string.IsNullOrEmpty(disk.Read<Part?>(Disk.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
}
@@ -157,7 +157,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
else
{
if (string.IsNullOrEmpty(disk.GetFieldValue<DiskArea?>(Disk.DiskAreaKey)!.GetName()))
if (string.IsNullOrEmpty(disk.Read<DiskArea?>(Disk.DiskAreaKey)!.GetName()))
missingFields.Add(Data.Models.Metadata.DiskArea.NameKey);
}
@@ -178,9 +178,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
else
{
if (string.IsNullOrEmpty(rom.GetFieldValue<Part?>(Rom.PartKey)!.GetName()))
if (string.IsNullOrEmpty(rom.Read<Part?>(Rom.PartKey)!.GetName()))
missingFields.Add(Data.Models.Metadata.Part.NameKey);
if (string.IsNullOrEmpty(rom.GetFieldValue<Part?>(Rom.PartKey)!.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)))
if (string.IsNullOrEmpty(rom.Read<Part?>(Rom.PartKey)!.ReadString(Data.Models.Metadata.Part.InterfaceKey)))
missingFields.Add(Data.Models.Metadata.Part.InterfaceKey);
}
@@ -191,9 +191,9 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
else
{
if (string.IsNullOrEmpty(rom.GetFieldValue<DataArea?>(Rom.DataAreaKey)!.GetName()))
if (string.IsNullOrEmpty(rom.Read<DataArea?>(Rom.DataAreaKey)!.GetName()))
missingFields.Add(Data.Models.Metadata.DataArea.NameKey);
if (rom.GetFieldValue<DataArea?>(Rom.DataAreaKey)!.GetInt64FieldValue(Data.Models.Metadata.DataArea.SizeKey) is null)
if (rom.Read<DataArea?>(Rom.DataAreaKey)!.ReadLong(Data.Models.Metadata.DataArea.SizeKey) is null)
missingFields.Add(Data.Models.Metadata.DataArea.SizeKey);
}

View File

@@ -25,7 +25,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public SpamSumFile(DatFile? datFile) : base(datFile)
{
_hash = HashType.SpamSum;
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.RedumpSpamSum);
Header.Write(DatHeader.DatFormatKey, DatFormat.RedumpSpamSum);
}
/// <inheritdoc/>
@@ -40,12 +40,12 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Media medium:
if (string.IsNullOrEmpty(medium.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)))
if (string.IsNullOrEmpty(medium.ReadString(Data.Models.Metadata.Media.SpamSumKey)))
missingFields.Add(Data.Models.Metadata.Media.SpamSumKey);
break;
case Rom rom:
if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey)))
if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
missingFields.Add(Data.Models.Metadata.Rom.SpamSumKey);
break;

View File

@@ -13,7 +13,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
public TabSeparatedValue(DatFile? datFile) : base(datFile)
{
_delim = '\t';
Header.SetFieldValue(DatHeader.DatFormatKey, DatFormat.TSV);
Header.Write(DatHeader.DatFormatKey, DatFormat.TSV);
}
}
}

View File

@@ -97,12 +97,12 @@ namespace SabreTools.Metadata.DatFiles
if (item is Disk disk)
{
// If the file has aboslutely no hashes, skip and log
if (disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
_logger.Verbose($"Incomplete entry for '{disk.GetName()}' will be output as nodump");
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
disk.Write<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
}
item = disk;
@@ -123,10 +123,10 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Media media)
{
// If the file has aboslutely no hashes, skip and log
if (string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)))
if (string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)))
{
_logger.Verbose($"Incomplete entry for '{media.GetName()}' will be output as nodump");
}
@@ -135,10 +135,10 @@ namespace SabreTools.Metadata.DatFiles
}
else if (item is Rom rom)
{
long? size = rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey);
long? size = rom.ReadLong(Data.Models.Metadata.Rom.SizeKey);
// If we have the case where there is SHA-1 and nothing else, we don't fill in any other part of the data
if (size is null && !string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (size is null && !string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
{
// No-op, just catch it so it doesn't go further
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Entry with only SHA-1 found - '{rom.GetName()}'");
@@ -146,38 +146,38 @@ namespace SabreTools.Metadata.DatFiles
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
else if ((size == 0 || size is null)
&& (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
&& (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
{
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.Write<string?>(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
}
// If the file has no size and it's not the above case, skip and log
else if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump && (size == 0 || size is null))
else if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump && (size == 0 || size is null))
{
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
rom.Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
}
// If the file has a size but aboslutely no hashes, skip and log
else if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump
else if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& size is not null && size > 0
&& !rom.HasHashes())
{
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
rom.Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
}
item = rom;
@@ -249,7 +249,7 @@ namespace SabreTools.Metadata.DatFiles
var datItems = new List<DatItem>();
foreach (DatItem item in items)
{
if (item.GetBoolFieldValue(DatItem.RemoveKey) != true)
if (item.ReadBool(DatItem.RemoveKey) != true)
datItems.Add(item);
}
@@ -428,8 +428,8 @@ namespace SabreTools.Metadata.DatFiles
return output;
// Get the sources for comparison
var selfSource = self.GetFieldValue<Source?>(DatItem.SourceKey);
var lastSource = last.GetFieldValue<Source?>(DatItem.SourceKey);
var selfSource = self.Read<Source?>(DatItem.SourceKey);
var lastSource = last.Read<Source?>(DatItem.SourceKey);
// Get the machines for comparison
var selfMachine = self.GetMachine();
@@ -439,9 +439,9 @@ namespace SabreTools.Metadata.DatFiles
// If the duplicate is external already
#if NET20 || NET35
if ((last.GetFieldValue<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0)
if ((last.Read<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0)
#else
if (last.GetFieldValue<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External))
if (last.Read<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External))
#endif
output |= DupeType.External;
@@ -491,13 +491,13 @@ namespace SabreTools.Metadata.DatFiles
continue;
// If it's a nodump, add and skip
if (datItem is Rom rom && rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump)
if (datItem is Rom rom && rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump)
{
output.Add(datItem);
nodumpCount++;
continue;
}
else if (datItem is Disk disk && disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump)
else if (datItem is Disk disk && disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump)
{
output.Add(datItem);
nodumpCount++;
@@ -534,11 +534,11 @@ namespace SabreTools.Metadata.DatFiles
savedRom.FillMissingInformation(romItem);
// Set the duplicate type on the saved item
savedItem.SetFieldValue(DatItem.DupeTypeKey, dupetype);
savedItem.Write(DatItem.DupeTypeKey, dupetype);
// Get the sources associated with the items
var savedSource = savedItem.GetFieldValue<Source?>(DatItem.SourceKey);
var itemSource = datItem.GetFieldValue<Source?>(DatItem.SourceKey);
var savedSource = savedItem.Read<Source?>(DatItem.SourceKey);
var itemSource = datItem.Read<Source?>(DatItem.SourceKey);
// Get the machines associated with the items
var savedMachine = savedItem.GetMachine();
@@ -547,14 +547,14 @@ namespace SabreTools.Metadata.DatFiles
// If the current source has a lower ID than the saved, use the saved source
if (itemSource?.Index < savedSource?.Index)
{
datItem.SetFieldValue<Source?>(DatItem.SourceKey, savedSource.Clone() as Source);
datItem.Write<Source?>(DatItem.SourceKey, savedSource.Clone() as Source);
savedItem.CopyMachineInformation(datItem);
savedItem.SetName(datItem.GetName());
}
// If the saved machine is a child of the current machine, use the current machine instead
if (savedMachine?.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey) == itemMachine?.GetName()
|| savedMachine?.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey) == itemMachine?.GetName())
if (savedMachine?.ReadString(Data.Models.Metadata.Machine.CloneOfKey) == itemMachine?.GetName()
|| savedMachine?.ReadString(Data.Models.Metadata.Machine.RomOfKey) == itemMachine?.GetName())
{
savedItem.CopyMachineInformation(datItem);
savedItem.SetName(datItem.GetName());
@@ -596,13 +596,13 @@ namespace SabreTools.Metadata.DatFiles
foreach (DatItem other in items)
{
// Skip items marked for removal
if (other.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (other.ReadBool(DatItem.RemoveKey) == true)
continue;
// Mark duplicates for future removal
if (datItem.Equals(other))
{
other.SetFieldValue<bool?>(DatItem.RemoveKey, true);
other.Write<bool?>(DatItem.RemoveKey, true);
output.Add(other);
}
}
@@ -728,7 +728,7 @@ namespace SabreTools.Metadata.DatFiles
// Get the machine and source
var machine = datItem.GetMachine();
var source = datItem.GetFieldValue<Source?>(DatItem.SourceKey);
var source = datItem.Read<Source?>(DatItem.SourceKey);
// Get the bucket key
return datItem.GetKey(bucketBy, machine, source, lower, norename);
@@ -762,12 +762,12 @@ namespace SabreTools.Metadata.DatFiles
for (int i = 0; i < GetItemsForBucket(key).Count; i++)
{
DatItem item = GetItemsForBucket(key)[i];
if (item is null || item.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (item is null || item.ReadBool(DatItem.RemoveKey) == true)
continue;
// Get the machine and source
var machine = item.GetMachine();
var source = item.GetFieldValue<Source?>(DatItem.SourceKey);
var source = item.Read<Source?>(DatItem.SourceKey);
// We want to get the key most appropriate for the given sorting type
string newkey = item.GetKey(bucketBy, machine, source, lower, norename);
@@ -840,8 +840,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int xSourceIndex = x.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
@@ -857,8 +857,8 @@ namespace SabreTools.Metadata.DatFiles
return nc.Compare(xMachineName, yMachineName);
// If types don't match
string? xType = x.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? xType = x.ReadString(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.ReadString(Data.Models.Metadata.DatItem.TypeKey);
if (xType != yType)
return xType.AsItemType() - yType.AsItemType();

View File

@@ -186,12 +186,12 @@ namespace SabreTools.Metadata.DatFiles
if (item is Disk disk)
{
// If the file has aboslutely no hashes, skip and log
if (disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)))
if (disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.MD5Key))
&& string.IsNullOrEmpty(disk.ReadString(Data.Models.Metadata.Disk.SHA1Key)))
{
_logger.Verbose($"Incomplete entry for '{disk.GetName()}' will be output as nodump");
disk.SetFieldValue<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
disk.Write<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.Nodump.AsStringValue());
}
item = disk;
@@ -212,10 +212,10 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Media media)
{
// If the file has aboslutely no hashes, skip and log
if (string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey)))
if (string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.MD5Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA1Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SHA256Key))
&& string.IsNullOrEmpty(media.ReadString(Data.Models.Metadata.Media.SpamSumKey)))
{
_logger.Verbose($"Incomplete entry for '{media.GetName()}' will be output as nodump");
}
@@ -224,10 +224,10 @@ namespace SabreTools.Metadata.DatFiles
}
else if (item is Rom rom)
{
long? size = rom.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey);
long? size = rom.ReadLong(Data.Models.Metadata.Rom.SizeKey);
// If we have the case where there is SHA-1 and nothing else, we don't fill in any other part of the data
if (size is null && !string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
if (size is null && !string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
{
// No-op, just catch it so it doesn't go further
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Entry with only SHA-1 found - '{rom.GetName()}'");
@@ -235,38 +235,38 @@ namespace SabreTools.Metadata.DatFiles
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
else if ((size == 0 || size is null)
&& (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
&& (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
{
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "0");
rom.Write<string?>(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
rom.Write<string?>(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
}
// If the file has no size and it's not the above case, skip and log
else if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump && (size == 0 || size is null))
else if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump && (size == 0 || size is null))
{
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
rom.Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
}
// If the file has a size but aboslutely no hashes, skip and log
else if (rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump
else if (rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() != ItemStatus.Nodump
&& size is not null && size > 0
&& !rom.HasHashes())
{
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Incomplete entry for '{rom.GetName()}' will be output as nodump");
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
rom.Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.Nodump.AsStringValue());
}
item = rom;
@@ -331,7 +331,7 @@ namespace SabreTools.Metadata.DatFiles
var datItem = _items[itemIndex];
#endif
if (datItem.GetBoolFieldValue(DatItem.RemoveKey) != true)
if (datItem.ReadBool(DatItem.RemoveKey) != true)
continue;
RemoveItem(itemIndex);
@@ -377,7 +377,7 @@ namespace SabreTools.Metadata.DatFiles
continue;
#endif
if (!filter || datItem.GetBoolFieldValue(DatItem.RemoveKey) != true)
if (!filter || datItem.ReadBool(DatItem.RemoveKey) != true)
datItems[itemId] = datItem;
}
@@ -749,9 +749,9 @@ namespace SabreTools.Metadata.DatFiles
// If the duplicate is external already
#if NET20 || NET35
if ((lastItem.Value.Value.GetFieldValue<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0)
if ((lastItem.Value.Value.Read<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0)
#else
if (lastItem.Value.Value.GetFieldValue<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External))
if (lastItem.Value.Value.Read<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External))
#endif
output |= DupeType.External;
@@ -804,13 +804,13 @@ namespace SabreTools.Metadata.DatFiles
foreach (var rom in items)
{
// Skip items marked for removal
if (rom.Value.GetBoolFieldValue(DatItem.RemoveKey) == true)
if (rom.Value.ReadBool(DatItem.RemoveKey) == true)
continue;
// Mark duplicates for future removal
if (datItem.Value.Equals(rom.Value))
{
rom.Value.SetFieldValue<bool?>(DatItem.RemoveKey, true);
rom.Value.Write<bool?>(DatItem.RemoveKey, true);
output[rom.Key] = rom.Value;
}
}
@@ -871,13 +871,13 @@ namespace SabreTools.Metadata.DatFiles
continue;
// If it's a nodump, add and skip
if (datItem is Rom rom && rom.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump)
if (datItem is Rom rom && rom.ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus() == ItemStatus.Nodump)
{
output.Add(new KeyValuePair<long, DatItem>(itemIndex, datItem));
nodumpCount++;
continue;
}
else if (datItem is Disk disk && disk.GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump)
else if (datItem is Disk disk && disk.ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus() == ItemStatus.Nodump)
{
output.Add(new KeyValuePair<long, DatItem>(itemIndex, datItem));
nodumpCount++;
@@ -920,7 +920,7 @@ namespace SabreTools.Metadata.DatFiles
else if (datItem is Rom romItem && savedItem is Rom savedRom)
savedRom.FillMissingInformation(romItem);
savedItem.SetFieldValue(DatItem.DupeTypeKey, dupetype);
savedItem.Write(DatItem.DupeTypeKey, dupetype);
// Get the sources associated with the items
var savedSource = _sources[_itemToSourceMapping[savedIndex]];
@@ -939,8 +939,8 @@ namespace SabreTools.Metadata.DatFiles
}
// If the saved machine is a child of the current machine, use the current machine instead
if (savedMachine.GetStringFieldValue(Data.Models.Metadata.Machine.CloneOfKey) == itemMachine.GetName()
|| savedMachine.GetStringFieldValue(Data.Models.Metadata.Machine.RomOfKey) == itemMachine.GetName())
if (savedMachine.ReadString(Data.Models.Metadata.Machine.CloneOfKey) == itemMachine.GetName()
|| savedMachine.ReadString(Data.Models.Metadata.Machine.RomOfKey) == itemMachine.GetName())
{
_machines[_itemToMachineMapping[savedIndex]] = (itemMachine.Clone() as Machine)!;
savedItem.SetName(datItem.GetName());
@@ -1195,8 +1195,8 @@ namespace SabreTools.Metadata.DatFiles
return nc.Compare(xMachineName, yMachineName);
// If types don't match
string? xType = x.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.Value.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey);
string? xType = x.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey);
string? yType = y.Value.ReadString(Data.Models.Metadata.DatItem.TypeKey);
if (xType != yType)
return xType.AsItemType() - yType.AsItemType();

View File

@@ -52,7 +52,7 @@ namespace SabreTools.Metadata.DatItems.Test
var romA = new Rom();
var romB = new Rom();
romB.RemoveField(DatItem.MachineKey);
romB.Remove(DatItem.MachineKey);
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
@@ -67,10 +67,10 @@ namespace SabreTools.Metadata.DatItems.Test
machineA.SetName("machineA");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
romA.Write(DatItem.MachineKey, machineA);
var romB = new Rom();
romB.RemoveField(DatItem.MachineKey);
romB.Remove(DatItem.MachineKey);
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
@@ -87,10 +87,10 @@ namespace SabreTools.Metadata.DatItems.Test
Machine? machineB = null;
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
romA.Write(DatItem.MachineKey, machineA);
var romB = new Rom();
romB.SetFieldValue(DatItem.MachineKey, machineB);
romB.Write(DatItem.MachineKey, machineB);
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
@@ -107,10 +107,10 @@ namespace SabreTools.Metadata.DatItems.Test
Machine? machineB = new Machine();
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
romA.Write(DatItem.MachineKey, machineA);
var romB = new Rom();
romB.SetFieldValue(DatItem.MachineKey, machineB);
romB.Write(DatItem.MachineKey, machineB);
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
@@ -128,10 +128,10 @@ namespace SabreTools.Metadata.DatItems.Test
machineB.SetName("machineB");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
romA.Write(DatItem.MachineKey, machineA);
var romB = new Rom();
romB.SetFieldValue(DatItem.MachineKey, machineB);
romB.Write(DatItem.MachineKey, machineB);
romA.CopyMachineInformation(romB);
var actualMachineA = romA.GetMachine();
@@ -149,10 +149,10 @@ namespace SabreTools.Metadata.DatItems.Test
machineB.SetName("machineB");
var romA = new Rom();
romA.SetFieldValue(DatItem.MachineKey, machineA);
romA.Write(DatItem.MachineKey, machineA);
var diskB = new Disk();
diskB.SetFieldValue(DatItem.MachineKey, machineB);
diskB.Write(DatItem.MachineKey, machineB);
romA.CopyMachineInformation(diskB);
var actualMachineA = romA.GetMachine();
@@ -208,11 +208,11 @@ namespace SabreTools.Metadata.DatItems.Test
{
DatItem self = new Rom();
self.SetName(selfName);
self.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
self.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
DatItem? other = new Rom();
other.SetName(otherName);
other.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
other.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
int actual = self.CompareTo(other);
Assert.Equal(expected, actual);
@@ -349,7 +349,7 @@ namespace SabreTools.Metadata.DatItems.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "Machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine");
DatItem datItem = new Blank();
@@ -423,22 +423,22 @@ namespace SabreTools.Metadata.DatItems.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "Machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine");
DatItem datItem = new Rom();
datItem.SetFieldValue(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.CRC64Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.MD2Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.MD4Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.MD5Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.SHA1Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.SHA256Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.SHA384Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.SHA512Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Rom.SpamSumKey, "BASE64");
datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.CRC64Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.MD2Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.MD4Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.MD5Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.SHA256Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.SHA384Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.SHA512Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Rom.SpamSumKey, "BASE64");
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
Assert.Equal(expected, actual);
@@ -452,7 +452,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void GetName_NoNameKey_Null()
{
DatItem item = new TestDatItem(nameKey: null);
item.SetFieldValue(TestDatItemModel.NameKey, "name");
item.Write(TestDatItemModel.NameKey, "name");
string? actual = item.GetName();
Assert.Null(actual);
@@ -462,7 +462,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void GetName_EmptyNameKey_Null()
{
DatItem item = new TestDatItem(nameKey: string.Empty);
item.SetFieldValue(TestDatItemModel.NameKey, "name");
item.Write(TestDatItemModel.NameKey, "name");
string? actual = item.GetName();
Assert.Null(actual);
@@ -472,7 +472,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void GetName_NameKeyNotExists_Null()
{
DatItem item = new TestDatItem(nameKey: "INVALID");
item.SetFieldValue(TestDatItemModel.NameKey, "name");
item.Write(TestDatItemModel.NameKey, "name");
string? actual = item.GetName();
Assert.Null(actual);
@@ -482,7 +482,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void GetName_NameKeyExists_Filled()
{
DatItem item = new TestDatItem(nameKey: TestDatItemModel.NameKey);
item.SetFieldValue(TestDatItemModel.NameKey, "name");
item.Write(TestDatItemModel.NameKey, "name");
string? actual = item.GetName();
Assert.Equal("name", actual);

View File

@@ -14,7 +14,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
diskArea.SetName("XXXXXX");
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
Part part = new Part();
part.SetName("XXXXXX");
@@ -23,45 +23,45 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Disk disk = new Disk();
disk.SetName("XXXXXX");
disk.SetFieldValue(Disk.DiskAreaKey, diskArea);
disk.SetFieldValue(Data.Models.Metadata.Disk.MergeKey, "XXXXXX");
disk.SetFieldValue(Data.Models.Metadata.Disk.RegionKey, "XXXXXX");
disk.SetFieldValue(Data.Models.Metadata.Disk.StatusKey, "good");
disk.SetFieldValue(Data.Models.Metadata.Disk.OptionalKey, "XXXXXX");
disk.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
disk.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
disk.SetFieldValue(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
disk.SetFieldValue(DatItem.MachineKey, machine);
disk.SetFieldValue(Disk.PartKey, part);
disk.SetFieldValue(DatItem.RemoveKey, (bool?)false);
disk.SetFieldValue(DatItem.SourceKey, source);
disk.Write(Disk.DiskAreaKey, diskArea);
disk.Write(Data.Models.Metadata.Disk.MergeKey, "XXXXXX");
disk.Write(Data.Models.Metadata.Disk.RegionKey, "XXXXXX");
disk.Write(Data.Models.Metadata.Disk.StatusKey, "good");
disk.Write(Data.Models.Metadata.Disk.OptionalKey, "XXXXXX");
disk.Write(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
disk.Write(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
disk.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
disk.Write(DatItem.MachineKey, machine);
disk.Write(Disk.PartKey, part);
disk.Write(DatItem.RemoveKey, (bool?)false);
disk.Write(DatItem.SourceKey, source);
Rom actual = disk.ConvertToRom();
Assert.Equal("XXXXXX.chd", actual.GetName());
Assert.Equal("XXXXXX", actual.GetStringFieldValue(Data.Models.Metadata.Rom.MergeKey));
Assert.Equal("XXXXXX", actual.GetStringFieldValue(Data.Models.Metadata.Rom.RegionKey));
Assert.Equal("good", actual.GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal("XXXXXX", actual.GetStringFieldValue(Data.Models.Metadata.Rom.OptionalKey));
Assert.Equal(HashType.MD5.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal(HashType.SHA1.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(DupeType.All | DupeType.External, actual.GetFieldValue<DupeType>(DatItem.DupeTypeKey));
Assert.Equal("XXXXXX", actual.ReadString(Data.Models.Metadata.Rom.MergeKey));
Assert.Equal("XXXXXX", actual.ReadString(Data.Models.Metadata.Rom.RegionKey));
Assert.Equal("good", actual.ReadString(Data.Models.Metadata.Rom.StatusKey));
Assert.Equal("XXXXXX", actual.ReadString(Data.Models.Metadata.Rom.OptionalKey));
Assert.Equal(HashType.MD5.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(DupeType.All | DupeType.External, actual.Read<DupeType>(DatItem.DupeTypeKey));
DataArea? actualDataArea = actual.GetFieldValue<DataArea?>(Rom.DataAreaKey);
DataArea? actualDataArea = actual.Read<DataArea?>(Rom.DataAreaKey);
Assert.NotNull(actualDataArea);
Assert.Equal("XXXXXX", actualDataArea.GetStringFieldValue(Data.Models.Metadata.DataArea.NameKey));
Assert.Equal("XXXXXX", actualDataArea.ReadString(Data.Models.Metadata.DataArea.NameKey));
Machine? actualMachine = actual.GetMachine();
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));
Assert.Equal(false, actual.ReadBool(DatItem.RemoveKey));
Part? actualPart = actual.GetFieldValue<Part?>(Rom.PartKey);
Part? actualPart = actual.Read<Part?>(Rom.PartKey);
Assert.NotNull(actualPart);
Assert.Equal("XXXXXX", actualPart.GetStringFieldValue(Data.Models.Metadata.Part.NameKey));
Assert.Equal("XXXXXX", actualPart.ReadString(Data.Models.Metadata.Part.NameKey));
Source? actualSource = actual.GetFieldValue<Source?>(DatItem.SourceKey);
Source? actualSource = actual.Read<Source?>(DatItem.SourceKey);
Assert.NotNull(actualSource);
Assert.Equal(0, actualSource.Index);
Assert.Equal("XXXXXX", actualSource.Name);
@@ -79,8 +79,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
self.FillMissingInformation(other);
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key));
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key));
Assert.Null(self.ReadString(Data.Models.Metadata.Disk.MD5Key));
Assert.Null(self.ReadString(Data.Models.Metadata.Disk.SHA1Key));
}
[Fact]
@@ -89,13 +89,13 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Disk self = new Disk();
Disk other = new Disk();
other.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
other.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
other.Write(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
other.Write(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
self.FillMissingInformation(other);
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key));
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Disk.MD5Key));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Disk.SHA1Key));
}
#endregion
@@ -114,8 +114,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_MD5_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
self.Write(Data.Models.Metadata.Disk.SHA1Key, string.Empty);
bool actual = self.HasHashes();
Assert.True(actual);
@@ -125,8 +125,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_SHA1_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
self.Write(Data.Models.Metadata.Disk.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
bool actual = self.HasHashes();
Assert.True(actual);
@@ -136,8 +136,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_All_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
self.Write(Data.Models.Metadata.Disk.MD5Key, "XXXXXX");
self.Write(Data.Models.Metadata.Disk.SHA1Key, "XXXXXX");
bool actual = self.HasHashes();
Assert.True(actual);
@@ -159,8 +159,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_NonZeroHash_False()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, "DEADBEEF");
self.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");
self.Write(Data.Models.Metadata.Disk.SHA1Key, "DEADBEEF");
bool actual = self.HasZeroHash();
Assert.False(actual);
@@ -170,8 +170,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroMD5_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
self.Write(Data.Models.Metadata.Disk.SHA1Key, string.Empty);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -181,8 +181,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroSHA1_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
self.Write(Data.Models.Metadata.Disk.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -192,8 +192,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroAll_True()
{
Disk self = new Disk();
self.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
self.Write(Data.Models.Metadata.Disk.MD5Key, HashType.MD5.ZeroString);
self.Write(Data.Models.Metadata.Disk.SHA1Key, HashType.SHA1.ZeroString);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -254,11 +254,11 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "Machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine");
DatItem datItem = new Disk();
datItem.SetFieldValue(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Disk.SHA1Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Disk.SHA1Key, "DEADBEEF");
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
Assert.Equal(expected, actual);

View File

@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void ConvertToRomTest()
{
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
Source source = new Source(0, "XXXXXX");
@@ -26,30 +26,30 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
SHA256 = "DEADBEEF",
Format = "XXXXXX"
};
file.SetFieldValue(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
file.SetFieldValue(DatItem.MachineKey, machine);
file.SetFieldValue(DatItem.RemoveKey, (bool?)false);
file.SetFieldValue(DatItem.SourceKey, source);
file.SetFieldValue(DatItem.MachineKey, machine);
file.SetFieldValue(DatItem.SourceKey, source);
file.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
file.Write(DatItem.MachineKey, machine);
file.Write(DatItem.RemoveKey, (bool?)false);
file.Write(DatItem.SourceKey, source);
file.Write(DatItem.MachineKey, machine);
file.Write(DatItem.SourceKey, source);
Rom actual = file.ConvertToRom();
Assert.Equal("XXXXXX.XXXXXX", actual.GetName());
Assert.Equal(12345, actual.GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey));
Assert.Equal("000000000000000000000000deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal("00000000000000000000000000000000deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(DupeType.All | DupeType.External, actual.GetFieldValue<DupeType>(DatItem.DupeTypeKey));
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Equal("000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal("00000000000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(DupeType.All | DupeType.External, actual.Read<DupeType>(DatItem.DupeTypeKey));
Machine? actualMachine = actual.GetMachine();
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));
Assert.Equal(false, actual.ReadBool(DatItem.RemoveKey));
Source? actualSource = actual.GetFieldValue<Source?>(DatItem.SourceKey);
Source? actualSource = actual.Read<Source?>(DatItem.SourceKey);
Assert.NotNull(actualSource);
Assert.Equal(0, actualSource.Index);
Assert.Equal("XXXXXX", actualSource.Name);
@@ -341,7 +341,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "Machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine");
DatItem datItem = new File
{

View File

@@ -11,37 +11,37 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void ConvertToRomTest()
{
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
machine.Write(Data.Models.Metadata.Machine.NameKey, "XXXXXX");
Source source = new Source(0, "XXXXXX");
Media media = new Media();
media.SetName("XXXXXX");
media.SetFieldValue(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
media.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
media.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
media.SetFieldValue(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
media.SetFieldValue(DatItem.MachineKey, machine);
media.SetFieldValue(DatItem.RemoveKey, (bool?)false);
media.SetFieldValue(DatItem.SourceKey, source);
media.Write(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
media.Write(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
media.Write(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
media.Write(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
media.Write(DatItem.DupeTypeKey, DupeType.All | DupeType.External);
media.Write(DatItem.MachineKey, machine);
media.Write(DatItem.RemoveKey, (bool?)false);
media.Write(DatItem.SourceKey, source);
Rom actual = media.ConvertToRom();
Assert.Equal("XXXXXX.aaruf", actual.GetName());
Assert.Equal(HashType.MD5.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal(HashType.SHA1.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(HashType.SHA256.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(HashType.SpamSum.ZeroString, actual.GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey));
Assert.Equal(DupeType.All | DupeType.External, actual.GetFieldValue<DupeType>(DatItem.DupeTypeKey));
Assert.Equal(HashType.MD5.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(HashType.SHA256.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(HashType.SpamSum.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
Assert.Equal(DupeType.All | DupeType.External, actual.Read<DupeType>(DatItem.DupeTypeKey));
Machine? actualMachine = actual.GetMachine();
Assert.NotNull(actualMachine);
Assert.Equal("XXXXXX", actualMachine.GetName());
Assert.Equal(false, actual.GetBoolFieldValue(DatItem.RemoveKey));
Assert.Equal(false, actual.ReadBool(DatItem.RemoveKey));
Source? actualSource = actual.GetFieldValue<Source?>(DatItem.SourceKey);
Source? actualSource = actual.Read<Source?>(DatItem.SourceKey);
Assert.NotNull(actualSource);
Assert.Equal(0, actualSource.Index);
Assert.Equal("XXXXXX", actualSource.Name);
@@ -59,10 +59,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
self.FillMissingInformation(other);
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key));
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key));
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key));
Assert.Null(self.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey));
Assert.Null(self.ReadString(Data.Models.Metadata.Media.MD5Key));
Assert.Null(self.ReadString(Data.Models.Metadata.Media.SHA1Key));
Assert.Null(self.ReadString(Data.Models.Metadata.Media.SHA256Key));
Assert.Null(self.ReadString(Data.Models.Metadata.Media.SpamSumKey));
}
[Fact]
@@ -71,17 +71,17 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Media self = new Media();
Media other = new Media();
other.SetFieldValue(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
other.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
other.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
other.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
other.Write(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
other.Write(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
other.Write(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
other.Write(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
self.FillMissingInformation(other);
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Media.MD5Key));
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key));
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key));
Assert.Equal("XXXXXX", self.GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Media.MD5Key));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Media.SHA1Key));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Media.SHA256Key));
Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Media.SpamSumKey));
}
#endregion
@@ -100,10 +100,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_MD5_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasHashes();
Assert.True(actual);
@@ -113,10 +113,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_SHA1_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasHashes();
Assert.True(actual);
@@ -126,10 +126,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_SHA256_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasHashes();
Assert.True(actual);
@@ -139,10 +139,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_SpamSum_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
bool actual = self.HasHashes();
Assert.True(actual);
@@ -152,10 +152,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasHashes_All_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
self.Write(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
bool actual = self.HasHashes();
Assert.True(actual);
@@ -177,10 +177,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_NonZeroHash_False()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
self.Write(Data.Models.Metadata.Media.MD5Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA1Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SHA256Key, "XXXXXX");
self.Write(Data.Models.Metadata.Media.SpamSumKey, "XXXXXX");
bool actual = self.HasZeroHash();
Assert.False(actual);
@@ -190,10 +190,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroMD5_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -203,10 +203,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroSHA1_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -216,10 +216,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroSHA256_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
self.Write(Data.Models.Metadata.Media.SpamSumKey, string.Empty);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -229,10 +229,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroSpamSum_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
self.Write(Data.Models.Metadata.Media.MD5Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA1Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SHA256Key, string.Empty);
self.Write(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -242,10 +242,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void HasZeroHash_ZeroAll_True()
{
Media self = new Media();
self.SetFieldValue(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
self.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
self.Write(Data.Models.Metadata.Media.MD5Key, HashType.MD5.ZeroString);
self.Write(Data.Models.Metadata.Media.SHA1Key, HashType.SHA1.ZeroString);
self.Write(Data.Models.Metadata.Media.SHA256Key, HashType.SHA256.ZeroString);
self.Write(Data.Models.Metadata.Media.SpamSumKey, HashType.SpamSum.ZeroString);
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -306,13 +306,13 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "Machine");
machine.Write(Data.Models.Metadata.Machine.NameKey, "Machine");
DatItem datItem = new Media();
datItem.SetFieldValue(Data.Models.Metadata.Media.MD5Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Media.SHA1Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Media.SHA256Key, "DEADBEEF");
datItem.SetFieldValue(Data.Models.Metadata.Media.SpamSumKey, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Media.MD5Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Media.SHA1Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Media.SHA256Key, "DEADBEEF");
datItem.Write(Data.Models.Metadata.Media.SpamSumKey, "DEADBEEF");
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
Assert.Equal(expected, actual);

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CloneTest()
{
Machine item = new Machine();
item.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "name");
item.Write(Data.Models.Metadata.Machine.NameKey, "name");
object clone = item.Clone();
Machine? actual = clone as Machine;
@@ -26,7 +26,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void GetInternalCloneTest()
{
Machine item = new Machine();
item.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "name");
item.Write(Data.Models.Metadata.Machine.NameKey, "name");
Data.Models.Metadata.Machine actual = item.GetInternalClone();
Assert.Equal("name", actual[Data.Models.Metadata.Machine.NameKey]);
@@ -60,10 +60,10 @@ namespace SabreTools.Metadata.DatItems.Test
public void Equals_MismatchedInternal_False()
{
Machine self = new Machine();
self.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "self");
self.Write(Data.Models.Metadata.Machine.NameKey, "self");
Machine? other = new Machine();
other.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "other");
other.Write(Data.Models.Metadata.Machine.NameKey, "other");
bool actual = self.Equals(other);
Assert.False(actual);
@@ -73,10 +73,10 @@ namespace SabreTools.Metadata.DatItems.Test
public void Equals_EqualInternal_True()
{
Machine self = new Machine();
self.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "name");
self.Write(Data.Models.Metadata.Machine.NameKey, "name");
Machine? other = new Machine();
other.SetFieldValue(Data.Models.Metadata.Machine.NameKey, "name");
other.Write(Data.Models.Metadata.Machine.NameKey, "name");
bool actual = self.Equals(other);
Assert.True(actual);

View File

@@ -152,7 +152,7 @@ namespace SabreTools.Metadata.DatItems
return;
if (machine.Clone() is Machine cloned)
SetFieldValue(MachineKey, cloned);
Write(MachineKey, cloned);
}
#endregion
@@ -221,8 +221,8 @@ namespace SabreTools.Metadata.DatItems
return false;
// Get the types for comparison
ItemType selfType = GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType otherType = other.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType selfType = ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType otherType = other.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
// If we don't have a matched type, return false
if (selfType != otherType)

View File

@@ -18,8 +18,8 @@ namespace SabreTools.Metadata.DatItems
_internal = Activator.CreateInstance<T>();
SetName(string.Empty);
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
SetFieldValue(MachineKey, new Machine());
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(MachineKey, new Machine());
}
/// <summary>
@@ -29,8 +29,8 @@ namespace SabreTools.Metadata.DatItems
{
_internal = item;
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
SetFieldValue(MachineKey, new Machine());
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(MachineKey, new Machine());
}
#endregion
@@ -96,8 +96,8 @@ namespace SabreTools.Metadata.DatItems
return false;
// Get the types for comparison
ItemType selfType = GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType otherType = other.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType selfType = ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
ItemType otherType = other.ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType();
// If we don't have a matched type, return false
if (selfType != otherType)

View File

@@ -19,7 +19,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var conditions = GetFieldValue<Condition[]?>(Data.Models.Metadata.Adjuster.ConditionKey);
var conditions = Read<Condition[]?>(Data.Models.Metadata.Adjuster.ConditionKey);
return conditions is not null && conditions.Length > 0;
}
}
@@ -33,18 +33,18 @@ namespace SabreTools.Metadata.DatItems.Formats
public Adjuster(Data.Models.Metadata.Adjuster item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Adjuster.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Adjuster.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.Adjuster.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Adjuster.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.Adjuster.DefaultKey, ReadBool(Data.Models.Metadata.Adjuster.DefaultKey).FromYesNo());
// Handle subitems
var condition = item.Read<Data.Models.Metadata.Condition>(Data.Models.Metadata.Adjuster.ConditionKey);
if (condition is not null)
SetFieldValue(Data.Models.Metadata.Adjuster.ConditionKey, new Condition(condition));
Write(Data.Models.Metadata.Adjuster.ConditionKey, new Condition(condition));
}
public Adjuster(Data.Models.Metadata.Adjuster item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -57,7 +57,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var adjusterItem = base.GetInternalClone();
var condition = GetFieldValue<Condition?>(Data.Models.Metadata.Adjuster.ConditionKey);
var condition = Read<Condition?>(Data.Models.Metadata.Adjuster.ConditionKey);
if (condition is not null)
adjusterItem[Data.Models.Metadata.Adjuster.ConditionKey] = condition.GetInternalClone();

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Analog(Data.Models.Metadata.Analog item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -91,7 +91,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Archive(Data.Models.Metadata.Archive item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public BiosSet(Data.Models.Metadata.BiosSet item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.BiosSet.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.BiosSet.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.BiosSet.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.BiosSet.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.BiosSet.DefaultKey, ReadBool(Data.Models.Metadata.BiosSet.DefaultKey).FromYesNo());
}
public BiosSet(Data.Models.Metadata.BiosSet item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,7 +23,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// </summary>
public Blank()
{
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
}
#endregion
@@ -34,10 +34,10 @@ namespace SabreTools.Metadata.DatItems.Formats
public override object Clone()
{
var blank = new Blank();
blank.SetFieldValue(MachineKey, GetMachine());
blank.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
blank.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
blank.SetFieldValue<string?>(Data.Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
blank.Write(MachineKey, GetMachine());
blank.Write(RemoveKey, ReadBool(RemoveKey));
blank.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
blank.Write<string?>(Data.Models.Metadata.DatItem.TypeKey, ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return blank;
}
@@ -80,7 +80,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public override bool Equals(DatItem? other)
{
// If we don't have a blank, return false
if (GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey))
if (ReadString(Data.Models.Metadata.DatItem.TypeKey) != other?.ReadString(Data.Models.Metadata.DatItem.TypeKey))
return false;
// Otherwise, treat it as a Blank

View File

@@ -23,15 +23,15 @@ namespace SabreTools.Metadata.DatItems.Formats
public Chip(Data.Models.Metadata.Chip item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Chip.SoundOnlyKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Chip.SoundOnlyKey, GetBoolFieldValue(Data.Models.Metadata.Chip.SoundOnlyKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Chip.ChipTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Chip.ChipTypeKey, GetStringFieldValue(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType().AsStringValue());
if (ReadBool(Data.Models.Metadata.Chip.SoundOnlyKey) is not null)
Write<string?>(Data.Models.Metadata.Chip.SoundOnlyKey, ReadBool(Data.Models.Metadata.Chip.SoundOnlyKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Chip.ChipTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Chip.ChipTypeKey, ReadString(Data.Models.Metadata.Chip.ChipTypeKey).AsChipType().AsStringValue());
}
public Chip(Data.Models.Metadata.Chip item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public Condition(Data.Models.Metadata.Condition item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.Condition.RelationKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Condition.RelationKey, GetStringFieldValue(Data.Models.Metadata.Condition.RelationKey).AsRelation().AsStringValue());
if (ReadString(Data.Models.Metadata.Condition.RelationKey) is not null)
Write<string?>(Data.Models.Metadata.Condition.RelationKey, ReadString(Data.Models.Metadata.Condition.RelationKey).AsRelation().AsStringValue());
}
public Condition(Data.Models.Metadata.Condition item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public ConfLocation(Data.Models.Metadata.ConfLocation item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.ConfLocation.InvertedKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.ConfLocation.InvertedKey, GetBoolFieldValue(Data.Models.Metadata.ConfLocation.InvertedKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.ConfLocation.InvertedKey) is not null)
Write<string?>(Data.Models.Metadata.ConfLocation.InvertedKey, ReadBool(Data.Models.Metadata.ConfLocation.InvertedKey).FromYesNo());
}
public ConfLocation(Data.Models.Metadata.ConfLocation item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -19,7 +19,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var conditions = GetFieldValue<Condition[]?>(Data.Models.Metadata.ConfSetting.ConditionKey);
var conditions = Read<Condition[]?>(Data.Models.Metadata.ConfSetting.ConditionKey);
return conditions is not null && conditions.Length > 0;
}
}
@@ -33,18 +33,18 @@ namespace SabreTools.Metadata.DatItems.Formats
public ConfSetting(Data.Models.Metadata.ConfSetting item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.ConfSetting.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.ConfSetting.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.ConfSetting.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.ConfSetting.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.ConfSetting.DefaultKey, ReadBool(Data.Models.Metadata.ConfSetting.DefaultKey).FromYesNo());
// Handle subitems
var condition = GetFieldValue<Data.Models.Metadata.Condition>(Data.Models.Metadata.ConfSetting.ConditionKey);
var condition = Read<Data.Models.Metadata.Condition>(Data.Models.Metadata.ConfSetting.ConditionKey);
if (condition is not null)
SetFieldValue<Condition?>(Data.Models.Metadata.ConfSetting.ConditionKey, new Condition(condition));
Write<Condition?>(Data.Models.Metadata.ConfSetting.ConditionKey, new Condition(condition));
}
public ConfSetting(Data.Models.Metadata.ConfSetting item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -58,7 +58,7 @@ namespace SabreTools.Metadata.DatItems.Formats
var confSettingItem = base.GetInternalClone();
// Handle subitems
var condition = GetFieldValue<Condition>(Data.Models.Metadata.ConfSetting.ConditionKey);
var condition = Read<Condition>(Data.Models.Metadata.ConfSetting.ConditionKey);
if (condition is not null)
confSettingItem[Data.Models.Metadata.ConfSetting.ConditionKey] = condition.GetInternalClone();

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var conditions = GetFieldValue<Condition[]?>(Data.Models.Metadata.Configuration.ConditionKey);
var conditions = Read<Condition[]?>(Data.Models.Metadata.Configuration.ConditionKey);
return conditions is not null && conditions.Length > 0;
}
}
@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var locations = GetFieldValue<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey);
var locations = Read<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey);
return locations is not null && locations.Length > 0;
}
}
@@ -41,7 +41,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var settings = GetFieldValue<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey);
var settings = Read<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey);
return settings is not null && settings.Length > 0;
}
}
@@ -57,26 +57,26 @@ namespace SabreTools.Metadata.DatItems.Formats
// Handle subitems
var condition = item.Read<Data.Models.Metadata.Condition>(Data.Models.Metadata.Configuration.ConditionKey);
if (condition is not null)
SetFieldValue<Condition?>(Data.Models.Metadata.Configuration.ConditionKey, new Condition(condition));
Write<Condition?>(Data.Models.Metadata.Configuration.ConditionKey, new Condition(condition));
var confLocations = item.ReadItemArray<Data.Models.Metadata.ConfLocation>(Data.Models.Metadata.Configuration.ConfLocationKey);
if (confLocations is not null)
{
ConfLocation[] confLocationItems = Array.ConvertAll(confLocations, confLocation => new ConfLocation(confLocation));
SetFieldValue<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey, confLocationItems);
Write<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey, confLocationItems);
}
var confSettings = item.ReadItemArray<Data.Models.Metadata.ConfSetting>(Data.Models.Metadata.Configuration.ConfSettingKey);
if (confSettings is not null)
{
ConfSetting[] confSettingItems = Array.ConvertAll(confSettings, confSetting => new ConfSetting(confSetting));
SetFieldValue<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey, confSettingItems);
Write<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey, confSettingItems);
}
}
public Configuration(Data.Models.Metadata.Configuration item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -89,18 +89,18 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var configurationItem = base.GetInternalClone();
var condition = GetFieldValue<Condition?>(Data.Models.Metadata.Configuration.ConditionKey);
var condition = Read<Condition?>(Data.Models.Metadata.Configuration.ConditionKey);
if (condition is not null)
configurationItem[Data.Models.Metadata.Configuration.ConditionKey] = condition.GetInternalClone();
var confLocations = GetFieldValue<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey);
var confLocations = Read<ConfLocation[]?>(Data.Models.Metadata.Configuration.ConfLocationKey);
if (confLocations is not null)
{
Data.Models.Metadata.ConfLocation[] confLocationItems = Array.ConvertAll(confLocations, confLocation => confLocation.GetInternalClone());
configurationItem[Data.Models.Metadata.Configuration.ConfLocationKey] = confLocationItems;
}
var confSettings = GetFieldValue<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey);
var confSettings = Read<ConfSetting[]?>(Data.Models.Metadata.Configuration.ConfSettingKey);
if (confSettings is not null)
{
Data.Models.Metadata.ConfSetting[] confSettingItems = Array.ConvertAll(confSettings, confSetting => confSetting.GetInternalClone());

View File

@@ -23,29 +23,29 @@ namespace SabreTools.Metadata.DatItems.Formats
public Control(Data.Models.Metadata.Control item) : base(item)
{
// Process flag values
if (GetInt64FieldValue(Data.Models.Metadata.Control.ButtonsKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.ButtonsKey, GetInt64FieldValue(Data.Models.Metadata.Control.ButtonsKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Control.KeyDeltaKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.KeyDeltaKey, GetInt64FieldValue(Data.Models.Metadata.Control.KeyDeltaKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Control.MaximumKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.MaximumKey, GetInt64FieldValue(Data.Models.Metadata.Control.MaximumKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Control.MinimumKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.MinimumKey, GetInt64FieldValue(Data.Models.Metadata.Control.MinimumKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Control.PlayerKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.PlayerKey, GetInt64FieldValue(Data.Models.Metadata.Control.PlayerKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Control.ReqButtonsKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.ReqButtonsKey, GetInt64FieldValue(Data.Models.Metadata.Control.ReqButtonsKey).ToString());
if (GetBoolFieldValue(Data.Models.Metadata.Control.ReverseKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.ReverseKey, GetBoolFieldValue(Data.Models.Metadata.Control.ReverseKey).FromYesNo());
if (GetInt64FieldValue(Data.Models.Metadata.Control.SensitivityKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.SensitivityKey, GetInt64FieldValue(Data.Models.Metadata.Control.SensitivityKey).ToString());
if (GetStringFieldValue(Data.Models.Metadata.Control.ControlTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Control.ControlTypeKey, GetStringFieldValue(Data.Models.Metadata.Control.ControlTypeKey).AsControlType().AsStringValue());
if (ReadLong(Data.Models.Metadata.Control.ButtonsKey) is not null)
Write<string?>(Data.Models.Metadata.Control.ButtonsKey, ReadLong(Data.Models.Metadata.Control.ButtonsKey).ToString());
if (ReadLong(Data.Models.Metadata.Control.KeyDeltaKey) is not null)
Write<string?>(Data.Models.Metadata.Control.KeyDeltaKey, ReadLong(Data.Models.Metadata.Control.KeyDeltaKey).ToString());
if (ReadLong(Data.Models.Metadata.Control.MaximumKey) is not null)
Write<string?>(Data.Models.Metadata.Control.MaximumKey, ReadLong(Data.Models.Metadata.Control.MaximumKey).ToString());
if (ReadLong(Data.Models.Metadata.Control.MinimumKey) is not null)
Write<string?>(Data.Models.Metadata.Control.MinimumKey, ReadLong(Data.Models.Metadata.Control.MinimumKey).ToString());
if (ReadLong(Data.Models.Metadata.Control.PlayerKey) is not null)
Write<string?>(Data.Models.Metadata.Control.PlayerKey, ReadLong(Data.Models.Metadata.Control.PlayerKey).ToString());
if (ReadLong(Data.Models.Metadata.Control.ReqButtonsKey) is not null)
Write<string?>(Data.Models.Metadata.Control.ReqButtonsKey, ReadLong(Data.Models.Metadata.Control.ReqButtonsKey).ToString());
if (ReadBool(Data.Models.Metadata.Control.ReverseKey) is not null)
Write<string?>(Data.Models.Metadata.Control.ReverseKey, ReadBool(Data.Models.Metadata.Control.ReverseKey).FromYesNo());
if (ReadLong(Data.Models.Metadata.Control.SensitivityKey) is not null)
Write<string?>(Data.Models.Metadata.Control.SensitivityKey, ReadLong(Data.Models.Metadata.Control.SensitivityKey).ToString());
if (ReadString(Data.Models.Metadata.Control.ControlTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Control.ControlTypeKey, ReadString(Data.Models.Metadata.Control.ControlTypeKey).AsControlType().AsStringValue());
}
public Control(Data.Models.Metadata.Control item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -24,17 +24,17 @@ namespace SabreTools.Metadata.DatItems.Formats
public DataArea(Data.Models.Metadata.DataArea item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.DataArea.EndiannessKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DataArea.EndiannessKey, GetStringFieldValue(Data.Models.Metadata.DataArea.EndiannessKey).AsEndianness().AsStringValue());
if (GetInt64FieldValue(Data.Models.Metadata.DataArea.SizeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DataArea.SizeKey, GetInt64FieldValue(Data.Models.Metadata.DataArea.SizeKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.DataArea.WidthKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DataArea.WidthKey, GetInt64FieldValue(Data.Models.Metadata.DataArea.WidthKey).ToString());
if (ReadString(Data.Models.Metadata.DataArea.EndiannessKey) is not null)
Write<string?>(Data.Models.Metadata.DataArea.EndiannessKey, ReadString(Data.Models.Metadata.DataArea.EndiannessKey).AsEndianness().AsStringValue());
if (ReadLong(Data.Models.Metadata.DataArea.SizeKey) is not null)
Write<string?>(Data.Models.Metadata.DataArea.SizeKey, ReadLong(Data.Models.Metadata.DataArea.SizeKey).ToString());
if (ReadLong(Data.Models.Metadata.DataArea.WidthKey) is not null)
Write<string?>(Data.Models.Metadata.DataArea.WidthKey, ReadLong(Data.Models.Metadata.DataArea.WidthKey).ToString());
}
public DataArea(Data.Models.Metadata.DataArea item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var instances = GetFieldValue<Instance[]?>(Data.Models.Metadata.Device.InstanceKey);
var instances = Read<Instance[]?>(Data.Models.Metadata.Device.InstanceKey);
return instances is not null && instances.Length > 0;
}
}
@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var extensions = GetFieldValue<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey);
var extensions = Read<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey);
return extensions is not null && extensions.Length > 0;
}
}
@@ -45,27 +45,27 @@ namespace SabreTools.Metadata.DatItems.Formats
public Device(Data.Models.Metadata.Device item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Device.MandatoryKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Device.MandatoryKey, GetBoolFieldValue(Data.Models.Metadata.Device.MandatoryKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Device.DeviceTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Device.DeviceTypeKey, GetStringFieldValue(Data.Models.Metadata.Device.DeviceTypeKey).AsDeviceType().AsStringValue());
if (ReadBool(Data.Models.Metadata.Device.MandatoryKey) is not null)
Write<string?>(Data.Models.Metadata.Device.MandatoryKey, ReadBool(Data.Models.Metadata.Device.MandatoryKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Device.DeviceTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Device.DeviceTypeKey, ReadString(Data.Models.Metadata.Device.DeviceTypeKey).AsDeviceType().AsStringValue());
// Handle subitems
var instance = item.Read<Data.Models.Metadata.Instance>(Data.Models.Metadata.Device.InstanceKey);
if (instance is not null)
SetFieldValue<Instance?>(Data.Models.Metadata.Device.InstanceKey, new Instance(instance));
Write<Instance?>(Data.Models.Metadata.Device.InstanceKey, new Instance(instance));
var extensions = item.ReadItemArray<Data.Models.Metadata.Extension>(Data.Models.Metadata.Device.ExtensionKey);
if (extensions is not null)
{
Extension[] extensionItems = Array.ConvertAll(extensions, extension => new Extension(extension));
SetFieldValue<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey, extensionItems);
Write<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey, extensionItems);
}
}
public Device(Data.Models.Metadata.Device item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -78,11 +78,11 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var deviceItem = base.GetInternalClone();
var instance = GetFieldValue<Instance?>(Data.Models.Metadata.Device.InstanceKey);
var instance = Read<Instance?>(Data.Models.Metadata.Device.InstanceKey);
if (instance is not null)
deviceItem[Data.Models.Metadata.Device.InstanceKey] = instance.GetInternalClone();
var extensions = GetFieldValue<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey);
var extensions = Read<Extension[]?>(Data.Models.Metadata.Device.ExtensionKey);
if (extensions is not null)
{
Data.Models.Metadata.Extension[] extensionItems = Array.ConvertAll(extensions, extension => extension.GetInternalClone());

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public DeviceRef(Data.Models.Metadata.DeviceRef item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public DipLocation(Data.Models.Metadata.DipLocation item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.DipLocation.InvertedKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DipLocation.InvertedKey, GetBoolFieldValue(Data.Models.Metadata.DipLocation.InvertedKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.DipLocation.InvertedKey) is not null)
Write<string?>(Data.Models.Metadata.DipLocation.InvertedKey, ReadBool(Data.Models.Metadata.DipLocation.InvertedKey).FromYesNo());
}
public DipLocation(Data.Models.Metadata.DipLocation item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -30,7 +30,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var conditions = GetFieldValue<Condition[]?>(Data.Models.Metadata.DipSwitch.ConditionKey);
var conditions = Read<Condition[]?>(Data.Models.Metadata.DipSwitch.ConditionKey);
return conditions is not null && conditions.Length > 0;
}
}
@@ -40,7 +40,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var locations = GetFieldValue<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey);
var locations = Read<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey);
return locations is not null && locations.Length > 0;
}
}
@@ -50,7 +50,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var values = GetFieldValue<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
var values = Read<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
return values is not null && values.Length > 0;
}
}
@@ -60,10 +60,10 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var part = GetFieldValue<Part?>(PartKey);
var part = Read<Part?>(PartKey);
return part is not null
&& (!string.IsNullOrEmpty(part.GetName())
|| !string.IsNullOrEmpty(part.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)));
|| !string.IsNullOrEmpty(part.ReadString(Data.Models.Metadata.Part.InterfaceKey)));
}
}
@@ -76,32 +76,32 @@ namespace SabreTools.Metadata.DatItems.Formats
public DipSwitch(Data.Models.Metadata.DipSwitch item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.DipSwitch.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DipSwitch.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.DipSwitch.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.DipSwitch.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.DipSwitch.DefaultKey, ReadBool(Data.Models.Metadata.DipSwitch.DefaultKey).FromYesNo());
// Handle subitems
var condition = item.Read<Data.Models.Metadata.Condition>(Data.Models.Metadata.DipSwitch.ConditionKey);
if (condition is not null)
SetFieldValue<Condition?>(Data.Models.Metadata.DipSwitch.ConditionKey, new Condition(condition));
Write<Condition?>(Data.Models.Metadata.DipSwitch.ConditionKey, new Condition(condition));
var dipLocations = item.ReadItemArray<Data.Models.Metadata.DipLocation>(Data.Models.Metadata.DipSwitch.DipLocationKey);
if (dipLocations is not null)
{
DipLocation[] dipLocationItems = Array.ConvertAll(dipLocations, dipLocation => new DipLocation(dipLocation));
SetFieldValue<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey, dipLocationItems);
Write<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey, dipLocationItems);
}
var dipValues = item.ReadItemArray<Data.Models.Metadata.DipValue>(Data.Models.Metadata.DipSwitch.DipValueKey);
if (dipValues is not null)
{
DipValue[] dipValueItems = Array.ConvertAll(dipValues, dipValue => new DipValue(dipValue));
SetFieldValue<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey, dipValueItems);
Write<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey, dipValueItems);
}
}
public DipSwitch(Data.Models.Metadata.DipSwitch item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -114,18 +114,18 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var dipSwitchItem = base.GetInternalClone();
var condition = GetFieldValue<Condition?>(Data.Models.Metadata.DipSwitch.ConditionKey);
var condition = Read<Condition?>(Data.Models.Metadata.DipSwitch.ConditionKey);
if (condition is not null)
dipSwitchItem[Data.Models.Metadata.DipSwitch.ConditionKey] = condition.GetInternalClone();
var dipLocations = GetFieldValue<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey);
var dipLocations = Read<DipLocation[]?>(Data.Models.Metadata.DipSwitch.DipLocationKey);
if (dipLocations is not null)
{
Data.Models.Metadata.DipLocation[] dipLocationItems = Array.ConvertAll(dipLocations, dipLocation => dipLocation.GetInternalClone());
dipSwitchItem[Data.Models.Metadata.DipSwitch.DipLocationKey] = dipLocationItems;
}
var dipValues = GetFieldValue<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
var dipValues = Read<DipValue[]?>(Data.Models.Metadata.DipSwitch.DipValueKey);
if (dipValues is not null)
{
Data.Models.Metadata.DipValue[] dipValueItems = Array.ConvertAll(dipValues, dipValue => dipValue.GetInternalClone());

View File

@@ -19,7 +19,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var conditions = GetFieldValue<Condition[]?>(Data.Models.Metadata.DipValue.ConditionKey);
var conditions = Read<Condition[]?>(Data.Models.Metadata.DipValue.ConditionKey);
return conditions is not null && conditions.Length > 0;
}
}
@@ -33,18 +33,18 @@ namespace SabreTools.Metadata.DatItems.Formats
public DipValue(Data.Models.Metadata.DipValue item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.DipValue.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.DipValue.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.DipValue.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.DipValue.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.DipValue.DefaultKey, ReadBool(Data.Models.Metadata.DipValue.DefaultKey).FromYesNo());
// Handle subitems
var condition = GetFieldValue<Data.Models.Metadata.Condition>(Data.Models.Metadata.DipValue.ConditionKey);
var condition = Read<Data.Models.Metadata.Condition>(Data.Models.Metadata.DipValue.ConditionKey);
if (condition is not null)
SetFieldValue<Condition?>(Data.Models.Metadata.DipValue.ConditionKey, new Condition(condition));
Write<Condition?>(Data.Models.Metadata.DipValue.ConditionKey, new Condition(condition));
}
public DipValue(Data.Models.Metadata.DipValue item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -58,7 +58,7 @@ namespace SabreTools.Metadata.DatItems.Formats
var dipValueItem = base.GetInternalClone();
// Handle subitems
var subCondition = GetFieldValue<Condition>(Data.Models.Metadata.DipValue.ConditionKey);
var subCondition = Read<Condition>(Data.Models.Metadata.DipValue.ConditionKey);
if (subCondition is not null)
dipValueItem[Data.Models.Metadata.DipValue.ConditionKey] = subCondition.GetInternalClone();

View File

@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var diskArea = GetFieldValue<DiskArea?>(DiskAreaKey);
var diskArea = Read<DiskArea?>(DiskAreaKey);
return diskArea is not null && !string.IsNullOrEmpty(diskArea.GetName());
}
}
@@ -45,10 +45,10 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var part = GetFieldValue<Part?>(PartKey);
var part = Read<Part?>(PartKey);
return part is not null
&& (!string.IsNullOrEmpty(part.GetName())
|| !string.IsNullOrEmpty(part.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)));
|| !string.IsNullOrEmpty(part.ReadString(Data.Models.Metadata.Part.InterfaceKey)));
}
}
@@ -58,32 +58,32 @@ namespace SabreTools.Metadata.DatItems.Formats
public Disk() : base()
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
SetFieldValue<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
Write<DupeType>(DupeTypeKey, 0x00);
Write<string?>(Data.Models.Metadata.Disk.StatusKey, ItemStatus.None.AsStringValue());
}
public Disk(Data.Models.Metadata.Disk item) : base(item)
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
Write<DupeType>(DupeTypeKey, 0x00);
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Disk.OptionalKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Disk.OptionalKey, GetBoolFieldValue(Data.Models.Metadata.Disk.OptionalKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Disk.StatusKey, GetStringFieldValue(Data.Models.Metadata.Disk.StatusKey).AsItemStatus().AsStringValue());
if (GetBoolFieldValue(Data.Models.Metadata.Disk.WritableKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Disk.WritableKey, GetBoolFieldValue(Data.Models.Metadata.Disk.WritableKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Disk.OptionalKey) is not null)
Write<string?>(Data.Models.Metadata.Disk.OptionalKey, ReadBool(Data.Models.Metadata.Disk.OptionalKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Disk.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.Disk.StatusKey, ReadString(Data.Models.Metadata.Disk.StatusKey).AsItemStatus().AsStringValue());
if (ReadBool(Data.Models.Metadata.Disk.WritableKey) is not null)
Write<string?>(Data.Models.Metadata.Disk.WritableKey, ReadBool(Data.Models.Metadata.Disk.WritableKey).FromYesNo());
// Process hash values
if (GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Disk.MD5Key, TextHelper.NormalizeMD5(GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key)));
if (GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key)));
if (ReadString(Data.Models.Metadata.Disk.MD5Key) is not null)
Write<string?>(Data.Models.Metadata.Disk.MD5Key, TextHelper.NormalizeMD5(ReadString(Data.Models.Metadata.Disk.MD5Key)));
if (ReadString(Data.Models.Metadata.Disk.SHA1Key) is not null)
Write<string?>(Data.Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(ReadString(Data.Models.Metadata.Disk.SHA1Key)));
}
public Disk(Data.Models.Metadata.Disk item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -100,22 +100,22 @@ namespace SabreTools.Metadata.DatItems.Formats
var rom = new Rom(_internal.ConvertToRom()!);
// Create a DataArea if there was an existing DiskArea
var diskArea = GetFieldValue<DiskArea?>(DiskAreaKey);
var diskArea = Read<DiskArea?>(DiskAreaKey);
if (diskArea is not null)
{
var dataArea = new DataArea();
string? diskAreaName = diskArea.GetStringFieldValue(Data.Models.Metadata.DiskArea.NameKey);
dataArea.SetFieldValue(Data.Models.Metadata.DataArea.NameKey, diskAreaName);
string? diskAreaName = diskArea.ReadString(Data.Models.Metadata.DiskArea.NameKey);
dataArea.Write(Data.Models.Metadata.DataArea.NameKey, diskAreaName);
rom.SetFieldValue<DataArea?>(Rom.DataAreaKey, dataArea);
rom.Write<DataArea?>(Rom.DataAreaKey, dataArea);
}
rom.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
rom.SetFieldValue(MachineKey, GetMachine()?.Clone() as Machine);
rom.SetFieldValue(Rom.PartKey, GetFieldValue<Part>(PartKey)?.Clone() as Part);
rom.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
rom.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey)?.Clone() as Source);
rom.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
rom.Write(MachineKey, GetMachine()?.Clone() as Machine);
rom.Write(Rom.PartKey, Read<Part>(PartKey)?.Clone() as Part);
rom.Write(RemoveKey, ReadBool(RemoveKey));
rom.Write<Source?>(SourceKey, Read<Source?>(SourceKey)?.Clone() as Source);
return rom;
}
@@ -158,11 +158,11 @@ namespace SabreTools.Metadata.DatItems.Formats
switch (bucketedBy)
{
case ItemKey.MD5:
key = GetStringFieldValue(Data.Models.Metadata.Disk.MD5Key);
key = ReadString(Data.Models.Metadata.Disk.MD5Key);
break;
case ItemKey.SHA1:
key = GetStringFieldValue(Data.Models.Metadata.Disk.SHA1Key);
key = ReadString(Data.Models.Metadata.Disk.SHA1Key);
break;
// Let the base handle generic stuff

View File

@@ -25,7 +25,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public DiskArea(Data.Models.Metadata.DiskArea item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -24,56 +24,56 @@ namespace SabreTools.Metadata.DatItems.Formats
public Display(Data.Models.Metadata.Display item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Display.FlipXKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.FlipXKey, GetBoolFieldValue(Data.Models.Metadata.Display.FlipXKey).FromYesNo());
if (GetInt64FieldValue(Data.Models.Metadata.Display.HBEndKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.HBEndKey, GetInt64FieldValue(Data.Models.Metadata.Display.HBEndKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.HBStartKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.HBStartKey, GetInt64FieldValue(Data.Models.Metadata.Display.HBStartKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.HeightKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.HeightKey, GetInt64FieldValue(Data.Models.Metadata.Display.HeightKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.HTotalKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.HTotalKey, GetInt64FieldValue(Data.Models.Metadata.Display.HTotalKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.PixClockKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.PixClockKey, GetInt64FieldValue(Data.Models.Metadata.Display.PixClockKey).ToString());
if (GetDoubleFieldValue(Data.Models.Metadata.Display.RefreshKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.RefreshKey, GetDoubleFieldValue(Data.Models.Metadata.Display.RefreshKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.RotateKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.RotateKey, GetInt64FieldValue(Data.Models.Metadata.Display.RotateKey).ToString());
if (GetStringFieldValue(Data.Models.Metadata.Display.DisplayTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType().AsStringValue());
if (GetInt64FieldValue(Data.Models.Metadata.Display.VBEndKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.VBEndKey, GetInt64FieldValue(Data.Models.Metadata.Display.VBEndKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.VBStartKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.VBStartKey, GetInt64FieldValue(Data.Models.Metadata.Display.VBStartKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.VTotalKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.VTotalKey, GetInt64FieldValue(Data.Models.Metadata.Display.VTotalKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Display.WidthKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.WidthKey, GetInt64FieldValue(Data.Models.Metadata.Display.WidthKey).ToString());
if (ReadBool(Data.Models.Metadata.Display.FlipXKey) is not null)
Write<string?>(Data.Models.Metadata.Display.FlipXKey, ReadBool(Data.Models.Metadata.Display.FlipXKey).FromYesNo());
if (ReadLong(Data.Models.Metadata.Display.HBEndKey) is not null)
Write<string?>(Data.Models.Metadata.Display.HBEndKey, ReadLong(Data.Models.Metadata.Display.HBEndKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.HBStartKey) is not null)
Write<string?>(Data.Models.Metadata.Display.HBStartKey, ReadLong(Data.Models.Metadata.Display.HBStartKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.HeightKey) is not null)
Write<string?>(Data.Models.Metadata.Display.HeightKey, ReadLong(Data.Models.Metadata.Display.HeightKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.HTotalKey) is not null)
Write<string?>(Data.Models.Metadata.Display.HTotalKey, ReadLong(Data.Models.Metadata.Display.HTotalKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.PixClockKey) is not null)
Write<string?>(Data.Models.Metadata.Display.PixClockKey, ReadLong(Data.Models.Metadata.Display.PixClockKey).ToString());
if (ReadDouble(Data.Models.Metadata.Display.RefreshKey) is not null)
Write<string?>(Data.Models.Metadata.Display.RefreshKey, ReadDouble(Data.Models.Metadata.Display.RefreshKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.RotateKey) is not null)
Write<string?>(Data.Models.Metadata.Display.RotateKey, ReadLong(Data.Models.Metadata.Display.RotateKey).ToString());
if (ReadString(Data.Models.Metadata.Display.DisplayTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Display.DisplayTypeKey, ReadString(Data.Models.Metadata.Display.DisplayTypeKey).AsDisplayType().AsStringValue());
if (ReadLong(Data.Models.Metadata.Display.VBEndKey) is not null)
Write<string?>(Data.Models.Metadata.Display.VBEndKey, ReadLong(Data.Models.Metadata.Display.VBEndKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.VBStartKey) is not null)
Write<string?>(Data.Models.Metadata.Display.VBStartKey, ReadLong(Data.Models.Metadata.Display.VBStartKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.VTotalKey) is not null)
Write<string?>(Data.Models.Metadata.Display.VTotalKey, ReadLong(Data.Models.Metadata.Display.VTotalKey).ToString());
if (ReadLong(Data.Models.Metadata.Display.WidthKey) is not null)
Write<string?>(Data.Models.Metadata.Display.WidthKey, ReadLong(Data.Models.Metadata.Display.WidthKey).ToString());
}
public Display(Data.Models.Metadata.Display item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
public Display(Data.Models.Metadata.Video item) : base()
{
SetFieldValue(Data.Models.Metadata.Video.AspectXKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.AspectXKey)));
SetFieldValue(Data.Models.Metadata.Video.AspectYKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.AspectYKey)));
SetFieldValue<string?>(Data.Models.Metadata.Display.DisplayTypeKey, item.ReadString(Data.Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
SetFieldValue(Data.Models.Metadata.Display.HeightKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.HeightKey)));
SetFieldValue(Data.Models.Metadata.Display.RefreshKey, NumberHelper.ConvertToDouble(item.ReadString(Data.Models.Metadata.Video.RefreshKey)));
SetFieldValue(Data.Models.Metadata.Display.WidthKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.WidthKey)));
Write(Data.Models.Metadata.Video.AspectXKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.AspectXKey)));
Write(Data.Models.Metadata.Video.AspectYKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.AspectYKey)));
Write<string?>(Data.Models.Metadata.Display.DisplayTypeKey, item.ReadString(Data.Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
Write(Data.Models.Metadata.Display.HeightKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.HeightKey)));
Write(Data.Models.Metadata.Display.RefreshKey, NumberHelper.ConvertToDouble(item.ReadString(Data.Models.Metadata.Video.RefreshKey)));
Write(Data.Models.Metadata.Display.WidthKey, NumberHelper.ConvertToInt64(item.ReadString(Data.Models.Metadata.Video.WidthKey)));
switch (item.ReadString(Data.Models.Metadata.Video.OrientationKey))
{
case "horizontal":
SetFieldValue<long?>(Data.Models.Metadata.Display.RotateKey, 0);
Write<long?>(Data.Models.Metadata.Display.RotateKey, 0);
break;
case "vertical":
SetFieldValue<long?>(Data.Models.Metadata.Display.RotateKey, 90);
Write<long?>(Data.Models.Metadata.Display.RotateKey, 90);
break;
default:
// TODO: Log invalid values
@@ -81,23 +81,23 @@ namespace SabreTools.Metadata.DatItems.Formats
}
// Process flag values
if (GetInt64FieldValue(Data.Models.Metadata.Video.AspectXKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Video.AspectXKey, GetInt64FieldValue(Data.Models.Metadata.Video.AspectXKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Video.AspectYKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Video.AspectYKey, GetInt64FieldValue(Data.Models.Metadata.Video.AspectYKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Video.HeightKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.HeightKey, GetInt64FieldValue(Data.Models.Metadata.Video.HeightKey).ToString());
if (GetDoubleFieldValue(Data.Models.Metadata.Video.RefreshKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.RefreshKey, GetDoubleFieldValue(Data.Models.Metadata.Video.RefreshKey).ToString());
if (GetStringFieldValue(Data.Models.Metadata.Video.ScreenKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Data.Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
if (GetInt64FieldValue(Data.Models.Metadata.Video.WidthKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Display.WidthKey, GetInt64FieldValue(Data.Models.Metadata.Video.WidthKey).ToString());
if (ReadLong(Data.Models.Metadata.Video.AspectXKey) is not null)
Write<string?>(Data.Models.Metadata.Video.AspectXKey, ReadLong(Data.Models.Metadata.Video.AspectXKey).ToString());
if (ReadLong(Data.Models.Metadata.Video.AspectYKey) is not null)
Write<string?>(Data.Models.Metadata.Video.AspectYKey, ReadLong(Data.Models.Metadata.Video.AspectYKey).ToString());
if (ReadLong(Data.Models.Metadata.Video.HeightKey) is not null)
Write<string?>(Data.Models.Metadata.Display.HeightKey, ReadLong(Data.Models.Metadata.Video.HeightKey).ToString());
if (ReadDouble(Data.Models.Metadata.Video.RefreshKey) is not null)
Write<string?>(Data.Models.Metadata.Display.RefreshKey, ReadDouble(Data.Models.Metadata.Video.RefreshKey).ToString());
if (ReadString(Data.Models.Metadata.Video.ScreenKey) is not null)
Write<string?>(Data.Models.Metadata.Display.DisplayTypeKey, ReadString(Data.Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
if (ReadLong(Data.Models.Metadata.Video.WidthKey) is not null)
Write<string?>(Data.Models.Metadata.Display.WidthKey, ReadLong(Data.Models.Metadata.Video.WidthKey).ToString());
}
public Display(Data.Models.Metadata.Video item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,33 +23,33 @@ namespace SabreTools.Metadata.DatItems.Formats
public Driver(Data.Models.Metadata.Driver item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.Driver.CocktailKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.CocktailKey, GetStringFieldValue(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Driver.ColorKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.ColorKey, GetStringFieldValue(Data.Models.Metadata.Driver.ColorKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Driver.EmulationKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.EmulationKey, GetStringFieldValue(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus().AsStringValue());
if (GetBoolFieldValue(Data.Models.Metadata.Driver.IncompleteKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.IncompleteKey, GetBoolFieldValue(Data.Models.Metadata.Driver.IncompleteKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Driver.NoSoundHardwareKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.NoSoundHardwareKey, GetBoolFieldValue(Data.Models.Metadata.Driver.NoSoundHardwareKey).FromYesNo());
if (GetInt64FieldValue(Data.Models.Metadata.Driver.PaletteSizeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.PaletteSizeKey, GetInt64FieldValue(Data.Models.Metadata.Driver.PaletteSizeKey).ToString());
if (GetBoolFieldValue(Data.Models.Metadata.Driver.RequiresArtworkKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.RequiresArtworkKey, GetBoolFieldValue(Data.Models.Metadata.Driver.RequiresArtworkKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Driver.SaveStateKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.SaveStateKey, GetStringFieldValue(Data.Models.Metadata.Driver.SaveStateKey).AsSupported().AsStringValue(useSecond: true));
if (GetStringFieldValue(Data.Models.Metadata.Driver.SoundKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.SoundKey, GetStringFieldValue(Data.Models.Metadata.Driver.SoundKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Driver.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.StatusKey, GetStringFieldValue(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus().AsStringValue());
if (GetBoolFieldValue(Data.Models.Metadata.Driver.UnofficialKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Driver.UnofficialKey, GetBoolFieldValue(Data.Models.Metadata.Driver.UnofficialKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Driver.CocktailKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.CocktailKey, ReadString(Data.Models.Metadata.Driver.CocktailKey).AsSupportStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Driver.ColorKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.ColorKey, ReadString(Data.Models.Metadata.Driver.ColorKey).AsSupportStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Driver.EmulationKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.EmulationKey, ReadString(Data.Models.Metadata.Driver.EmulationKey).AsSupportStatus().AsStringValue());
if (ReadBool(Data.Models.Metadata.Driver.IncompleteKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.IncompleteKey, ReadBool(Data.Models.Metadata.Driver.IncompleteKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Driver.NoSoundHardwareKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.NoSoundHardwareKey, ReadBool(Data.Models.Metadata.Driver.NoSoundHardwareKey).FromYesNo());
if (ReadLong(Data.Models.Metadata.Driver.PaletteSizeKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.PaletteSizeKey, ReadLong(Data.Models.Metadata.Driver.PaletteSizeKey).ToString());
if (ReadBool(Data.Models.Metadata.Driver.RequiresArtworkKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.RequiresArtworkKey, ReadBool(Data.Models.Metadata.Driver.RequiresArtworkKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Driver.SaveStateKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.SaveStateKey, ReadString(Data.Models.Metadata.Driver.SaveStateKey).AsSupported().AsStringValue(useSecond: true));
if (ReadString(Data.Models.Metadata.Driver.SoundKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.SoundKey, ReadString(Data.Models.Metadata.Driver.SoundKey).AsSupportStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Driver.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.StatusKey, ReadString(Data.Models.Metadata.Driver.StatusKey).AsSupportStatus().AsStringValue());
if (ReadBool(Data.Models.Metadata.Driver.UnofficialKey) is not null)
Write<string?>(Data.Models.Metadata.Driver.UnofficialKey, ReadBool(Data.Models.Metadata.Driver.UnofficialKey).FromYesNo());
}
public Driver(Data.Models.Metadata.Driver item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Extension(Data.Models.Metadata.Extension item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,17 +23,17 @@ namespace SabreTools.Metadata.DatItems.Formats
public Feature(Data.Models.Metadata.Feature item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.Feature.OverallKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.OverallKey, GetStringFieldValue(Data.Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Feature.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.StatusKey, GetStringFieldValue(Data.Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Feature.FeatureTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.OverallKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.OverallKey, ReadString(Data.Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.StatusKey, ReadString(Data.Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.FeatureTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.FeatureTypeKey, ReadString(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
}
public Feature(Data.Models.Metadata.Feature item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -102,7 +102,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// </summary>
public File()
{
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
}
#endregion
@@ -123,10 +123,10 @@ namespace SabreTools.Metadata.DatItems.Formats
_sha256 = this._sha256,
Format = this.Format,
};
file.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
file.SetFieldValue(MachineKey, GetMachine()!.Clone() as Machine ?? new Machine());
file.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
file.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
file.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
file.Write(MachineKey, GetMachine()!.Clone() as Machine ?? new Machine());
file.Write(RemoveKey, ReadBool(RemoveKey));
file.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
return file;
}
@@ -140,16 +140,16 @@ namespace SabreTools.Metadata.DatItems.Formats
var rom = new Rom();
rom.SetName($"{Id}.{Extension}");
rom.SetFieldValue(Data.Models.Metadata.Rom.SizeKey, Size);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, CRC);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, MD5);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, SHA1);
rom.SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, SHA256);
rom.Write(Data.Models.Metadata.Rom.SizeKey, Size);
rom.Write<string?>(Data.Models.Metadata.Rom.CRCKey, CRC);
rom.Write<string?>(Data.Models.Metadata.Rom.MD5Key, MD5);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, SHA1);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA256Key, SHA256);
rom.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
rom.SetFieldValue(MachineKey, GetMachine()?.Clone() as Machine);
rom.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
rom.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
rom.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
rom.Write(MachineKey, GetMachine()?.Clone() as Machine);
rom.Write(RemoveKey, ReadBool(RemoveKey));
rom.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
return rom;
}
@@ -164,7 +164,7 @@ namespace SabreTools.Metadata.DatItems.Formats
bool dupefound = false;
// If we don't have a file, return false
if (GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey))
if (ReadString(Data.Models.Metadata.DatItem.TypeKey) != other?.ReadString(Data.Models.Metadata.DatItem.TypeKey))
return dupefound;
// Otherwise, treat it as a File

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Info(Data.Models.Metadata.Info item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var controls = GetFieldValue<Control[]?>(Data.Models.Metadata.Input.ControlKey);
var controls = Read<Control[]?>(Data.Models.Metadata.Input.ControlKey);
return controls is not null && controls.Length > 0;
}
}
@@ -35,29 +35,29 @@ namespace SabreTools.Metadata.DatItems.Formats
public Input(Data.Models.Metadata.Input item) : base(item)
{
// Process flag values
if (GetInt64FieldValue(Data.Models.Metadata.Input.ButtonsKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Input.ButtonsKey, GetInt64FieldValue(Data.Models.Metadata.Input.ButtonsKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Input.CoinsKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Input.CoinsKey, GetInt64FieldValue(Data.Models.Metadata.Input.CoinsKey).ToString());
if (GetInt64FieldValue(Data.Models.Metadata.Input.PlayersKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Input.PlayersKey, GetInt64FieldValue(Data.Models.Metadata.Input.PlayersKey).ToString());
if (GetBoolFieldValue(Data.Models.Metadata.Input.ServiceKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Input.ServiceKey, GetBoolFieldValue(Data.Models.Metadata.Input.ServiceKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Input.TiltKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Input.TiltKey, GetBoolFieldValue(Data.Models.Metadata.Input.TiltKey).FromYesNo());
if (ReadLong(Data.Models.Metadata.Input.ButtonsKey) is not null)
Write<string?>(Data.Models.Metadata.Input.ButtonsKey, ReadLong(Data.Models.Metadata.Input.ButtonsKey).ToString());
if (ReadLong(Data.Models.Metadata.Input.CoinsKey) is not null)
Write<string?>(Data.Models.Metadata.Input.CoinsKey, ReadLong(Data.Models.Metadata.Input.CoinsKey).ToString());
if (ReadLong(Data.Models.Metadata.Input.PlayersKey) is not null)
Write<string?>(Data.Models.Metadata.Input.PlayersKey, ReadLong(Data.Models.Metadata.Input.PlayersKey).ToString());
if (ReadBool(Data.Models.Metadata.Input.ServiceKey) is not null)
Write<string?>(Data.Models.Metadata.Input.ServiceKey, ReadBool(Data.Models.Metadata.Input.ServiceKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Input.TiltKey) is not null)
Write<string?>(Data.Models.Metadata.Input.TiltKey, ReadBool(Data.Models.Metadata.Input.TiltKey).FromYesNo());
// Handle subitems
var controls = item.ReadItemArray<Data.Models.Metadata.Control>(Data.Models.Metadata.Input.ControlKey);
if (controls is not null)
{
Control[] controlItems = Array.ConvertAll(controls, control => new Control(control));
SetFieldValue<Control[]?>(Data.Models.Metadata.Input.ControlKey, controlItems);
Write<Control[]?>(Data.Models.Metadata.Input.ControlKey, controlItems);
}
}
public Input(Data.Models.Metadata.Input item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -70,7 +70,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var inputItem = base.GetInternalClone();
var controls = GetFieldValue<Control[]?>(Data.Models.Metadata.Input.ControlKey);
var controls = Read<Control[]?>(Data.Models.Metadata.Input.ControlKey);
if (controls is not null)
{
Data.Models.Metadata.Control[] controlItems = Array.ConvertAll(controls, control => control.GetInternalClone());

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Instance(Data.Models.Metadata.Instance item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -22,25 +22,25 @@ namespace SabreTools.Metadata.DatItems.Formats
public Media() : base()
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
Write<DupeType>(DupeTypeKey, 0x00);
}
public Media(Data.Models.Metadata.Media item) : base(item)
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
Write<DupeType>(DupeTypeKey, 0x00);
// Process hash values
if (GetStringFieldValue(Data.Models.Metadata.Media.MD5Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Media.MD5Key, TextHelper.NormalizeMD5(GetStringFieldValue(Data.Models.Metadata.Media.MD5Key)));
if (GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Media.SHA1Key, TextHelper.NormalizeSHA1(GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key)));
if (GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Media.SHA256Key, TextHelper.NormalizeSHA256(GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key)));
if (ReadString(Data.Models.Metadata.Media.MD5Key) is not null)
Write<string?>(Data.Models.Metadata.Media.MD5Key, TextHelper.NormalizeMD5(ReadString(Data.Models.Metadata.Media.MD5Key)));
if (ReadString(Data.Models.Metadata.Media.SHA1Key) is not null)
Write<string?>(Data.Models.Metadata.Media.SHA1Key, TextHelper.NormalizeSHA1(ReadString(Data.Models.Metadata.Media.SHA1Key)));
if (ReadString(Data.Models.Metadata.Media.SHA256Key) is not null)
Write<string?>(Data.Models.Metadata.Media.SHA256Key, TextHelper.NormalizeSHA256(ReadString(Data.Models.Metadata.Media.SHA256Key)));
}
public Media(Data.Models.Metadata.Media item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -56,10 +56,10 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var rom = new Rom(_internal.ConvertToRom()!);
rom.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
rom.SetFieldValue(MachineKey, GetMachine());
rom.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
rom.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
rom.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
rom.Write(MachineKey, GetMachine());
rom.Write(RemoveKey, ReadBool(RemoveKey));
rom.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
return rom;
}
@@ -102,19 +102,19 @@ namespace SabreTools.Metadata.DatItems.Formats
switch (bucketedBy)
{
case ItemKey.MD5:
key = GetStringFieldValue(Data.Models.Metadata.Media.MD5Key);
key = ReadString(Data.Models.Metadata.Media.MD5Key);
break;
case ItemKey.SHA1:
key = GetStringFieldValue(Data.Models.Metadata.Media.SHA1Key);
key = ReadString(Data.Models.Metadata.Media.SHA1Key);
break;
case ItemKey.SHA256:
key = GetStringFieldValue(Data.Models.Metadata.Media.SHA256Key);
key = ReadString(Data.Models.Metadata.Media.SHA256Key);
break;
case ItemKey.SpamSum:
key = GetStringFieldValue(Data.Models.Metadata.Media.SpamSumKey);
key = ReadString(Data.Models.Metadata.Media.SpamSumKey);
break;
// Let the base handle generic stuff

View File

@@ -20,7 +20,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var features = GetFieldValue<PartFeature[]?>(Data.Models.Metadata.Part.FeatureKey);
var features = Read<PartFeature[]?>(Data.Models.Metadata.Part.FeatureKey);
return features is not null && features.Length > 0;
}
}
@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Part(Data.Models.Metadata.Part item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -32,17 +32,17 @@ namespace SabreTools.Metadata.DatItems.Formats
public PartFeature(Data.Models.Metadata.Feature item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.Feature.OverallKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.OverallKey, GetStringFieldValue(Data.Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Feature.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.StatusKey, GetStringFieldValue(Data.Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Feature.FeatureTypeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.OverallKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.OverallKey, ReadString(Data.Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.StatusKey, ReadString(Data.Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.Feature.FeatureTypeKey) is not null)
Write<string?>(Data.Models.Metadata.Feature.FeatureTypeKey, ReadString(Data.Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
}
public PartFeature(Data.Models.Metadata.Feature item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var analogs = GetFieldValue<Analog[]?>(Data.Models.Metadata.Port.AnalogKey);
var analogs = Read<Analog[]?>(Data.Models.Metadata.Port.AnalogKey);
return analogs is not null && analogs.Length > 0;
}
}
@@ -39,13 +39,13 @@ namespace SabreTools.Metadata.DatItems.Formats
if (analogs is not null)
{
Analog[] analogItems = Array.ConvertAll(analogs, analog => new Analog(analog));
SetFieldValue<Analog[]?>(Data.Models.Metadata.Port.AnalogKey, analogItems);
Write<Analog[]?>(Data.Models.Metadata.Port.AnalogKey, analogItems);
}
}
public Port(Data.Models.Metadata.Port item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -58,7 +58,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var portItem = base.GetInternalClone();
var analogs = GetFieldValue<Analog[]?>(Data.Models.Metadata.Port.AnalogKey);
var analogs = Read<Analog[]?>(Data.Models.Metadata.Port.AnalogKey);
if (analogs is not null)
{
Data.Models.Metadata.Analog[] analogItems = Array.ConvertAll(analogs, analog => analog.GetInternalClone());

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public RamOption(Data.Models.Metadata.RamOption item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.RamOption.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.RamOption.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.RamOption.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.RamOption.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.RamOption.DefaultKey, ReadBool(Data.Models.Metadata.RamOption.DefaultKey).FromYesNo());
}
public RamOption(Data.Models.Metadata.RamOption item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public Release(Data.Models.Metadata.Release item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Release.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Release.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.Release.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Release.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.Release.DefaultKey, ReadBool(Data.Models.Metadata.Release.DefaultKey).FromYesNo());
}
public Release(Data.Models.Metadata.Release item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -115,7 +115,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// </summary>
public ReleaseDetails()
{
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
}
#endregion
@@ -143,11 +143,11 @@ namespace SabreTools.Metadata.DatItems.Formats
Region = this.Region,
Origin = this.Origin,
};
releaseDetails.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
releaseDetails.SetFieldValue(MachineKey, GetMachine());
releaseDetails.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
releaseDetails.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
releaseDetails.SetFieldValue<string?>(Data.Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
releaseDetails.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
releaseDetails.Write(MachineKey, GetMachine());
releaseDetails.Write(RemoveKey, ReadBool(RemoveKey));
releaseDetails.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
releaseDetails.Write<string?>(Data.Models.Metadata.DatItem.TypeKey, ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return releaseDetails;
}
@@ -160,7 +160,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public override bool Equals(DatItem? other)
{
// If we don't have a Details, return false
if (GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey))
if (ReadString(Data.Models.Metadata.DatItem.TypeKey) != other?.ReadString(Data.Models.Metadata.DatItem.TypeKey))
return false;
// Otherwise, treat it as a Details

View File

@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var status = GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus();
var status = ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus();
return status != ItemStatus.NULL && status != ItemStatus.None;
}
}
@@ -45,7 +45,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var original = GetFieldValue<Original?>("ORIGINAL");
var original = Read<Original?>("ORIGINAL");
return original is not null && original != default;
}
}
@@ -55,12 +55,12 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var dataArea = GetFieldValue<DataArea?>(DataAreaKey);
var dataArea = Read<DataArea?>(DataAreaKey);
return dataArea is not null
&& (!string.IsNullOrEmpty(dataArea.GetName())
|| dataArea.GetInt64FieldValue(Data.Models.Metadata.DataArea.SizeKey) is not null
|| dataArea.GetInt64FieldValue(Data.Models.Metadata.DataArea.WidthKey) is not null
|| dataArea.GetStringFieldValue(Data.Models.Metadata.DataArea.EndiannessKey).AsEndianness() != Endianness.NULL);
|| dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey) is not null
|| dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey) is not null
|| dataArea.ReadString(Data.Models.Metadata.DataArea.EndiannessKey).AsEndianness() != Endianness.NULL);
}
}
@@ -69,10 +69,10 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var part = GetFieldValue<Part?>(PartKey);
var part = Read<Part?>(PartKey);
return part is not null
&& (!string.IsNullOrEmpty(part.GetName())
|| !string.IsNullOrEmpty(part.GetStringFieldValue(Data.Models.Metadata.Part.InterfaceKey)));
|| !string.IsNullOrEmpty(part.ReadString(Data.Models.Metadata.Part.InterfaceKey)));
}
}
@@ -82,8 +82,8 @@ namespace SabreTools.Metadata.DatItems.Formats
public Rom() : base()
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
Write<DupeType>(DupeTypeKey, 0x00);
Write<string?>(Data.Models.Metadata.Rom.StatusKey, ItemStatus.None.AsStringValue());
}
public Rom(Data.Models.Metadata.Dump item, Machine machine, Source source, int index)
@@ -114,18 +114,18 @@ namespace SabreTools.Metadata.DatItems.Formats
string name = $"{machine.GetName()}_{index++}{(!string.IsNullOrEmpty(rom!.ReadString(Data.Models.Metadata.Rom.RemarkKey)) ? $" {rom.ReadString(Data.Models.Metadata.Rom.RemarkKey)}" : string.Empty)}";
SetName(name);
SetFieldValue<string?>(Data.Models.Metadata.Rom.OffsetKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
SetFieldValue<string?>(Data.Models.Metadata.Rom.OpenMSXMediaType, subType.AsStringValue());
SetFieldValue<string?>(Data.Models.Metadata.Rom.OpenMSXType, rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType) ?? rom.ReadString(Data.Models.Metadata.DatItem.TypeKey));
SetFieldValue<string?>(Data.Models.Metadata.Rom.RemarkKey, rom.ReadString(Data.Models.Metadata.Rom.RemarkKey));
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
SetFieldValue<string?>(Data.Models.Metadata.Rom.StartKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
SetFieldValue<Source?>(SourceKey, source);
Write<string?>(Data.Models.Metadata.Rom.OffsetKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
Write<string?>(Data.Models.Metadata.Rom.OpenMSXMediaType, subType.AsStringValue());
Write<string?>(Data.Models.Metadata.Rom.OpenMSXType, rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType) ?? rom.ReadString(Data.Models.Metadata.DatItem.TypeKey));
Write<string?>(Data.Models.Metadata.Rom.RemarkKey, rom.ReadString(Data.Models.Metadata.Rom.RemarkKey));
Write<string?>(Data.Models.Metadata.Rom.SHA1Key, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Write<string?>(Data.Models.Metadata.Rom.StartKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
Write<Source?>(SourceKey, source);
if (item.Read<Data.Models.Metadata.Original>(Data.Models.Metadata.Dump.OriginalKey) is not null)
{
var original = item.Read<Data.Models.Metadata.Original>(Data.Models.Metadata.Dump.OriginalKey)!;
SetFieldValue<Original?>("ORIGINAL", new Original
Write<Original?>("ORIGINAL", new Original
{
Value = original.ReadBool(Data.Models.Metadata.Original.ValueKey),
Content = original.ReadString(Data.Models.Metadata.Original.ContentKey),
@@ -135,92 +135,92 @@ namespace SabreTools.Metadata.DatItems.Formats
CopyMachineInformation(machine);
// Process hash values
if (GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey).ToString());
if (ReadLong(Data.Models.Metadata.Rom.SizeKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.SizeKey, ReadLong(Data.Models.Metadata.Rom.SizeKey).ToString());
// TODO: This should be normalized to CRC-16
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key), 4));
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)));
if (ReadString(Data.Models.Metadata.Rom.CRC16Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(ReadString(Data.Models.Metadata.Rom.CRC16Key), 4));
if (ReadString(Data.Models.Metadata.Rom.CRCKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(ReadString(Data.Models.Metadata.Rom.CRCKey)));
// TODO: This should be normalized to CRC-64
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key), 16));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD5(GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key)));
if (ReadString(Data.Models.Metadata.Rom.CRC64Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(ReadString(Data.Models.Metadata.Rom.CRC64Key), 16));
if (ReadString(Data.Models.Metadata.Rom.MD2Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(ReadString(Data.Models.Metadata.Rom.MD2Key)));
if (ReadString(Data.Models.Metadata.Rom.MD4Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD5(ReadString(Data.Models.Metadata.Rom.MD4Key)));
if (ReadString(Data.Models.Metadata.Rom.MD5Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(ReadString(Data.Models.Metadata.Rom.MD5Key)));
if (ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)));
if (ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA1Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(ReadString(Data.Models.Metadata.Rom.SHA1Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA256Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(ReadString(Data.Models.Metadata.Rom.SHA256Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA384Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(ReadString(Data.Models.Metadata.Rom.SHA384Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA512Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(ReadString(Data.Models.Metadata.Rom.SHA512Key)));
}
public Rom(Data.Models.Metadata.Rom item) : base(item)
{
SetFieldValue<DupeType>(DupeTypeKey, 0x00);
Write<DupeType>(DupeTypeKey, 0x00);
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.Rom.DisposeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.DisposeKey, GetBoolFieldValue(Data.Models.Metadata.Rom.DisposeKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Rom.InvertedKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.InvertedKey, GetBoolFieldValue(Data.Models.Metadata.Rom.InvertedKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Rom.LoadFlagKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.LoadFlagKey, GetStringFieldValue(Data.Models.Metadata.Rom.LoadFlagKey).AsLoadFlag().AsStringValue());
if (GetStringFieldValue(Data.Models.Metadata.Rom.OpenMSXMediaType) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.OpenMSXMediaType, GetStringFieldValue(Data.Models.Metadata.Rom.OpenMSXMediaType).AsOpenMSXSubType().AsStringValue());
if (GetBoolFieldValue(Data.Models.Metadata.Rom.MIAKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MIAKey, GetBoolFieldValue(Data.Models.Metadata.Rom.MIAKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Rom.OptionalKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.OptionalKey, GetBoolFieldValue(Data.Models.Metadata.Rom.OptionalKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Rom.SoundOnlyKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SoundOnlyKey, GetBoolFieldValue(Data.Models.Metadata.Rom.SoundOnlyKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.StatusKey, GetStringFieldValue(Data.Models.Metadata.Rom.StatusKey).AsItemStatus().AsStringValue());
if (ReadBool(Data.Models.Metadata.Rom.DisposeKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.DisposeKey, ReadBool(Data.Models.Metadata.Rom.DisposeKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Rom.InvertedKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.InvertedKey, ReadBool(Data.Models.Metadata.Rom.InvertedKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Rom.LoadFlagKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.LoadFlagKey, ReadString(Data.Models.Metadata.Rom.LoadFlagKey).AsLoadFlag().AsStringValue());
if (ReadString(Data.Models.Metadata.Rom.OpenMSXMediaType) is not null)
Write<string?>(Data.Models.Metadata.Rom.OpenMSXMediaType, ReadString(Data.Models.Metadata.Rom.OpenMSXMediaType).AsOpenMSXSubType().AsStringValue());
if (ReadBool(Data.Models.Metadata.Rom.MIAKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.MIAKey, ReadBool(Data.Models.Metadata.Rom.MIAKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Rom.OptionalKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.OptionalKey, ReadBool(Data.Models.Metadata.Rom.OptionalKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Rom.SoundOnlyKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.SoundOnlyKey, ReadBool(Data.Models.Metadata.Rom.SoundOnlyKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Rom.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.StatusKey, ReadString(Data.Models.Metadata.Rom.StatusKey).AsItemStatus().AsStringValue());
// Process hash values
if (GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SizeKey, GetInt64FieldValue(Data.Models.Metadata.Rom.SizeKey).ToString());
if (ReadLong(Data.Models.Metadata.Rom.SizeKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.SizeKey, ReadLong(Data.Models.Metadata.Rom.SizeKey).ToString());
// TODO: This should be normalized to CRC-16
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key), 4));
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey)));
if (ReadString(Data.Models.Metadata.Rom.CRC16Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(ReadString(Data.Models.Metadata.Rom.CRC16Key), 4));
if (ReadString(Data.Models.Metadata.Rom.CRCKey) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(ReadString(Data.Models.Metadata.Rom.CRCKey)));
// TODO: This should be normalized to CRC-64
if (GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key), 16));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD4(GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key)));
if (GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key)));
if (ReadString(Data.Models.Metadata.Rom.CRC64Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(ReadString(Data.Models.Metadata.Rom.CRC64Key), 16));
if (ReadString(Data.Models.Metadata.Rom.MD2Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(ReadString(Data.Models.Metadata.Rom.MD2Key)));
if (ReadString(Data.Models.Metadata.Rom.MD4Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD4(ReadString(Data.Models.Metadata.Rom.MD4Key)));
if (ReadString(Data.Models.Metadata.Rom.MD5Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(ReadString(Data.Models.Metadata.Rom.MD5Key)));
if (ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)));
if (ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA1Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(ReadString(Data.Models.Metadata.Rom.SHA1Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA256Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(ReadString(Data.Models.Metadata.Rom.SHA256Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA384Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(ReadString(Data.Models.Metadata.Rom.SHA384Key)));
if (ReadString(Data.Models.Metadata.Rom.SHA512Key) is not null)
Write<string?>(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(ReadString(Data.Models.Metadata.Rom.SHA512Key)));
}
public Rom(Data.Models.Metadata.Rom item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -343,55 +343,55 @@ namespace SabreTools.Metadata.DatItems.Formats
switch (bucketedBy)
{
case ItemKey.CRC16:
key = GetStringFieldValue(Data.Models.Metadata.Rom.CRC16Key);
key = ReadString(Data.Models.Metadata.Rom.CRC16Key);
break;
case ItemKey.CRC:
key = GetStringFieldValue(Data.Models.Metadata.Rom.CRCKey);
key = ReadString(Data.Models.Metadata.Rom.CRCKey);
break;
case ItemKey.CRC64:
key = GetStringFieldValue(Data.Models.Metadata.Rom.CRC64Key);
key = ReadString(Data.Models.Metadata.Rom.CRC64Key);
break;
case ItemKey.MD2:
key = GetStringFieldValue(Data.Models.Metadata.Rom.MD2Key);
key = ReadString(Data.Models.Metadata.Rom.MD2Key);
break;
case ItemKey.MD4:
key = GetStringFieldValue(Data.Models.Metadata.Rom.MD4Key);
key = ReadString(Data.Models.Metadata.Rom.MD4Key);
break;
case ItemKey.MD5:
key = GetStringFieldValue(Data.Models.Metadata.Rom.MD5Key);
key = ReadString(Data.Models.Metadata.Rom.MD5Key);
break;
case ItemKey.RIPEMD128:
key = GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD128Key);
key = ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
break;
case ItemKey.RIPEMD160:
key = GetStringFieldValue(Data.Models.Metadata.Rom.RIPEMD160Key);
key = ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
break;
case ItemKey.SHA1:
key = GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key);
key = ReadString(Data.Models.Metadata.Rom.SHA1Key);
break;
case ItemKey.SHA256:
key = GetStringFieldValue(Data.Models.Metadata.Rom.SHA256Key);
key = ReadString(Data.Models.Metadata.Rom.SHA256Key);
break;
case ItemKey.SHA384:
key = GetStringFieldValue(Data.Models.Metadata.Rom.SHA384Key);
key = ReadString(Data.Models.Metadata.Rom.SHA384Key);
break;
case ItemKey.SHA512:
key = GetStringFieldValue(Data.Models.Metadata.Rom.SHA512Key);
key = ReadString(Data.Models.Metadata.Rom.SHA512Key);
break;
case ItemKey.SpamSum:
key = GetStringFieldValue(Data.Models.Metadata.Rom.SpamSumKey);
key = ReadString(Data.Models.Metadata.Rom.SpamSumKey);
break;
// Let the base handle generic stuff

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Sample(Data.Models.Metadata.Sample item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -108,7 +108,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// </summary>
public Serials()
{
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType);
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType);
}
#endregion
@@ -135,11 +135,11 @@ namespace SabreTools.Metadata.DatItems.Formats
MediaStamp = this.MediaStamp,
BoxBarcode = this.BoxBarcode,
};
serials.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
serials.SetFieldValue(MachineKey, GetMachine());
serials.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
serials.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
serials.SetFieldValue<string?>(Data.Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
serials.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
serials.Write(MachineKey, GetMachine());
serials.Write(RemoveKey, ReadBool(RemoveKey));
serials.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
serials.Write<string?>(Data.Models.Metadata.DatItem.TypeKey, ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return serials;
}
@@ -152,7 +152,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public override bool Equals(DatItem? other)
{
// If we don't have a Serials, return false
if (GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey))
if (ReadString(Data.Models.Metadata.DatItem.TypeKey) != other?.ReadString(Data.Models.Metadata.DatItem.TypeKey))
return false;
// Otherwise, treat it as a Serials

View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public SharedFeat(Data.Models.Metadata.SharedFeat item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -21,7 +21,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
get
{
var slotOptions = GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey);
var slotOptions = Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey);
return slotOptions is not null && slotOptions.Length > 0;
}
}
@@ -39,13 +39,13 @@ namespace SabreTools.Metadata.DatItems.Formats
if (slotOptions is not null)
{
SlotOption[] slotOptionItems = Array.ConvertAll(slotOptions, slotOption => new SlotOption(slotOption));
SetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, slotOptionItems);
Write<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey, slotOptionItems);
}
}
public Slot(Data.Models.Metadata.Slot item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}
@@ -58,7 +58,7 @@ namespace SabreTools.Metadata.DatItems.Formats
{
var slotItem = base.GetInternalClone();
var slotOptions = GetFieldValue<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey);
var slotOptions = Read<SlotOption[]?>(Data.Models.Metadata.Slot.SlotOptionKey);
if (slotOptions is not null)
{
Data.Models.Metadata.SlotOption[] slotOptionItems = Array.ConvertAll(slotOptions, slotOption => slotOption.GetInternalClone());

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public SlotOption(Data.Models.Metadata.SlotOption item) : base(item)
{
// Process flag values
if (GetBoolFieldValue(Data.Models.Metadata.SlotOption.DefaultKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.SlotOption.DefaultKey, GetBoolFieldValue(Data.Models.Metadata.SlotOption.DefaultKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.SlotOption.DefaultKey) is not null)
Write<string?>(Data.Models.Metadata.SlotOption.DefaultKey, ReadBool(Data.Models.Metadata.SlotOption.DefaultKey).FromYesNo());
}
public SlotOption(Data.Models.Metadata.SlotOption item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,8 +23,8 @@ namespace SabreTools.Metadata.DatItems.Formats
public SoftwareList(Data.Models.Metadata.SoftwareList item) : base(item)
{
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.SoftwareList.StatusKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.SoftwareList.StatusKey, GetStringFieldValue(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus().AsStringValue());
if (ReadString(Data.Models.Metadata.SoftwareList.StatusKey) is not null)
Write<string?>(Data.Models.Metadata.SoftwareList.StatusKey, ReadString(Data.Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus().AsStringValue());
// Handle subitems
// TODO: Handle the Software subitem
@@ -32,7 +32,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public SoftwareList(Data.Models.Metadata.SoftwareList item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -23,13 +23,13 @@ namespace SabreTools.Metadata.DatItems.Formats
public Sound(Data.Models.Metadata.Sound item) : base(item)
{
// Process flag values
if (GetInt64FieldValue(Data.Models.Metadata.Sound.ChannelsKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Sound.ChannelsKey, GetInt64FieldValue(Data.Models.Metadata.Sound.ChannelsKey).ToString());
if (ReadLong(Data.Models.Metadata.Sound.ChannelsKey) is not null)
Write<string?>(Data.Models.Metadata.Sound.ChannelsKey, ReadLong(Data.Models.Metadata.Sound.ChannelsKey).ToString());
}
public Sound(Data.Models.Metadata.Sound item, Machine machine, Source source) : this(item)
{
SetFieldValue<Source?>(SourceKey, source);
Write<Source?>(SourceKey, source);
CopyMachineInformation(machine);
}

View File

@@ -145,7 +145,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// </summary>
public SourceDetails()
{
SetFieldValue(Data.Models.Metadata.DatItem.TypeKey, ItemType.SourceDetails);
Write(Data.Models.Metadata.DatItem.TypeKey, ItemType.SourceDetails);
}
#endregion
@@ -178,11 +178,11 @@ namespace SabreTools.Metadata.DatItems.Formats
Link2 = this.Link2,
Link3 = this.Link3,
};
sourceDetails.SetFieldValue(DupeTypeKey, GetFieldValue<DupeType>(DupeTypeKey));
sourceDetails.SetFieldValue(MachineKey, GetMachine());
sourceDetails.SetFieldValue(RemoveKey, GetBoolFieldValue(RemoveKey));
sourceDetails.SetFieldValue<Source?>(SourceKey, GetFieldValue<Source?>(SourceKey));
sourceDetails.SetFieldValue<string?>(Data.Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
sourceDetails.Write(DupeTypeKey, Read<DupeType>(DupeTypeKey));
sourceDetails.Write(MachineKey, GetMachine());
sourceDetails.Write(RemoveKey, ReadBool(RemoveKey));
sourceDetails.Write<Source?>(SourceKey, Read<Source?>(SourceKey));
sourceDetails.Write<string?>(Data.Models.Metadata.DatItem.TypeKey, ReadString(Data.Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return sourceDetails;
}
@@ -195,7 +195,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public override bool Equals(DatItem? other)
{
// If we don't have a SourceDetails, return false
if (GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey) != other?.GetStringFieldValue(Data.Models.Metadata.DatItem.TypeKey))
if (ReadString(Data.Models.Metadata.DatItem.TypeKey) != other?.ReadString(Data.Models.Metadata.DatItem.TypeKey))
return false;
// Otherwise, treat it as a SourceDetails

View File

@@ -36,25 +36,25 @@ namespace SabreTools.Metadata.DatItems
}
// Process flag values
if (GetStringFieldValue(Data.Models.Metadata.Machine.Im1CRCKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.Im1CRCKey, TextHelper.NormalizeCRC32(GetStringFieldValue(Data.Models.Metadata.Machine.Im1CRCKey)));
if (GetStringFieldValue(Data.Models.Metadata.Machine.Im2CRCKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.Im2CRCKey, TextHelper.NormalizeCRC32(GetStringFieldValue(Data.Models.Metadata.Machine.Im2CRCKey)));
if (GetBoolFieldValue(Data.Models.Metadata.Machine.IsBiosKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.IsBiosKey, GetBoolFieldValue(Data.Models.Metadata.Machine.IsBiosKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.IsDeviceKey, GetBoolFieldValue(Data.Models.Metadata.Machine.IsDeviceKey).FromYesNo());
if (GetBoolFieldValue(Data.Models.Metadata.Machine.IsMechanicalKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.IsMechanicalKey, GetBoolFieldValue(Data.Models.Metadata.Machine.IsMechanicalKey).FromYesNo());
if (GetStringFieldValue(Data.Models.Metadata.Machine.SupportedKey) is not null)
SetFieldValue<string?>(Data.Models.Metadata.Machine.SupportedKey, GetStringFieldValue(Data.Models.Metadata.Machine.SupportedKey).AsSupported().AsStringValue());
if (ReadString(Data.Models.Metadata.Machine.Im1CRCKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.Im1CRCKey, TextHelper.NormalizeCRC32(ReadString(Data.Models.Metadata.Machine.Im1CRCKey)));
if (ReadString(Data.Models.Metadata.Machine.Im2CRCKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.Im2CRCKey, TextHelper.NormalizeCRC32(ReadString(Data.Models.Metadata.Machine.Im2CRCKey)));
if (ReadBool(Data.Models.Metadata.Machine.IsBiosKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.IsBiosKey, ReadBool(Data.Models.Metadata.Machine.IsBiosKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Machine.IsDeviceKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.IsDeviceKey, ReadBool(Data.Models.Metadata.Machine.IsDeviceKey).FromYesNo());
if (ReadBool(Data.Models.Metadata.Machine.IsMechanicalKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.IsMechanicalKey, ReadBool(Data.Models.Metadata.Machine.IsMechanicalKey).FromYesNo());
if (ReadString(Data.Models.Metadata.Machine.SupportedKey) is not null)
Write<string?>(Data.Models.Metadata.Machine.SupportedKey, ReadString(Data.Models.Metadata.Machine.SupportedKey).AsSupported().AsStringValue());
// Handle Trurip object, if it exists
if (machine.ContainsKey(Data.Models.Metadata.Machine.TruripKey))
{
var truripItem = machine.Read<Data.Models.Logiqx.Trurip>(Data.Models.Metadata.Machine.TruripKey);
if (truripItem is not null)
SetFieldValue(Data.Models.Metadata.Machine.TruripKey, new Trurip(truripItem));
Write(Data.Models.Metadata.Machine.TruripKey, new Trurip(truripItem));
}
}

Some files were not shown because too many files have changed in this diff Show More