SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Reduce use of SetName

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-02 13:35:11 -04:00
parent c74942362c
commit 7df083c0b2
17 changed files with 180 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
View File

@@ -20,7 +20,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem datItem = new Rom();
datItem.SetName("rom.bin");
@@ -48,7 +48,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem datItem = new Rom();
datItem.SetName("rom.bin");
@@ -79,7 +79,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Description = "description";
DatItem datItem = new Rom();
@@ -103,7 +103,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void MachineDescriptionToName_ItemsDB()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Description = "description";
DatFile datFile = new Logiqx(datFile: null, useGame: false);
@@ -126,7 +126,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem rom = new Rom();
rom.SetName("rom.bin");
@@ -165,7 +165,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem rom = new Rom();
rom.SetName("rom.bin");
@@ -204,10 +204,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SetOneGamePerRegion_Items()
{
Machine nowhereMachine = new Machine();
nowhereMachine.SetName("machine (Nowhere)");
nowhereMachine.Name = "machine (Nowhere)";
Machine worldMachine = new Machine();
worldMachine.SetName("machine (World)");
worldMachine.Name = "machine (World)";
worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
DatItem nowhereRom = new Rom();
@@ -238,10 +238,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void SetOneGamePerRegion_ItemsDB()
{
Machine nowhereMachine = new Machine();
nowhereMachine.SetName("machine (Nowhere)");
nowhereMachine.Name = "machine (Nowhere)";
Machine worldMachine = new Machine();
worldMachine.SetName("machine (World)");
worldMachine.Name = "machine (World)";
worldMachine.Write(Data.Models.Metadata.Machine.CloneOfKey, "machine (Nowhere)");
DatFile datFile = new Logiqx(datFile: null, useGame: false);
@@ -266,7 +266,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("10.10.10-machine-name");
machine.Name = "10.10.10-machine-name";
DatItem datItem = new Rom();
datItem.Write(DatItem.MachineKey, machine);
@@ -288,7 +288,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void StripSceneDatesFromItems_ItemsDB()
{
Machine machine = new Machine();
machine.SetName("10.10.10-machine-name");
machine.Name = "10.10.10-machine-name";
DatFile datFile = new Logiqx(datFile: null, useGame: false);
_ = datFile.AddMachineDB(machine);

72
SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
View File

@@ -15,10 +15,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -60,10 +60,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -105,10 +105,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -153,10 +153,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -205,10 +205,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -250,10 +250,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
childMachine.IsBios = true;
@@ -306,14 +306,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.Name = "device";
deviceMachine.IsDevice = true;
Machine slotOptionMachine = new Machine();
slotOptionMachine.SetName("slotoption");
slotOptionMachine.Name = "slotoption";
Machine itemMachine = new Machine();
itemMachine.SetName("machine");
itemMachine.Name = "machine";
DatItem deviceItem = new Sample();
deviceItem.SetName("device_item");
@@ -365,14 +365,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.Name = "device";
deviceMachine.IsDevice = true;
Machine slotOptionMachine = new Machine();
slotOptionMachine.SetName("slotoption");
slotOptionMachine.Name = "slotoption";
Machine itemMachine = new Machine();
itemMachine.SetName("machine");
itemMachine.Name = "machine";
DatItem deviceItem = new Sample();
deviceItem.SetName("device_item");
@@ -418,10 +418,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
@@ -463,10 +463,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
@@ -515,11 +515,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine biosMachine = new Machine();
biosMachine.SetName("bios");
biosMachine.Name = "bios";
biosMachine.IsBios = true;
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.Name = "device";
deviceMachine.IsDevice = true;
DatItem biosItem = new Rom();
@@ -547,11 +547,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine biosMachine = new Machine();
biosMachine.SetName("bios");
biosMachine.Name = "bios";
biosMachine.IsBios = true;
Machine deviceMachine = new Machine();
deviceMachine.SetName("device");
deviceMachine.Name = "device";
deviceMachine.IsDevice = true;
DatItem biosItem = new Rom();
@@ -580,11 +580,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
parentMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
@@ -630,11 +630,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
parentMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "romof");
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, "parent");
DatItem parentItem = new Rom();
@@ -687,10 +687,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
@@ -736,10 +736,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine parentMachine = new Machine();
parentMachine.SetName("parent");
parentMachine.Name = "parent";
Machine childMachine = new Machine();
childMachine.SetName("child");
childMachine.Name = "child";
childMachine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, "parent");
childMachine.IsBios = true;
@@ -792,7 +792,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
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");
@@ -821,7 +821,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
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");

34
SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
View File

@@ -31,7 +31,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("key");
machine.Name = "key";
DatItem rom = new Rom();
rom.SetName("rom");
@@ -73,7 +73,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
datItem.Write<Source?>(DatItem.SourceKey, source);
@@ -92,7 +92,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
@@ -1329,7 +1329,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected)
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.SetName("name");
@@ -1363,7 +1363,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected = string.Empty;
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer");
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
@@ -1396,7 +1396,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected = "machine_machine_name_manufacturer_publisher_category______md5___sha1_____";
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer");
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
@@ -1417,7 +1417,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected = "machine_machine_name.bin_manufacturer_publisher_category__00000000____d41d8cd98f00b204e9800998ecf8427e___da39a3ee5e6b4b0d3255bfef95601890afd80709_e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855___12345_";
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer");
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
@@ -1444,7 +1444,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected = "machine_machine_name_manufacturer_publisher_category______md5___sha1_sha256____spamsum";
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer");
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
@@ -1467,7 +1467,7 @@ namespace SabreTools.Metadata.DatFiles.Test
string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum";
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
machine.Write(Data.Models.Metadata.Machine.ManufacturerKey, "manufacturer");
machine.Write(Data.Models.Metadata.Machine.PublisherKey, "publisher");
machine.Write(Data.Models.Metadata.Machine.CategoryKey, "category");
@@ -1952,7 +1952,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNames_SingleItem_Single()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -1980,7 +1980,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNames_NonDuplicate_AllUntouched()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -2022,7 +2022,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNames_AllDuplicate_Single()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -2057,7 +2057,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNames_NameMatch_SingleRenamed()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -2114,7 +2114,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNamesDB_SingleItem_Single()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -2144,7 +2144,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNamesDB_NonDuplicate_AllUntouched()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);
@@ -2191,7 +2191,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatFile datFile = new Logiqx(null, useGame: false);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
long machineIndex = datFile.AddMachineDB(machine);
Source source = new Source(0);
@@ -2228,7 +2228,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void ResolveNamesDB_NameMatch_SingleRenamed()
{
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
Source source = new Source(0);

72
SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
View File

@@ -296,7 +296,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -335,7 +335,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
@@ -355,7 +355,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
@@ -375,7 +375,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<bool?>(DatItem.RemoveKey, true);
@@ -396,7 +396,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<bool?>(DatItem.RemoveKey, true);
@@ -417,7 +417,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
@@ -515,10 +515,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine origMachine = new Machine();
origMachine.SetName("original");
origMachine.Name = "original";
Machine newMachine = new Machine();
newMachine.SetName("new");
newMachine.Name = "new";
DatItem datItem = new Rom();
@@ -546,7 +546,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
datItem.SetName("rom-1");
@@ -574,7 +574,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
datItem.SetName("rom-1");
@@ -623,10 +623,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine1 = new Machine();
machine1.SetName("game-1");
machine1.Name = "game-1";
Machine machine2 = new Machine();
machine2.SetName("game-2");
machine2.Name = "game-2";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -677,7 +677,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -744,21 +744,21 @@ namespace SabreTools.Metadata.DatFiles.Test
long sourceBIndex = dict.AddSource(sourceB);
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
long machineAIndex = dict.AddMachine(machineA);
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
long machineBIndex = dict.AddMachine(machineB);
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
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);
@@ -778,21 +778,21 @@ namespace SabreTools.Metadata.DatFiles.Test
long sourceBIndex = dict.AddSource(sourceB);
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
long machineAIndex = dict.AddMachine(machineA);
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
long machineBIndex = dict.AddMachine(machineB);
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
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);
@@ -812,21 +812,21 @@ namespace SabreTools.Metadata.DatFiles.Test
long sourceBIndex = dict.AddSource(sourceB);
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
long machineAIndex = dict.AddMachine(machineA);
Machine? machineB = new Machine();
machineB.SetName("not-name-same");
machineB.Name = "not-name-same";
long machineBIndex = dict.AddMachine(machineB);
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
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);
@@ -846,21 +846,21 @@ namespace SabreTools.Metadata.DatFiles.Test
long sourceBIndex = dict.AddSource(sourceB);
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
long machineAIndex = dict.AddMachine(machineA);
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
long machineBIndex = dict.AddMachine(machineB);
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
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);
@@ -880,21 +880,21 @@ namespace SabreTools.Metadata.DatFiles.Test
long sourceBIndex = dict.AddSource(sourceB);
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
long machineAIndex = dict.AddMachine(machineA);
Machine? machineB = new Machine();
machineB.SetName("not-name-same");
machineB.Name = "not-name-same";
long machineBIndex = dict.AddMachine(machineB);
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
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);
@@ -916,7 +916,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -958,7 +958,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -997,7 +997,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.SetName("rom");

68
SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
View File

@@ -264,7 +264,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
// Setup the items
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -302,7 +302,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<Source?>(DatItem.SourceKey, source);
@@ -322,7 +322,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<Source?>(DatItem.SourceKey, source);
@@ -342,7 +342,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<bool?>(DatItem.RemoveKey, true);
@@ -363,7 +363,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<bool?>(DatItem.RemoveKey, true);
@@ -384,7 +384,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.Write<Source?>(DatItem.SourceKey, source);
@@ -406,7 +406,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void RemoveBucketTest()
{
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
datItem.SetName("rom-1");
@@ -432,7 +432,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void RemoveItemTest()
{
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem datItem = new Rom();
datItem.SetName("rom-1");
@@ -463,10 +463,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
// Setup the items
Machine machine1 = new Machine();
machine1.SetName("game-1");
machine1.Name = "game-1";
Machine machine2 = new Machine();
machine2.SetName("game-2");
machine2.Name = "game-2";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -516,7 +516,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
// Setup the items
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -569,19 +569,19 @@ namespace SabreTools.Metadata.DatFiles.Test
var dict = new ItemDictionary();
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
@@ -596,19 +596,19 @@ namespace SabreTools.Metadata.DatFiles.Test
var dict = new ItemDictionary();
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
@@ -623,19 +623,19 @@ namespace SabreTools.Metadata.DatFiles.Test
var dict = new ItemDictionary();
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
Machine? machineB = new Machine();
machineB.SetName("not-name-same");
machineB.Name = "not-name-same";
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(1));
romB.CopyMachineInformation(machineB);
@@ -650,19 +650,19 @@ namespace SabreTools.Metadata.DatFiles.Test
var dict = new ItemDictionary();
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
Machine? machineB = new Machine();
machineB.SetName("name-same");
machineB.Name = "name-same";
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(0));
romB.CopyMachineInformation(machineB);
@@ -677,19 +677,19 @@ namespace SabreTools.Metadata.DatFiles.Test
var dict = new ItemDictionary();
Machine? machineA = new Machine();
machineA.SetName("name-same");
machineA.Name = "name-same";
Machine? machineB = new Machine();
machineB.SetName("not-name-same");
machineB.Name = "not-name-same";
var romA = new Rom();
romA.SetName("same-name");
romA.Name = "same-name";
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.Name = "same-name";
romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
romB.Write<Source?>(DatItem.SourceKey, new Source(0));
romB.CopyMachineInformation(machineB);
@@ -709,7 +709,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
// Setup the items
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -750,7 +750,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
// Setup the items
Machine machine = new Machine();
machine.SetName("game-1");
machine.Name = "game-1";
DatItem rom1 = new Rom();
rom1.SetName("rom-1");
@@ -790,7 +790,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
machine.SetName("machine");
machine.Name = "machine";
DatItem item = new Rom();
item.SetName("rom");

12
SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
View File

@@ -540,7 +540,7 @@ namespace SabreTools.Metadata.DatFiles
if (itemName.StartsWith("Default"))
itemName = itemName.Substring("Default".Length + 1);
machine.SetName(itemName);
machine.Name = itemName;
datItem.SetName(Path.GetFileName(datItem.GetName()));
}
@@ -618,7 +618,7 @@ namespace SabreTools.Metadata.DatFiles
if (itemName.StartsWith("Default"))
itemName = itemName.Substring("Default".Length + 1);
machine.Value.SetName(itemName);
machine.Value.Name = itemName;
datItem.Value.SetName(Path.GetFileName(datItem.Value.GetName()));
}
@@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles
string? machineDesc = machine.Description;
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
item.GetMachine()!.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
item.GetMachine()!.Name = Regex.Replace(machineName, SceneNamePattern, "$2");
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
item.GetMachine()!.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2");
@@ -693,7 +693,7 @@ namespace SabreTools.Metadata.DatFiles
string? machineDesc = machine.Value.Description;
if (machineName is not null && Regex.IsMatch(machineName, SceneNamePattern))
machine.Value.SetName(Regex.Replace(machineName, SceneNamePattern, "$2"));
machine.Value.Name = Regex.Replace(machineName, SceneNamePattern, "$2");
if (machineDesc is not null && Regex.IsMatch(machineDesc, SceneNamePattern))
machine.Value.Description = Regex.Replace(machineDesc, SceneNamePattern, "$2");
@@ -739,7 +739,7 @@ namespace SabreTools.Metadata.DatFiles
// Update machine name
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.SetName(mappedMachineName);
machine.Name = mappedMachineName;
// Update cloneof
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))
@@ -780,7 +780,7 @@ namespace SabreTools.Metadata.DatFiles
// Update machine name
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.Value.SetName(mappedMachineName);
machine.Value.Name = mappedMachineName;
// Update cloneof
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))

14
SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
View File

@@ -283,7 +283,7 @@ namespace SabreTools.Metadata.DatFiles
if (parentItems.Count == 0)
{
copyFrom = new Rom();
copyFrom.GetMachine()!.SetName(cloneOf);
copyFrom.GetMachine()!.Name = cloneOf;
copyFrom.GetMachine()!.Description = cloneOf;
}
else
@@ -350,7 +350,7 @@ namespace SabreTools.Metadata.DatFiles
.Contains(mergeTag))
{
if (subfolder)
rom.SetName($"{rom.GetMachine()!.Name}\\{rom.Name}");
rom.Name = $"{rom.GetMachine()!.Name}\\{rom.Name}";
rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false);
@@ -360,7 +360,7 @@ namespace SabreTools.Metadata.DatFiles
else if (!GetItemsForBucket(cloneOf).Exists(i => i.Equals(item)) || skipDedup)
{
if (subfolder)
rom.SetName($"{item.GetMachine()!.Name}\\{rom.Name}");
rom.Name = $"{item.GetMachine()!.Name}\\{rom.Name}";
rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false);
@@ -486,7 +486,7 @@ namespace SabreTools.Metadata.DatFiles
.Contains(mergeTag))
{
if (subfolder)
rom.SetName($"{machineName}\\{rom.Name}");
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
@@ -496,7 +496,7 @@ namespace SabreTools.Metadata.DatFiles
else if (!GetItemsForBucketDB(cloneOf).ContainsValue(item.Value) || skipDedup)
{
if (subfolder)
rom.SetName($"{machineName}\\{rom.Name}");
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
@@ -723,7 +723,7 @@ namespace SabreTools.Metadata.DatFiles
deviceReferences.Add(deviceReference);
var deviceRef = new DeviceRef();
deviceRef.SetName(deviceReference);
deviceRef.Name = deviceReference;
deviceRef.CopyMachineInformation(copyFrom);
Items.AddItem(deviceRef, statsOnly: false);
}
@@ -888,7 +888,7 @@ namespace SabreTools.Metadata.DatFiles
if (!deviceReferences.Contains(deviceReference))
{
var deviceRef = new DeviceRef();
deviceRef.SetName(deviceReference);
deviceRef.Name = deviceReference;
ItemsDB.AddItem(deviceRef, machine.Key, source.Key);
}
}

4
SabreTools.Metadata.DatFiles/DatFile.cs
View File

@@ -568,7 +568,7 @@ namespace SabreTools.Metadata.DatFiles
if (useRomName)
item.SetName(name);
else
machine?.SetName(name);
machine?.Name = name;
}
/// <summary>
@@ -689,7 +689,7 @@ namespace SabreTools.Metadata.DatFiles
return rom;
// If the Rom has "null" characteristics, ensure all fields
rom.SetName(rom.Name == "null" ? "-" : rom.Name);
rom.Name = rom.Name == "null" ? "-" : rom.Name;
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);

2
SabreTools.Metadata.DatFiles/Formats/SabreJSON.cs
View File

@@ -602,7 +602,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
{
// No game should start with a path separator
if (!string.IsNullOrEmpty(datItem.GetMachine()!.Name))
datItem.GetMachine()!.SetName(datItem.GetMachine()!.Name!.TrimStart(Path.DirectorySeparatorChar));
datItem.GetMachine()!.Name = datItem.GetMachine()!.Name!.TrimStart(Path.DirectorySeparatorChar);
// Build the state
jtw.WriteStartObject();

2
SabreTools.Metadata.DatFiles/Formats/SabreXML.cs
View File

@@ -429,7 +429,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
private static void WriteStartGame(XmlTextWriter xtw, DatItem datItem)
{
// No game should start with a path separator
datItem.GetMachine()!.SetName(datItem.GetMachine()!.Name?.TrimStart(Path.DirectorySeparatorChar) ?? string.Empty);
datItem.GetMachine()!.Name = datItem.GetMachine()!.Name?.TrimStart(Path.DirectorySeparatorChar) ?? string.Empty;
// Write the machine
xtw.WriteStartElement("directory");

20
SabreTools.Metadata.DatItems.Test/DatItemTests.cs
View File

@@ -54,7 +54,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_NewItem_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
var romA = new Rom();
@@ -71,7 +71,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_EmptyItem_NoChange()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
@@ -89,7 +89,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_NullMachine_NoChange()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
Machine? machineB = null;
@@ -109,7 +109,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_EmptyMachine_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
Machine? machineB = new Machine();
@@ -129,10 +129,10 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_FilledMachine_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
Machine? machineB = new Machine();
machineB.SetName("machineB");
machineB.Name = "machineB";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
@@ -150,10 +150,10 @@ namespace SabreTools.Metadata.DatItems.Test
public void CopyMachineInformation_MismatchedType_Overwrite()
{
Machine? machineA = new Machine();
machineA.SetName("machineA");
machineA.Name = "machineA";
Machine? machineB = new Machine();
machineB.SetName("machineB");
machineB.Name = "machineB";
var romA = new Rom();
romA.Write(DatItem.MachineKey, machineA);
@@ -356,7 +356,7 @@ namespace SabreTools.Metadata.DatItems.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetName("Machine");
machine.Name = "Machine";
DatItem datItem = new Blank();
@@ -430,7 +430,7 @@ namespace SabreTools.Metadata.DatItems.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetName("Machine");
machine.Name = "Machine";
DatItem datItem = new Rom();
datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");

10
SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
View File

@@ -11,18 +11,18 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void ConvertToRomTest()
{
DiskArea diskArea = new DiskArea();
diskArea.SetName("name");
diskArea.Name = "name";
Machine machine = new Machine();
machine.SetName("name");
machine.Name = "name";
Part part = new Part();
part.SetName("name");
part.Name = "name";
Source source = new Source(0, "XXXXXX");
Disk disk = new Disk();
disk.SetName("name");
disk.Name = "name";
disk.Write(Disk.DiskAreaKey, diskArea);
disk.Write(Data.Models.Metadata.Disk.MergeKey, "XXXXXX");
disk.Write(Data.Models.Metadata.Disk.RegionKey, "XXXXXX");
@@ -254,7 +254,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetName("Machine");
machine.Name = "Machine";
DatItem datItem = new Disk();
datItem.Write(Data.Models.Metadata.Disk.MD5Key, "DEADBEEF");

4
SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
View File

@@ -11,7 +11,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void ConvertToRomTest()
{
Machine machine = new Machine();
machine.SetName("name");
machine.Name = "name";
Source source = new Source(0, "XXXXXX");
@@ -341,7 +341,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetName("Machine");
machine.Name = "Machine";
DatItem datItem = new File
{

6
SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
View File

@@ -11,12 +11,12 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
public void ConvertToRomTest()
{
Machine machine = new Machine();
machine.SetName("name");
machine.Name = "name";
Source source = new Source(0, "XXXXXX");
Media media = new Media();
media.SetName("name");
media.Name = "name";
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);
@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Source source = new Source(0);
Machine machine = new Machine();
machine.SetName("Machine");
machine.Name = "Machine";
DatItem datItem = new Media();
datItem.Write(Data.Models.Metadata.Media.MD5Key, "DEADBEEF");

12
SabreTools.Metadata.DatItems.Test/MachineTests.cs
View File

@@ -10,7 +10,7 @@ namespace SabreTools.Metadata.DatItems.Test
public void CloneTest()
{
Machine item = new Machine();
item.SetName("name");
item.Name = "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.SetName("name");
item.Name = "name";
Data.Models.Metadata.Machine actual = item.GetInternalClone();
Assert.Equal("name", actual.Name);
@@ -60,10 +60,10 @@ namespace SabreTools.Metadata.DatItems.Test
public void Equals_MismatchedInternal_False()
{
Machine self = new Machine();
self.SetName("self");
self.Name = "self";
Machine? other = new Machine();
other.SetName("other");
other.Name = "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.SetName("name");
self.Name = "name";
Machine? other = new Machine();
other.SetName("name");
other.Name = "name";
bool actual = self.Equals(other);
Assert.True(actual);

4
SabreTools.Metadata.DatItems/Formats/Disk.cs
View File

@@ -124,9 +124,7 @@ namespace SabreTools.Metadata.DatItems.Formats
if (diskArea is not null)
{
var dataArea = new DataArea();
string? diskAreaName = diskArea.Name;
dataArea.SetName(diskAreaName);
dataArea.Name = diskArea.Name;
rom.Write<DataArea?>(Rom.DataAreaKey, dataArea);
}

2
SabreTools.Metadata.DatItems/Formats/Rom.cs
View File

@@ -168,7 +168,7 @@ namespace SabreTools.Metadata.DatItems.Formats
string name = $"{machine.Name}_{index++}{(!string.IsNullOrEmpty(rom!.ReadString(Data.Models.Metadata.Rom.RemarkKey)) ? $" {rom.ReadString(Data.Models.Metadata.Rom.RemarkKey)}" : string.Empty)}";
SetName(name);
Name = name;
Write<string?>(Data.Models.Metadata.Rom.OffsetKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
OpenMSXMediaType = subType;
Write<string?>(Data.Models.Metadata.Rom.OpenMSXType, rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType) ?? rom.ItemType.ToString());