From 9afca918a600de162c42cac6e177a8257cf9245f Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 6 Jan 2025 12:36:04 -0500 Subject: [PATCH] Reduce complexity in duplicate checking --- SabreTools.DatItems/DatItemTool.cs | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/SabreTools.DatItems/DatItemTool.cs b/SabreTools.DatItems/DatItemTool.cs index 91c8b677..1365f9d1 100644 --- a/SabreTools.DatItems/DatItemTool.cs +++ b/SabreTools.DatItems/DatItemTool.cs @@ -318,47 +318,47 @@ namespace SabreTools.DatItems int pos = -1; for (int i = 0; i < outfiles.Count; i++) { + // Get the next item DatItem lastrom = outfiles[i]; // Get the duplicate status dupetype = item.GetDuplicateStatus(lastrom); + if (dupetype == 0x00) + continue; // If it's a duplicate, skip adding it to the output but add any missing information - if (dupetype != 0x00) + saveditem = lastrom; + pos = i; + + // Disks, File, Media, and Roms have more information to fill + if (item is Disk disk && saveditem is Disk savedDisk) + savedDisk.FillMissingInformation(disk); + else if (item is Formats.File fileItem && saveditem is Formats.File savedFile) + savedFile.FillMissingInformation(fileItem); + else if (item is Media media && saveditem is Media savedMedia) + savedMedia.FillMissingInformation(media); + else if (item is Rom romItem && saveditem is Rom savedRom) + savedRom.FillMissingInformation(romItem); + + saveditem.SetFieldValue(DatItem.DupeTypeKey, dupetype); + + // If the current system has a lower ID than the previous, set the system accordingly + if (item.GetFieldValue(DatItem.SourceKey)?.Index < saveditem.GetFieldValue(DatItem.SourceKey)?.Index) { - saveditem = lastrom; - pos = i; - - // Disks, File, Media, and Roms have more information to fill - if (item is Disk disk && saveditem is Disk savedDisk) - savedDisk.FillMissingInformation(disk); - else if (item is Formats.File fileItem && saveditem is Formats.File savedFile) - savedFile.FillMissingInformation(fileItem); - else if (item is Media media && saveditem is Media savedMedia) - savedMedia.FillMissingInformation(media); - else if (item is Rom romItem && saveditem is Rom savedRom) - savedRom.FillMissingInformation(romItem); - - saveditem.SetFieldValue(DatItem.DupeTypeKey, dupetype); - - // If the current system has a lower ID than the previous, set the system accordingly - if (item.GetFieldValue(DatItem.SourceKey)?.Index < saveditem.GetFieldValue(DatItem.SourceKey)?.Index) - { - item.SetFieldValue(DatItem.SourceKey, item.GetFieldValue(DatItem.SourceKey)!.Clone() as Source); - saveditem.CopyMachineInformation(item); - saveditem.SetName(item.GetName()); - } - - // If the current machine is a child of the new machine, use the new machine instead - if (saveditem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey) == item.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) - || saveditem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey) == item.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)) - { - saveditem.CopyMachineInformation(item); - saveditem.SetName(item.GetName()); - } - - break; + item.SetFieldValue(DatItem.SourceKey, item.GetFieldValue(DatItem.SourceKey)!.Clone() as Source); + saveditem.CopyMachineInformation(item); + saveditem.SetName(item.GetName()); } + + // If the current machine is a child of the new machine, use the new machine instead + if (saveditem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey) == item.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) + || saveditem.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey) == item.GetFieldValue(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)) + { + saveditem.CopyMachineInformation(item); + saveditem.SetName(item.GetName()); + } + + break; } // If no duplicate is found, add it to the list