From f535914428c8c741c110ebb477a6f55001393df9 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 16 Mar 2017 14:57:38 -0700 Subject: [PATCH] [DatFile] DFD and rebuild both use extractless now --- SabreTools.Helper/Dats/Partials/DatFile.DFD.cs | 4 ++-- SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SabreTools.Helper/Dats/Partials/DatFile.DFD.cs b/SabreTools.Helper/Dats/Partials/DatFile.DFD.cs index f6ff18dc..ad95adf4 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.DFD.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.DFD.cs @@ -215,12 +215,12 @@ namespace SabreTools.Helper.Dats // If all deep hash skip flags are set, do a quickscan if (omitFromScan == Hash.SecureHashes) { - extracted = ArchiveTools.GetArchiveFileInfo(newItem); + extracted = ArchiveTools.GetArchiveFileInfo(newItem, date: addDate); } // Otherwise, get the list with whatever hashes are wanted else { - extracted = ArchiveTools.GetExtendedArchiveFileInfo(newItem, omitFromScan: omitFromScan); + extracted = ArchiveTools.GetExtendedArchiveFileInfo(newItem, omitFromScan: omitFromScan, date: addDate); } // If the extracted list is null, just scan the item itself diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs index 6ea6f691..59df99e4 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs @@ -405,12 +405,13 @@ namespace SabreTools.Helper.Dats // If we're in quickscan, use the header information if (quickScan) { - entries = ArchiveTools.GetArchiveFileInfo(file); + entries = ArchiveTools.GetArchiveFileInfo(file, date: date); } // Otherwise get the deeper information else { - entries = ArchiveTools.GetExtendedArchiveFileInfo(file); + // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually + entries = ArchiveTools.GetExtendedArchiveFileInfo(file, omitFromScan: (quickScan ? Hash.SecureHashes : Hash.DeepHashes), date: date); } // If the entries list is null, we encountered an error and should scan exteranlly