Reduce use of GetName and SetName, prefer direct

This commit is contained in:
Matt Nadareski
2026-04-03 22:57:58 -04:00
parent cdc55e721e
commit 2fdecebe66
20 changed files with 557 additions and 906 deletions

View File

@@ -16,8 +16,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem disk = new Disk();
disk.SetName("item");
DatItem disk = new Disk { Name = "item" };
disk.Write<string?>(Data.Models.Metadata.Disk.SHA1Key, "deadbeef");
disk.Source = source;
disk.Machine = machine;
@@ -37,10 +36,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem disk = new Disk();
disk.SetName("item");
disk.Source = source;
disk.Machine = machine;
DatItem disk = new Disk
{
Name = "item",
Source = source,
Machine = machine
};
var dict = new ItemDictionary();
_ = dict.AddItem(disk, statsOnly: false);
@@ -57,11 +58,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
var file = new File();
var file = new File
{
SHA1 = "deadbeef",
Source = source,
Machine = machine
};
file.SetName("item");
file.SHA1 = "deadbeef";
file.Source = source;
file.Machine = machine;
var dict = new ItemDictionary();
_ = dict.AddItem(file, statsOnly: false);
@@ -77,10 +80,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem file = new File();
DatItem file = new File
{
Source = source,
Machine = machine
};
file.SetName("item");
file.Source = source;
file.Machine = machine;
var dict = new ItemDictionary();
_ = dict.AddItem(file, statsOnly: false);
@@ -96,10 +101,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem media = new Media() { SHA1 = "deadbeef" };
media.SetName("item");
media.Source = source;
media.Machine = machine;
DatItem media = new Media
{
Name = "item",
SHA1 = "deadbeef",
Source = source,
Machine = machine
};
var dict = new ItemDictionary();
_ = dict.AddItem(media, statsOnly: false);
@@ -115,10 +123,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem media = new Media();
media.SetName("item");
media.Source = source;
media.Machine = machine;
DatItem media = new Media
{
Name = "item",
Source = source,
Machine = machine
};
var dict = new ItemDictionary();
_ = dict.AddItem(media, statsOnly: false);
@@ -185,10 +195,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
DatItem rom = new Rom
{
Name = "item"
};
DatItem rom = new Rom { Name = "item" };
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
rom.Source = source;
rom.Machine = machine;
@@ -274,25 +281,22 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ClearMarkedTest()
{
// Setup the items
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
};
{
Name = "rom-1",
Size = 1024,
};
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
};
{
Name = "rom-2",
Size = 1024,
};
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.RemoveFlag = true;
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
@@ -318,10 +322,7 @@ Size = 1024,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
@@ -342,10 +343,7 @@ Size = 1024,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
@@ -366,10 +364,7 @@ Size = 1024,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
@@ -391,10 +386,7 @@ Size = 1024,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
@@ -416,10 +408,7 @@ Size = 1024,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
@@ -442,13 +431,13 @@ Size = 1024,
[Fact]
public void RemoveBucketTest()
{
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
DatItem datItem = new Rom
{
Size = 1024,
Name = "rom-1"
};
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.CopyMachineInformation(machine);
@@ -469,13 +458,13 @@ Size = 1024,
[Fact]
public void RemoveItemTest()
{
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem datItem = new Rom() { Size = 1024 };
datItem.SetName("rom-1");
DatItem datItem = new Rom
{
Size = 1024,
Name = "rom-1"
};
datItem.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
datItem.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.CopyMachineInformation(machine);
@@ -501,48 +490,42 @@ Size = 1024,
public void BucketByTest(ItemKey itemKey, int expected)
{
// Setup the items
Machine machine1 = new Machine
{
Name = "game-1"
};
Machine machine1 = new Machine { Name = "game-1" };
Machine machine2 = new Machine
{
Name = "game-2"
};
Machine machine2 = new Machine { Name = "game-2" };
DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
};
{
Name = "rom-1",
Size = 1024,
};
rom1.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine1);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
};
{
Name = "rom-2",
Size = 1024,
};
rom2.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom1.CopyMachineInformation(machine1);
DatItem rom3 = new Rom
{
Name = "rom-3",
Size = 1024,
};
{
Name = "rom-3",
Size = 1024,
};
rom3.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom3.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom1.CopyMachineInformation(machine2);
DatItem rom4 = new Rom
{
Name = "rom-4",
Size = 1024,
};
{
Name = "rom-4",
Size = 1024,
};
rom4.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
rom4.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom1.CopyMachineInformation(machine2);
@@ -566,24 +549,21 @@ Size = 1024,
public void DeduplicateTest()
{
// Setup the items
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
};
{
Name = "rom-1",
Size = 1024,
};
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
};
{
Name = "rom-2",
Size = 1024,
};
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.CopyMachineInformation(machine);
@@ -625,28 +605,16 @@ Size = 1024,
{
var dict = new ItemDictionary();
Machine? machineA = new Machine
{
Name = "name-same"
};
Machine? machineA = new Machine { Name = "name-same" };
Machine? machineB = new Machine
{
Name = "name-same"
};
Machine? machineB = new Machine { Name = "name-same" };
var romA = new Rom
{
Name = "same-name"
};
var romA = new Rom { Name = "same-name" };
romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
romA.Source = new Source(0);
romA.CopyMachineInformation(machineA);
var romB = new Rom
{
Name = "same-name"
};
var romB = new Rom { Name = "same-name" };
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Source = new Source(1);
romB.CopyMachineInformation(machineB);
@@ -660,28 +628,16 @@ Size = 1024,
{
var dict = new ItemDictionary();
Machine? machineA = new Machine
{
Name = "name-same"
};
Machine? machineA = new Machine { Name = "name-same" };
Machine? machineB = new Machine
{
Name = "name-same"
};
Machine? machineB = new Machine { Name = "name-same" };
var romA = new Rom
{
Name = "same-name"
};
var romA = new Rom { Name = "same-name" };
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Source = new Source(0);
romA.CopyMachineInformation(machineA);
var romB = new Rom
{
Name = "same-name"
};
var romB = new Rom { Name = "same-name" };
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Source = new Source(1);
romB.CopyMachineInformation(machineB);
@@ -695,28 +651,16 @@ Size = 1024,
{
var dict = new ItemDictionary();
Machine? machineA = new Machine
{
Name = "name-same"
};
Machine? machineA = new Machine { Name = "name-same" };
Machine? machineB = new Machine
{
Name = "not-name-same"
};
Machine? machineB = new Machine { Name = "not-name-same" };
var romA = new Rom
{
Name = "same-name"
};
var romA = new Rom { Name = "same-name" };
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Source = new Source(0);
romA.CopyMachineInformation(machineA);
var romB = new Rom
{
Name = "same-name"
};
var romB = new Rom { Name = "same-name" };
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Source = new Source(1);
romB.CopyMachineInformation(machineB);
@@ -730,28 +674,16 @@ Size = 1024,
{
var dict = new ItemDictionary();
Machine? machineA = new Machine
{
Name = "name-same"
};
Machine? machineA = new Machine { Name = "name-same" };
Machine? machineB = new Machine
{
Name = "name-same"
};
Machine? machineB = new Machine { Name = "name-same" };
var romA = new Rom
{
Name = "same-name"
};
var romA = new Rom { Name = "same-name" };
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Source = new Source(0);
romA.CopyMachineInformation(machineA);
var romB = new Rom
{
Name = "same-name"
};
var romB = new Rom { Name = "same-name" };
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Source = new Source(0);
romB.CopyMachineInformation(machineB);
@@ -765,28 +697,16 @@ Size = 1024,
{
var dict = new ItemDictionary();
Machine? machineA = new Machine
{
Name = "name-same"
};
Machine? machineA = new Machine { Name = "name-same" };
Machine? machineB = new Machine
{
Name = "not-name-same"
};
Machine? machineB = new Machine { Name = "not-name-same" };
var romA = new Rom
{
Name = "same-name"
};
var romA = new Rom { Name = "same-name" };
romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romA.Source = new Source(0);
romA.CopyMachineInformation(machineA);
var romB = new Rom
{
Name = "same-name"
};
var romB = new Rom { Name = "same-name" };
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Source = new Source(0);
romB.CopyMachineInformation(machineB);
@@ -805,24 +725,21 @@ Size = 1024,
public void GetDuplicatesTest(bool hasDuplicate, int expected)
{
// Setup the items
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
};
{
Name = "rom-1",
Size = 1024,
};
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
};
{
Name = "rom-2",
Size = 1024,
};
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.CopyMachineInformation(machine);
@@ -833,10 +750,10 @@ Size = 1024,
// Setup the test item
DatItem rom = new Rom
{
Name = "rom-1",
Size = hasDuplicate ? 1024 : 2048,
};
{
Name = "rom-1",
Size = hasDuplicate ? 1024 : 2048,
};
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.CopyMachineInformation(machine);
@@ -854,24 +771,21 @@ Size = hasDuplicate ? 1024 : 2048,
public void HasDuplicatesTest(bool expected)
{
// Setup the items
Machine machine = new Machine
{
Name = "game-1"
};
Machine machine = new Machine { Name = "game-1" };
DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
};
{
Name = "rom-1",
Size = 1024,
};
rom1.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
};
{
Name = "rom-2",
Size = 1024,
};
rom2.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom1.CopyMachineInformation(machine);
@@ -882,10 +796,10 @@ Size = 1024,
// Setup the test item
DatItem rom = new Rom
{
Name = "rom-1",
Size = expected ? 1024 : 2048,
};
{
Name = "rom-1",
Size = expected ? 1024 : 2048,
};
rom.Write<string?>(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
@@ -902,16 +816,13 @@ Size = expected ? 1024 : 2048,
{
Source source = new Source(0, source: null);
Machine machine = new Machine
{
Name = "machine"
};
Machine machine = new Machine { Name = "machine" };
DatItem item = new Rom
{
Name = "rom",
Size = 12345,
};
{
Name = "rom",
Size = 12345,
};
item.Write<string?>(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
item.Source = source;
item.Machine = machine;