mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Add AddItemsFromChildren tests, make fixes
This commit is contained in:
Matt Nadareski
@@ -45,7 +45,191 @@ namespace SabreTools.DatFiles.Test
|
||||
|
||||
#region AddItemsFromChildren
|
||||
|
||||
// TODO: Implement AddItemsFromChildren tests
|
||||
[Fact]
|
||||
public void AddItemsFromChildren_Items_Dedup()
|
||||
{
|
||||
Source source = new Source(0, source: null);
|
||||
|
||||
Machine parentMachine = new Machine();
|
||||
parentMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "parent");
|
||||
|
||||
Machine childMachine = new Machine();
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "child");
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, "parent");
|
||||
childMachine.SetFieldValue<bool>(Models.Metadata.Machine.IsBiosKey, true);
|
||||
|
||||
DatItem parentItem = new Rom();
|
||||
parentItem.SetName("parent_rom");
|
||||
parentItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
parentItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
parentItem.SetFieldValue<Machine>(DatItem.MachineKey, parentMachine);
|
||||
parentItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem matchChildItem = new Rom();
|
||||
matchChildItem.SetName("match_child_rom");
|
||||
matchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
matchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
matchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
matchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem noMatchChildItem = new Rom();
|
||||
noMatchChildItem.SetName("no_match_child_rom");
|
||||
noMatchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
noMatchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "beefdead");
|
||||
noMatchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
noMatchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, deprecated: false);
|
||||
datFile.AddItem(parentItem, statsOnly: false);
|
||||
datFile.AddItem(matchChildItem, statsOnly: false);
|
||||
datFile.AddItem(noMatchChildItem, statsOnly: false);
|
||||
|
||||
datFile.BucketBy(ItemKey.Machine, DedupeType.None);
|
||||
datFile.AddItemsFromChildren(subfolder: true, skipDedup: false);
|
||||
|
||||
Assert.Equal(2, datFile.GetItemsForBucket("parent").Count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddItemsFromChildren_Items_SkipDedup()
|
||||
{
|
||||
Source source = new Source(0, source: null);
|
||||
|
||||
Machine parentMachine = new Machine();
|
||||
parentMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "parent");
|
||||
|
||||
Machine childMachine = new Machine();
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "child");
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, "parent");
|
||||
childMachine.SetFieldValue<bool>(Models.Metadata.Machine.IsBiosKey, true);
|
||||
|
||||
DatItem parentItem = new Rom();
|
||||
parentItem.SetName("parent_rom");
|
||||
parentItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
parentItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
parentItem.SetFieldValue<Machine>(DatItem.MachineKey, parentMachine);
|
||||
parentItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem matchChildItem = new Rom();
|
||||
matchChildItem.SetName("match_child_rom");
|
||||
matchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
matchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
matchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
matchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem noMatchChildItem = new Rom();
|
||||
noMatchChildItem.SetName("no_match_child_rom");
|
||||
noMatchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
noMatchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "beefdead");
|
||||
noMatchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
noMatchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, deprecated: false);
|
||||
datFile.AddItem(parentItem, statsOnly: false);
|
||||
datFile.AddItem(matchChildItem, statsOnly: false);
|
||||
datFile.AddItem(noMatchChildItem, statsOnly: false);
|
||||
|
||||
datFile.BucketBy(ItemKey.Machine, DedupeType.None);
|
||||
datFile.AddItemsFromChildren(subfolder: true, skipDedup: true);
|
||||
|
||||
Assert.Equal(3, datFile.GetItemsForBucket("parent").Count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddItemsFromChildren_ItemsDB_Dedup()
|
||||
{
|
||||
Source source = new Source(0, source: null);
|
||||
|
||||
Machine parentMachine = new Machine();
|
||||
parentMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "parent");
|
||||
|
||||
Machine childMachine = new Machine();
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "child");
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, "parent");
|
||||
childMachine.SetFieldValue<bool>(Models.Metadata.Machine.IsBiosKey, true);
|
||||
|
||||
DatItem parentItem = new Rom();
|
||||
parentItem.SetName("parent_rom");
|
||||
parentItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
parentItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
parentItem.SetFieldValue<Machine>(DatItem.MachineKey, parentMachine);
|
||||
parentItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem matchChildItem = new Rom();
|
||||
matchChildItem.SetName("match_child_rom");
|
||||
matchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
matchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
matchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
matchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem noMatchChildItem = new Rom();
|
||||
noMatchChildItem.SetName("no_match_child_rom");
|
||||
noMatchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
noMatchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "beefdead");
|
||||
noMatchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
noMatchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, deprecated: 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);
|
||||
|
||||
datFile.BucketBy(ItemKey.Machine, DedupeType.None);
|
||||
datFile.AddItemsFromChildren(subfolder: true, skipDedup: false);
|
||||
|
||||
Assert.Equal(2, datFile.GetItemsForBucketDB("parent").Count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void AddItemsFromChildren_ItemsDB_SkipDedup()
|
||||
{
|
||||
Source source = new Source(0, source: null);
|
||||
|
||||
Machine parentMachine = new Machine();
|
||||
parentMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "parent");
|
||||
|
||||
Machine childMachine = new Machine();
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.NameKey, "child");
|
||||
childMachine.SetFieldValue<string?>(Models.Metadata.Machine.CloneOfKey, "parent");
|
||||
childMachine.SetFieldValue<bool>(Models.Metadata.Machine.IsBiosKey, true);
|
||||
|
||||
DatItem parentItem = new Rom();
|
||||
parentItem.SetName("parent_rom");
|
||||
parentItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
parentItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
parentItem.SetFieldValue<Machine>(DatItem.MachineKey, parentMachine);
|
||||
parentItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem matchChildItem = new Rom();
|
||||
matchChildItem.SetName("match_child_rom");
|
||||
matchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
matchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "deadbeef");
|
||||
matchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
matchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatItem noMatchChildItem = new Rom();
|
||||
noMatchChildItem.SetName("no_match_child_rom");
|
||||
noMatchChildItem.SetFieldValue<long>(Models.Metadata.Rom.SizeKey, 12345);
|
||||
noMatchChildItem.SetFieldValue<string?>(Models.Metadata.Rom.CRCKey, "beefdead");
|
||||
noMatchChildItem.SetFieldValue<Machine>(DatItem.MachineKey, childMachine);
|
||||
noMatchChildItem.SetFieldValue<Source>(DatItem.SourceKey, source);
|
||||
|
||||
DatFile datFile = new Logiqx(datFile: null, deprecated: 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);
|
||||
|
||||
datFile.BucketBy(ItemKey.Machine, DedupeType.None);
|
||||
datFile.AddItemsFromChildren(subfolder: true, skipDedup: true);
|
||||
|
||||
Assert.Equal(3, datFile.GetItemsForBucketDB("parent").Count);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
@@ -258,6 +258,8 @@ namespace SabreTools.DatFiles
|
||||
// Get the cloneof parent items
|
||||
string? cloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey);
|
||||
List<DatItem> parentItems = GetItemsForBucket(cloneOf);
|
||||
if (cloneOf == null)
|
||||
continue;
|
||||
|
||||
// Otherwise, move the items from the current game to a subfolder of the parent game
|
||||
DatItem copyFrom;
|
||||
@@ -296,14 +298,14 @@ namespace SabreTools.DatFiles
|
||||
.Contains(mergeTag))
|
||||
{
|
||||
disk.CopyMachineInformation(copyFrom);
|
||||
Add(cloneOf!, disk);
|
||||
Add(cloneOf, disk);
|
||||
}
|
||||
|
||||
// If there is no merge tag, add to parent
|
||||
else if (mergeTag == null)
|
||||
{
|
||||
disk.CopyMachineInformation(copyFrom);
|
||||
Add(cloneOf!, disk);
|
||||
Add(cloneOf, disk);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -329,7 +331,7 @@ namespace SabreTools.DatFiles
|
||||
rom.SetName($"{rom.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)}\\{rom.GetName()}");
|
||||
|
||||
rom.CopyMachineInformation(copyFrom);
|
||||
Add(cloneOf!, rom);
|
||||
Add(cloneOf, rom);
|
||||
}
|
||||
|
||||
// If the parent doesn't already contain this item, add to subfolder of parent
|
||||
@@ -339,7 +341,7 @@ namespace SabreTools.DatFiles
|
||||
rom.SetName($"{item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)}\\{rom.GetName()}");
|
||||
|
||||
rom.CopyMachineInformation(copyFrom);
|
||||
Add(cloneOf!, rom);
|
||||
Add(cloneOf, rom);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -350,7 +352,7 @@ namespace SabreTools.DatFiles
|
||||
item.SetName($"{item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)}\\{item.GetName()}");
|
||||
|
||||
item.CopyMachineInformation(copyFrom);
|
||||
Add(cloneOf!, item);
|
||||
Add(cloneOf, item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -410,7 +412,7 @@ namespace SabreTools.DatFiles
|
||||
string? mergeTag = disk.GetStringFieldValue(Models.Metadata.Disk.MergeKey);
|
||||
|
||||
// If the merge tag exists and the parent already contains it, skip
|
||||
if (mergeTag != null && parentItems.Values
|
||||
if (mergeTag != null && GetItemsForBucketDB(cloneOf).Values
|
||||
.Where(i => i is Disk)
|
||||
.Select(i => (i as Disk)!.GetName())
|
||||
.Contains(mergeTag))
|
||||
@@ -419,7 +421,7 @@ namespace SabreTools.DatFiles
|
||||
}
|
||||
|
||||
// If the merge tag exists but the parent doesn't contain it, add to parent
|
||||
else if (mergeTag != null && !parentItems.Values
|
||||
else if (mergeTag != null && !GetItemsForBucketDB(cloneOf).Values
|
||||
.Where(i => i is Disk)
|
||||
.Select(i => (i as Disk)!.GetName())
|
||||
.Contains(mergeTag))
|
||||
@@ -440,7 +442,7 @@ namespace SabreTools.DatFiles
|
||||
else if (item.Value is Rom rom)
|
||||
{
|
||||
// If the merge tag exists and the parent already contains it, skip
|
||||
if (rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey) != null && parentItems.Values
|
||||
if (rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey) != null && GetItemsForBucketDB(cloneOf).Values
|
||||
.Where(i => i is Rom)
|
||||
.Select(i => (i as Rom)!.GetName())
|
||||
.Contains(rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey)))
|
||||
@@ -449,7 +451,7 @@ namespace SabreTools.DatFiles
|
||||
}
|
||||
|
||||
// If the merge tag exists but the parent doesn't contain it, add to subfolder of parent
|
||||
else if (rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey) != null && !parentItems.Values
|
||||
else if (rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey) != null && !GetItemsForBucketDB(cloneOf).Values
|
||||
.Where(i => i is Rom)
|
||||
.Select(i => (i as Rom)!.GetName())
|
||||
.Contains(rom.GetStringFieldValue(Models.Metadata.Rom.MergeKey)))
|
||||
@@ -462,7 +464,7 @@ namespace SabreTools.DatFiles
|
||||
}
|
||||
|
||||
// If the parent doesn't already contain this item, add to subfolder of parent
|
||||
else if (!parentItems.Contains(item) || skipDedup)
|
||||
else if (!GetItemsForBucketDB(cloneOf).Values.Contains(item.Value) || skipDedup)
|
||||
{
|
||||
if (subfolder)
|
||||
rom.SetName($"{machineName}\\{rom.GetName()}");
|
||||
@@ -473,7 +475,7 @@ namespace SabreTools.DatFiles
|
||||
}
|
||||
|
||||
// All other that would be missing to subfolder of parent
|
||||
else if (!parentItems.Contains(item))
|
||||
else if (!GetItemsForBucketDB(cloneOf).Values.Contains(item.Value))
|
||||
{
|
||||
if (subfolder)
|
||||
item.Value.SetName($"{machineName}\\{item.Value.GetName()}");
|
||||
|
||||
Reference in New Issue
Block a user