From 439129d284f6a33519bda9a0dff081d2f4de6781 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 30 Jul 2023 23:05:45 -0400 Subject: [PATCH] Use copies of machine data --- .../Formats/ArchiveDotOrg.Reader.cs | 3 +- .../Formats/EverdriveSMDB.Reader.cs | 3 +- .../Formats/Hashfile.Reader.cs | 52 ++++++++++++++----- SabreTools.DatFiles/Formats/Listrom.Reader.cs | 13 +---- .../Formats/SeparatedValue.Reader.cs | 7 +-- 5 files changed, 43 insertions(+), 35 deletions(-) diff --git a/SabreTools.DatFiles/Formats/ArchiveDotOrg.Reader.cs b/SabreTools.DatFiles/Formats/ArchiveDotOrg.Reader.cs index 91d262cb..6dbbe5f2 100644 --- a/SabreTools.DatFiles/Formats/ArchiveDotOrg.Reader.cs +++ b/SabreTools.DatFiles/Formats/ArchiveDotOrg.Reader.cs @@ -171,8 +171,6 @@ namespace SabreTools.DatFiles.Formats ItemStatus = ItemStatus.None, - Machine = machine, - Source = new Source { Index = indexId, @@ -181,6 +179,7 @@ namespace SabreTools.DatFiles.Formats }; // Now process and add the rom + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); } diff --git a/SabreTools.DatFiles/Formats/EverdriveSMDB.Reader.cs b/SabreTools.DatFiles/Formats/EverdriveSMDB.Reader.cs index 630337ab..189dec35 100644 --- a/SabreTools.DatFiles/Formats/EverdriveSMDB.Reader.cs +++ b/SabreTools.DatFiles/Formats/EverdriveSMDB.Reader.cs @@ -109,8 +109,6 @@ namespace SabreTools.DatFiles.Formats SHA256 = row.SHA256, ItemStatus = ItemStatus.None, - Machine = machine, - Source = new Source { Index = indexId, @@ -119,6 +117,7 @@ namespace SabreTools.DatFiles.Formats }; // Now process and add the rom + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); } diff --git a/SabreTools.DatFiles/Formats/Hashfile.Reader.cs b/SabreTools.DatFiles/Formats/Hashfile.Reader.cs index e52edaf6..ac1d7e8d 100644 --- a/SabreTools.DatFiles/Formats/Hashfile.Reader.cs +++ b/SabreTools.DatFiles/Formats/Hashfile.Reader.cs @@ -145,13 +145,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, CRC = sfv.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -190,13 +192,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, MD5 = md5.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + disk.CopyMachineInformation(machine); ParseAddHelper(disk, statsOnly); break; @@ -205,13 +209,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, MD5 = md5.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + media.CopyMachineInformation(machine); ParseAddHelper(media, statsOnly); break; @@ -221,13 +227,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, MD5 = md5.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -266,13 +274,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, SHA1 = sha1.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + disk.CopyMachineInformation(machine); ParseAddHelper(disk, statsOnly); break; @@ -281,13 +291,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, SHA1 = sha1.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + media.CopyMachineInformation(machine); ParseAddHelper(media, statsOnly); break; @@ -297,13 +309,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, SHA1 = sha1.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -342,13 +356,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, SHA256 = sha256.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + media.CopyMachineInformation(machine); ParseAddHelper(media, statsOnly); break; @@ -359,13 +375,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, SHA256 = sha256.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -407,13 +425,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, SHA384 = sha384.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -455,13 +475,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, SHA512 = sha512.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; @@ -500,13 +522,15 @@ namespace SabreTools.DatFiles.Formats { Name = itemName, SpamSum = spamsum.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + media.CopyMachineInformation(machine); ParseAddHelper(media, statsOnly); break; @@ -517,13 +541,15 @@ namespace SabreTools.DatFiles.Formats Name = itemName, Size = null, SpamSum = spamsum.Hash, - Machine = machine, + Source = new Source { Index = indexId, Name = filename, }, }; + + rom.CopyMachineInformation(machine); ParseAddHelper(rom, statsOnly); break; diff --git a/SabreTools.DatFiles/Formats/Listrom.Reader.cs b/SabreTools.DatFiles/Formats/Listrom.Reader.cs index 91219bc4..27853c9e 100644 --- a/SabreTools.DatFiles/Formats/Listrom.Reader.cs +++ b/SabreTools.DatFiles/Formats/Listrom.Reader.cs @@ -123,8 +123,6 @@ namespace SabreTools.DatFiles.Formats Name = row.Name, ItemStatus = ItemStatus.None, - Machine = machine, - Source = new Source { Index = indexId, @@ -151,8 +149,6 @@ namespace SabreTools.DatFiles.Formats SHA1 = row.SHA1, ItemStatus = ItemStatus.None, - Machine = machine, - Source = new Source { Index = indexId, @@ -173,8 +169,6 @@ namespace SabreTools.DatFiles.Formats Name = row.Name, ItemStatus = ItemStatus.BadDump, - Machine = machine, - Source = new Source { Index = indexId, @@ -199,8 +193,6 @@ namespace SabreTools.DatFiles.Formats SHA1 = null, ItemStatus = ItemStatus.Nodump, - Machine = machine, - Source = new Source { Index = indexId, @@ -222,8 +214,6 @@ namespace SabreTools.DatFiles.Formats SHA1 = row.SHA1, ItemStatus = ItemStatus.BadDump, - Machine = machine, - Source = new Source { Index = indexId, @@ -244,8 +234,6 @@ namespace SabreTools.DatFiles.Formats SHA1 = null, ItemStatus = ItemStatus.Nodump, - Machine = machine, - Source = new Source { Index = indexId, @@ -255,6 +243,7 @@ namespace SabreTools.DatFiles.Formats } // Now process and add the item + item.CopyMachineInformation(machine); ParseAddHelper(item, statsOnly); } diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs b/SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs index 445047a8..f5fa04fa 100644 --- a/SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs +++ b/SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs @@ -89,8 +89,6 @@ namespace SabreTools.DatFiles.Formats SHA1 = row.SHA1, ItemStatus = row.Status.AsItemStatus(), - Machine = machine, - Source = new Source { Index = indexId, @@ -108,8 +106,6 @@ namespace SabreTools.DatFiles.Formats SHA256 = row.SHA256, SpamSum = row.SpamSum, - Machine = machine, - Source = new Source { Index = indexId, @@ -131,8 +127,6 @@ namespace SabreTools.DatFiles.Formats SpamSum = row.SpamSum, ItemStatus = row.Status.AsItemStatus(), - Machine = machine, - Source = new Source { Index = indexId, @@ -143,6 +137,7 @@ namespace SabreTools.DatFiles.Formats } // Now process and add the item + item.CopyMachineInformation(machine); ParseAddHelper(item, statsOnly); }