From f03ae76c485c9ffa586f19e877082bbe723f7528 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 31 Oct 2017 02:44:12 -0700 Subject: [PATCH] [DatFile] Spread CHD further, still don't activate --- SabreTools.Library/DatFiles/DatFile.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs index 6fe80865..20fa8ebc 100644 --- a/SabreTools.Library/DatFiles/DatFile.cs +++ b/SabreTools.Library/DatFiles/DatFile.cs @@ -4041,10 +4041,11 @@ namespace SabreTools.Library.DatFiles /// ArchiveScanLevel representing the archive handling levels /// True if the updated DAT should be output, false otherwise /// Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise + /// True if CHDs should be treated like regular files, false otherwise /// True if rebuilding was a success, false otherwise public bool RebuildGeneric(List inputs, string outDir, string tempDir, bool quickScan, bool date, bool delete, bool inverse, OutputFormat outputFormat, bool romba, ArchiveScanLevel archiveScanLevel, bool updateDat, - string headerToCheckAgainst) + string headerToCheckAgainst, bool ignorechd = true) { #region Perform setup @@ -4140,7 +4141,7 @@ namespace SabreTools.Library.DatFiles { Globals.Logger.User("Checking file: {0}", input); RebuildGenericHelper(input, outDir, tempDir, quickScan, date, delete, inverse, - outputFormat, romba, archiveScanLevel, updateDat, headerToCheckAgainst); + outputFormat, romba, archiveScanLevel, updateDat, headerToCheckAgainst, ignorechd); } // If the input is a directory @@ -4151,7 +4152,7 @@ namespace SabreTools.Library.DatFiles { Globals.Logger.User("Checking file: {0}", file); RebuildGenericHelper(file, outDir, tempDir, quickScan, date, delete, inverse, - outputFormat, romba, archiveScanLevel, updateDat, headerToCheckAgainst); + outputFormat, romba, archiveScanLevel, updateDat, headerToCheckAgainst, ignorechd); } } } @@ -4187,9 +4188,10 @@ namespace SabreTools.Library.DatFiles /// ArchiveScanLevel representing the archive handling levels /// True if the updated DAT should be output, false otherwise /// Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise + /// True if CHDs should be treated like regular files, false otherwise private void RebuildGenericHelper(string file, string outDir, string tempDir, bool quickScan, bool date, bool delete, bool inverse, OutputFormat outputFormat, bool romba, ArchiveScanLevel archiveScanLevel, bool updateDat, - string headerToCheckAgainst) + string headerToCheckAgainst, bool ignorechd) { // If we somehow have a null filename, return if (file == null) @@ -4211,7 +4213,8 @@ namespace SabreTools.Library.DatFiles if (shouldExternalProcess) { // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually - DatItem fileinfo = FileTools.GetFileInfo(file, omitFromScan: (quickScan ? Hash.SecureHashes : Hash.DeepHashes), header: headerToCheckAgainst); + DatItem fileinfo = FileTools.GetFileInfo(file, omitFromScan: (quickScan ? Hash.SecureHashes : Hash.DeepHashes), + header: headerToCheckAgainst, ignorechd: ignorechd); usedExternally = RebuildIndividualFile(fileinfo, file, outDir, tempSubDir, date, inverse, outputFormat, romba, updateDat, null /* isZip */, headerToCheckAgainst); } @@ -4242,7 +4245,7 @@ namespace SabreTools.Library.DatFiles if (entries == null && File.Exists(file)) { // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually - DatItem fileinfo = FileTools.GetFileInfo(file, omitFromScan: (quickScan ? Hash.SecureHashes : Hash.DeepHashes)); + DatItem fileinfo = FileTools.GetFileInfo(file, omitFromScan: (quickScan ? Hash.SecureHashes : Hash.DeepHashes), ignorechd: ignorechd); usedExternally = RebuildIndividualFile(fileinfo, file, outDir, tempSubDir, date, inverse, outputFormat, romba, updateDat, null /* isZip */, headerToCheckAgainst); }