Convert size keys to size properties

This commit is contained in:
Matt Nadareski
2026-04-02 23:45:17 -04:00
parent 11803aa34c
commit 3c6cfef070
115 changed files with 377 additions and 446 deletions

View File

@@ -542,7 +542,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Endianness = Data.Models.Metadata.Endianness.Big,
Name = "name",
[Data.Models.Metadata.DataArea.RomKey] = new Data.Models.Metadata.Rom[] { [] },
[Data.Models.Metadata.DataArea.SizeKey] = 12345L,
Size = 12345L,
[Data.Models.Metadata.DataArea.WidthKey] = 64,
};
}
@@ -838,7 +838,7 @@ namespace SabreTools.Metadata.DatFiles.Test
[Data.Models.Metadata.Rom.SHA256Key] = HashType.SHA256.ZeroString,
[Data.Models.Metadata.Rom.SHA384Key] = HashType.SHA384.ZeroString,
[Data.Models.Metadata.Rom.SHA512Key] = HashType.SHA512.ZeroString,
[Data.Models.Metadata.Rom.SizeKey] = 12345L,
Size = 12345L,
SoundOnly = true,
[Data.Models.Metadata.Rom.SourceKey] = "source",
[Data.Models.Metadata.Rom.SpamSumKey] = HashType.SpamSum.ZeroString,
@@ -1253,7 +1253,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(dataArea);
Assert.Equal(Data.Models.Metadata.Endianness.Big, dataArea.Endianness);
Assert.Equal("name", dataArea.Name);
Assert.Equal(12345L, dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey));
Assert.Equal(12345L, dataArea.Size);
Assert.Equal(64, dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey));
}
@@ -1558,7 +1558,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(HashType.SHA256.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(HashType.SHA384.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
Assert.Equal(HashType.SHA512.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
Assert.Equal(12345L, rom.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345L, rom.Size);
Assert.True(rom.SoundOnly);
Assert.Equal("source", rom.ReadString(Data.Models.Metadata.Rom.SourceKey));
Assert.Equal(HashType.SpamSum.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));

View File

@@ -22,23 +22,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -67,23 +64,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -112,23 +106,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -160,23 +151,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -212,23 +200,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -257,23 +242,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -325,9 +307,8 @@ namespace SabreTools.Metadata.DatFiles.Test
slotOptionItem.Machine = slotOptionMachine;
slotOptionItem.Source = source;
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 12345 };
datItem.SetName("rom");
datItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
datItem.Machine = itemMachine;
datItem.Source = source;
@@ -380,9 +361,8 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem slotOptionItem = new Sample();
slotOptionItem.SetName("slot_option_item");
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 12345 };
datItem.SetName("rom");
datItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
DatItem deviceRef = new DeviceRef();
@@ -425,23 +405,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -470,23 +447,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -587,23 +561,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -637,23 +608,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -694,23 +662,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;
@@ -743,23 +708,20 @@ namespace SabreTools.Metadata.DatFiles.Test
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
DatItem parentItem = new Rom();
DatItem parentItem = new Rom() { Size = 12345 };
parentItem.SetName("parent_rom");
parentItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
parentItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
parentItem.Machine = parentMachine;
parentItem.Source = source;
DatItem matchChildItem = new Rom();
DatItem matchChildItem = new Rom() { Size = 12345 };
matchChildItem.SetName("match_child_rom");
matchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
matchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
matchChildItem.Machine = childMachine;
matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom();
DatItem noMatchChildItem = new Rom() { Size = 12345 };
noMatchChildItem.SetName("no_match_child_rom");
noMatchChildItem.Write<long>(Data.Models.Metadata.Rom.SizeKey, 12345);
noMatchChildItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "beefdead");
noMatchChildItem.Machine = childMachine;
noMatchChildItem.Source = source;

View File

@@ -760,7 +760,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(dataArea);
Assert.Equal(Data.Models.Metadata.Endianness.Big, dataArea.Endianness);
Assert.Equal("name", dataArea.Name);
Assert.Equal(12345, dataArea.ReadLong(Data.Models.Metadata.DataArea.SizeKey));
Assert.Equal(12345, dataArea.Size);
Assert.Equal(64, dataArea.ReadLong(Data.Models.Metadata.DataArea.WidthKey));
Data.Models.Metadata.Rom[]? roms = dataArea.ReadArray<Data.Models.Metadata.Rom>(Data.Models.Metadata.DataArea.RomKey);
@@ -1103,7 +1103,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(HashType.SHA256.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
Assert.Equal(HashType.SHA384.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
Assert.Equal(HashType.SHA512.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
Assert.Equal(12345, rom.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, rom.Size);
Assert.True(rom.SoundOnly);
Assert.Equal("source", rom.ReadString(Data.Models.Metadata.Rom.SourceKey));
Assert.Equal(HashType.SpamSum.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));

View File

@@ -1368,9 +1368,8 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
DatItem item = new Rom();
DatItem item = new Rom() { Size = 12345 };
item.SetName("name");
item.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16");
item.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
item.Write(Data.Models.Metadata.Rom.CRC64Key, "crc64");
@@ -1472,9 +1471,8 @@ namespace SabreTools.Metadata.DatFiles.Test
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
DatItem item = new Rom();
DatItem item = new Rom() { Size = 12345 };
item.SetName("name");
item.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16");
item.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
item.Write(Data.Models.Metadata.Rom.CRC64Key, "crc64");
@@ -1505,7 +1503,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = DatFile.ProcessNullifiedItem(item);
Sample? sample = actual as Sample;
Assert.NotNull(sample);
Assert.Null(sample.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(sample.ReadString("size"));
Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRC16Key));
Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRC64Key));
@@ -1524,13 +1522,12 @@ namespace SabreTools.Metadata.DatFiles.Test
[Fact]
public void ProcessNullifiedItem_SizeNonNull()
{
DatItem item = new Rom();
item.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
DatItem item = new Rom() { Size = 12345 };
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Equal(12345, rom.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, rom.Size);
Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
@@ -1555,7 +1552,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Null(rom.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(rom.Size);
Assert.Equal(HashType.CRC32.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
@@ -1590,7 +1587,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Equal(0, rom.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(0, rom.Size);
Assert.Equal(HashType.CRC16.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
Assert.Equal(HashType.CRC32.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
Assert.Equal(HashType.CRC64.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
@@ -1958,7 +1955,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("name");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
@@ -1972,7 +1969,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actualItemA as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -1986,14 +1983,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("romA");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
Rom romB = new Rom();
romB.SetName("romB");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 23456);
romB.Size = 23456;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
romB.Machine = (Machine)machine.Clone();
romB.Source = (Source)source.Clone();
@@ -2008,13 +2005,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actual[0] as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2028,14 +2025,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("rom");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
Rom romB = new Rom();
romB.SetName("rom");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romB.Size = 12345;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romB.Machine = (Machine)machine.Clone();
romB.Source = (Source)source.Clone();
@@ -2049,7 +2046,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actualItemA as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2063,14 +2060,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("rom");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
Rom romB = new Rom();
romB.SetName("rom");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 23456);
romB.Size = 23456;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
romB.Machine = (Machine)machine.Clone();
romB.Source = (Source)source.Clone();
@@ -2085,13 +2082,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actual[0] as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2120,7 +2117,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("name");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
@@ -2136,7 +2133,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actualItemA.Value as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2150,14 +2147,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("romA");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
Rom romB = new Rom();
romB.SetName("romB");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 23456);
romB.Size = 23456;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
romB.Machine = (Machine)machine.Clone();
romB.Source = (Source)source.Clone();
@@ -2175,13 +2172,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actual[0].Value as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2199,13 +2196,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("rom");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
long romAIndex = datFile.AddItemDB(romA, machineIndex, sourceIndex, statsOnly: false);
Rom romB = new Rom();
romB.SetName("rom");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romB.Size = 12345;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
long romBIndex = datFile.AddItemDB(romB, machineIndex, sourceIndex, statsOnly: false);
@@ -2220,7 +2217,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actualItemA.Value as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2234,14 +2231,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom();
romA.SetName("rom");
romA.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
romA.Size = 12345;
romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
romA.Machine = (Machine)machine.Clone();
romA.Source = (Source)source.Clone();
Rom romB = new Rom();
romB.SetName("rom");
romB.Write(Data.Models.Metadata.Rom.SizeKey, 23456);
romB.Size = 23456;
romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
romB.Machine = (Machine)machine.Clone();
romB.Source = (Source)source.Clone();
@@ -2259,13 +2256,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRomA = actual[0].Value as Rom;
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.ReadString(Data.Models.Metadata.Rom.CRCKey));
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
}
@@ -2317,9 +2314,8 @@ namespace SabreTools.Metadata.DatFiles.Test
[Fact]
public void ShouldIgnore_NoIgnoreBlanksZeroRom_False()
{
DatItem? datItem = new Rom();
DatItem? datItem = new Rom() { Size = 12345 };
datItem.SetName("name");
datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
DatFile datFile = new Logiqx(null, useGame: false);
@@ -2340,9 +2336,8 @@ namespace SabreTools.Metadata.DatFiles.Test
[Fact]
public void ShouldIgnore_MissingRequired_True()
{
DatItem? datItem = new Rom();
DatItem? datItem = new Rom() { Size = 12345 };
datItem.SetName("name");
datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
DatFile datFile = new Logiqx(null, useGame: false);
bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true);
@@ -2352,9 +2347,8 @@ namespace SabreTools.Metadata.DatFiles.Test
[Fact]
public void ShouldIgnore_AllVerified_False()
{
DatItem? datItem = new Rom();
DatItem? datItem = new Rom() { Size = 12345 };
datItem.SetName("name");
datItem.Write(Data.Models.Metadata.Rom.SizeKey, 12345);
datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
datItem.Write(Data.Models.Metadata.Rom.MD2Key, "crc");
datItem.Write(Data.Models.Metadata.Rom.MD4Key, "crc");

View File

@@ -300,7 +300,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var rom = new Rom();
rom.Status = ItemStatus.Good;
rom.Write<long>(Data.Models.Metadata.Rom.SizeKey, 1);
rom.Size = 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);

View File

@@ -127,7 +127,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -288,7 +288,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.CRCKey,
]));
}
@@ -741,7 +741,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.CRCKey,
Data.Models.Metadata.Rom.SHA1Key,
]));
@@ -806,7 +806,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -1123,7 +1123,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -1276,7 +1276,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.CRCKey,
]));
}
@@ -1336,7 +1336,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.CRCKey,
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
]));
}
@@ -1421,7 +1421,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -1479,7 +1479,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -1537,7 +1537,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
Data.Models.Metadata.Rom.SizeKey,
nameof(Data.Models.Metadata.Rom.Size),
Data.Models.Metadata.Rom.SHA1Key,
]));
}
@@ -1623,7 +1623,7 @@ namespace SabreTools.Metadata.DatFiles.Test
nameof(Data.Models.Metadata.Part.Name),
nameof(Data.Models.Metadata.Part.Interface),
nameof(Data.Models.Metadata.DataArea.Name),
Data.Models.Metadata.DataArea.SizeKey,
nameof(Data.Models.Metadata.DataArea.Size),
]));
}

View File

@@ -135,9 +135,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = 12345 };
rom.SetName("item");
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
@@ -148,7 +147,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRom.Size);
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -159,9 +158,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = 12345 };
rom.SetName("item");
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -171,7 +169,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRom.Size);
Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.Nodump, actualRom.Status);
}
@@ -194,7 +192,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Null(actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actualRom.Size);
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -216,7 +214,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default")).Value;
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(0, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(0, actualRom.Size);
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -298,18 +296,16 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
rom2.RemoveFlag = 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();
@@ -548,11 +544,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
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);
@@ -576,11 +571,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
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);
@@ -628,29 +622,25 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine2 = new Machine();
machine2.Name = "game-2";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
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();
DatItem rom3 = new Rom() { Size = 1024 };
rom3.SetName("rom-3");
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();
DatItem rom4 = new Rom() { Size = 1024 };
rom4.SetName("rom-4");
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();
@@ -679,15 +669,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
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();
@@ -918,15 +906,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
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();
@@ -936,10 +922,9 @@ namespace SabreTools.Metadata.DatFiles.Test
dict.AddItem(rom2, machineIndex, sourceIndex, statsOnly: false);
// Setup the test item
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = hasDuplicate ? 1024 : 2048 };
rom.SetName("rom-1");
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);
@@ -960,15 +945,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
DatItem rom2 = new Rom();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
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();
@@ -978,10 +961,9 @@ namespace SabreTools.Metadata.DatFiles.Test
dict.AddItem(rom2, machineIndex, sourceIndex, statsOnly: false);
// Setup the test item
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = expected ? 1024 : 2048 };
rom.SetName("rom-1");
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);
@@ -999,9 +981,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "machine";
DatItem item = new Rom();
DatItem item = new Rom() { Size = 12345 };
item.SetName("rom");
item.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
var dict = new ItemDictionaryDB();

View File

@@ -135,9 +135,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = 12345 };
rom.SetName("item");
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Source = source;
rom.Machine = machine;
@@ -148,7 +147,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRom.Size);
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -159,9 +158,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = 12345 };
rom.SetName("item");
rom.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
rom.Source = source;
rom.Machine = machine;
@@ -171,7 +169,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(12345, actualRom.Size);
Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.Nodump, actualRom.Status);
}
@@ -194,7 +192,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Null(actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Null(actualRom.Size);
Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -216,7 +214,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem actual = Assert.Single(dict.GetItemsForBucket("default"));
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(0, actual.ReadLong(Data.Models.Metadata.Rom.SizeKey));
Assert.Equal(0, actualRom.Size);
Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -266,19 +264,17 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.RemoveFlag = 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
@@ -408,11 +404,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
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();
@@ -434,11 +429,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem datItem = new Rom();
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
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();
@@ -468,32 +462,28 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine2 = new Machine();
machine2.Name = "game-2";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
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();
DatItem rom3 = new Rom() { Size = 1024 };
rom3.SetName("rom-3");
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();
DatItem rom4 = new Rom() { Size = 1024 };
rom4.SetName("rom-4");
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
@@ -518,16 +508,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -711,16 +699,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -729,10 +715,9 @@ namespace SabreTools.Metadata.DatFiles.Test
dict.AddItem(rom2, statsOnly: false);
// Setup the test item
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = hasDuplicate ? 1024 : 2048 };
rom.SetName("rom-1");
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);
@@ -752,16 +737,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "game-1";
DatItem rom1 = new Rom();
DatItem rom1 = new Rom() { Size = 1024 };
rom1.SetName("rom-1");
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();
DatItem rom2 = new Rom() { Size = 1024 };
rom2.SetName("rom-2");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.Write<string?>(Data.Models.Metadata.Rom.SizeKey, "1024");
rom1.CopyMachineInformation(machine);
// Setup the dictionary
@@ -770,10 +753,9 @@ namespace SabreTools.Metadata.DatFiles.Test
dict.AddItem("game-1", rom2);
// Setup the test item
DatItem rom = new Rom();
DatItem rom = new Rom() { Size = expected ? 1024 : 2048 };
rom.SetName("rom-1");
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);
@@ -792,9 +774,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine();
machine.Name = "machine";
DatItem item = new Rom();
DatItem item = new Rom() { Size = 12345 };
item.SetName("rom");
item.Write<long?>(Data.Models.Metadata.Rom.SizeKey, 12345);
item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
item.Source = source;
item.Machine = machine;