SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Make callers responsible for machine and source setting

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-16 13:52:58 -04:00
parent 8f746824d6
commit af568d6a57
7 changed files with 286 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,9 +59,13 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long sourceIndex = datFile.AddSourceDB(source);
datItem.SourceIndex = sourceIndex;
long machineIndex = datFile.AddMachineDB(machine);
_ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false);
datItem.MachineIndex = machineIndex;
_ = datFile.AddItemDB(datItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.ExecuteFilters(filterRunner);
@@ -182,10 +186,17 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem disk = new Disk { Name = "disk" };
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long sourceIndex = datFile.AddSourceDB(source);
rom.SourceIndex = sourceIndex;
disk.SourceIndex = sourceIndex;
long machineIndex = datFile.AddMachineDB(machine);
_ = datFile.AddItemDB(rom, machineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(disk, machineIndex, sourceIndex, statsOnly: false);
rom.MachineIndex = machineIndex;
disk.MachineIndex = machineIndex;
_ = datFile.AddItemDB(rom, statsOnly: false);
_ = datFile.AddItemDB(disk, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.SetOneRomPerGame();

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

@@ -155,12 +155,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.AddItemsFromChildren(subfolder: true, skipDedup: false);
@@ -210,12 +220,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.AddItemsFromChildren(subfolder: true, skipDedup: true);
@@ -321,12 +341,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.AddItemsFromCloneOfParent();
@@ -448,15 +478,30 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long deviceMachineIndex = datFile.AddMachineDB(deviceMachine);
long slotOptionMachineIndex = datFile.AddMachineDB(slotOptionMachine);
long itemMachineIndex = datFile.AddMachineDB(itemMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(deviceItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(slotOptionItem, slotOptionMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(datItem, itemMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(deviceRef, itemMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(slotOption, itemMachineIndex, sourceIndex, statsOnly: false);
deviceItem.SourceIndex = sourceIndex;
slotOptionItem.SourceIndex = sourceIndex;
datItem.SourceIndex = sourceIndex;
deviceRef.SourceIndex = sourceIndex;
slotOption.SourceIndex = sourceIndex;
long deviceMachineIndex = datFile.AddMachineDB(deviceMachine);
deviceItem.MachineIndex = deviceMachineIndex;
long slotOptionMachineIndex = datFile.AddMachineDB(slotOptionMachine);
slotOptionItem.MachineIndex = slotOptionMachineIndex;
long itemMachineIndex = datFile.AddMachineDB(itemMachine);
datItem.MachineIndex = itemMachineIndex;
deviceRef.MachineIndex = itemMachineIndex;
slotOption.MachineIndex = itemMachineIndex;
_ = datFile.AddItemDB(deviceItem, statsOnly: false);
_ = datFile.AddItemDB(slotOptionItem, statsOnly: false);
_ = datFile.AddItemDB(datItem, statsOnly: false);
_ = datFile.AddItemDB(deviceRef, statsOnly: false);
_ = datFile.AddItemDB(slotOption, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.AddItemsFromDevices(deviceOnly, useSlotOptions);
@@ -562,12 +607,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.AddItemsFromRomOfParent();
@@ -640,11 +695,19 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem deviceItem = new Rom();
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(biosMachine);
long deviceMachineIndex = datFile.AddMachineDB(deviceMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(biosItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(deviceItem, deviceMachineIndex, sourceIndex, statsOnly: false);
biosItem.SourceIndex = sourceIndex;
deviceItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(biosMachine);
biosItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(deviceMachine);
deviceItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(biosItem, statsOnly: false);
_ = datFile.AddItemDB(deviceItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.RemoveBiosAndDeviceSets();
@@ -761,12 +824,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.RemoveItemsFromCloneOfChild();
@@ -881,12 +954,22 @@ namespace SabreTools.Metadata.DatFiles.Test
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(parentItem, biosMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, deviceMachineIndex, sourceIndex, statsOnly: false);
parentItem.SourceIndex = sourceIndex;
matchChildItem.SourceIndex = sourceIndex;
noMatchChildItem.SourceIndex = sourceIndex;
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
parentItem.MachineIndex = biosMachineIndex;
long deviceMachineIndex = datFile.AddMachineDB(childMachine);
matchChildItem.MachineIndex = deviceMachineIndex;
noMatchChildItem.MachineIndex = deviceMachineIndex;
_ = datFile.AddItemDB(parentItem, statsOnly: false);
_ = datFile.AddItemDB(matchChildItem, statsOnly: false);
_ = datFile.AddItemDB(noMatchChildItem, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.RemoveItemsFromRomOfChild();
@@ -915,14 +998,14 @@ namespace SabreTools.Metadata.DatFiles.Test
SampleOf = "sampleof"
};
DatItem datItem = new Rom
DatItem item = new Rom
{
Machine = machine,
Source = source
};
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
datFile.AddItem(item, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.RemoveMachineRelationshipTags();
@@ -948,12 +1031,16 @@ namespace SabreTools.Metadata.DatFiles.Test
SampleOf = "sampleof"
};
DatItem datItem = new Rom();
DatItem item = new Rom();
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long machineIndex = datFile.AddMachineDB(machine);
long sourceIndex = datFile.AddSourceDB(source);
_ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false);
item.SourceIndex = sourceIndex;
long machineIndex = datFile.AddMachineDB(machine);
item.MachineIndex = machineIndex;
_ = datFile.AddItemDB(item, statsOnly: false);
datFile.BucketBy(ItemKey.Machine);
datFile.RemoveMachineRelationshipTags();

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

@@ -45,8 +45,11 @@ namespace SabreTools.Metadata.DatFiles.Test
datFile.AddItem(rom, statsOnly: false);
long sourceIndex = datFile.AddSourceDB(source);
rom.SourceIndex = sourceIndex;
long machineIndex = datFile.AddMachineDB(machine);
datFile.AddItemDB(rom, machineIndex, sourceIndex, statsOnly: false);
rom.MachineIndex = machineIndex;
datFile.AddItemDB(rom, statsOnly: false);
DatFile created = new Logiqx(datFile, useGame: false);
created.BucketBy(ItemKey.Machine);
@@ -95,12 +98,16 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "game-1" };
DatItem datItem = new Rom();
DatItem item = new Rom();
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long sourceIndex = datFile.AddSourceDB(source);
item.SourceIndex = sourceIndex;
long machineIndex = datFile.AddMachineDB(machine);
_ = datFile.AddItemDB(datItem, machineIndex, sourceIndex, statsOnly: false);
item.MachineIndex = machineIndex;
_ = datFile.AddItemDB(item, statsOnly: false);
datFile.ClearEmpty();
Assert.Single(datFile.ItemsDB.SortedKeys);
@@ -277,7 +284,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.Header.Name = "name";
datFile.AddItem(new Rom(), statsOnly: false);
datFile.AddItemDB(new Rom(), 0, 0, false);
datFile.AddItemDB(new Rom(), statsOnly: false);
datFile.ResetDictionary();
@@ -2235,19 +2242,23 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
SourceIndex = sourceIndex,
MachineIndex = machineIndex,
Name = "rom",
Size = 12345,
CRC32 = "crc"
};
long romAIndex = datFile.AddItemDB(romA, machineIndex, sourceIndex, statsOnly: false);
long romAIndex = datFile.AddItemDB(romA, statsOnly: false);
Rom romB = new Rom
{
SourceIndex = sourceIndex,
MachineIndex = machineIndex,
Name = "rom",
Size = 12345,
CRC32 = "crc"
};
long romBIndex = datFile.AddItemDB(romB, machineIndex, sourceIndex, statsOnly: false);
long romBIndex = datFile.AddItemDB(romB, statsOnly: false);
List<KeyValuePair<long, DatItem>> mappings =
[