From 99c530b418afe7c522a6518f2901053ef578039a Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 18 Sep 2020 10:54:34 -0700 Subject: [PATCH] Add special combinations of TreatAsFile --- RombaSharp/Features/Archive.cs | 6 +++--- RombaSharp/Features/Dir2Dat.cs | 2 +- RombaSharp/Features/RefreshDats.cs | 2 +- RombaSharp/Features/RescanDepots.cs | 2 +- SabreTools.Library/DatFiles/Enums.cs | 3 +++ SabreTools.Library/Skippers/Transform.cs | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs index 5072955e..e57625a0 100644 --- a/RombaSharp/Features/Archive.cs +++ b/RombaSharp/Features/Archive.cs @@ -64,8 +64,8 @@ have a current entry in the DAT index."; DatFile df = DatFile.Create(); foreach (string dir in onlyDirs) { - df.PopulateFromDir(dir, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); - df.PopulateFromDir(dir, asFiles: TreatAsFile.AaruFormat | TreatAsFile.Archive | TreatAsFile.CHD); + df.PopulateFromDir(dir, asFiles: TreatAsFile.NonArchive); + df.PopulateFromDir(dir, asFiles: TreatAsFile.All); } // Create an empty Dat for files that need to be rebuilt @@ -192,7 +192,7 @@ have a current entry in the DAT index."; onlyDirs, outDir: _depots.Keys.ToList()[0], outputFormat: OutputFormat.TorrentGzipRomba, - asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + asFiles: TreatAsFile.NonArchive); } } } diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs index 325e7809..11fdcc15 100644 --- a/RombaSharp/Features/Dir2Dat.cs +++ b/RombaSharp/Features/Dir2Dat.cs @@ -53,7 +53,7 @@ namespace RombaSharp.Features DatFile datfile = DatFile.Create(); datfile.Header.Name = string.IsNullOrWhiteSpace(name) ? "untitled" : name; datfile.Header.Description = description; - datfile.PopulateFromDir(source, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + datfile.PopulateFromDir(source, asFiles: TreatAsFile.NonArchive); datfile.ApplyCleaning(new Cleaner() { ExcludeFields = Hash.DeepHashes.AsFields() }); datfile.Write(outdat); } diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs index 8770f557..b3690c44 100644 --- a/RombaSharp/Features/RefreshDats.cs +++ b/RombaSharp/Features/RefreshDats.cs @@ -61,7 +61,7 @@ contents of any changed dats."; // First get a list of SHA-1's from the input DATs DatFile datroot = DatFile.Create(); datroot.Header.Type = "SuperDAT"; - datroot.PopulateFromDir(_dats, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + datroot.PopulateFromDir(_dats, asFiles: TreatAsFile.NonArchive); datroot.Items.BucketBy(Field.DatItem_SHA1, DedupeType.None); // Create a List of dat hashes in the database (SHA-1) diff --git a/RombaSharp/Features/RescanDepots.cs b/RombaSharp/Features/RescanDepots.cs index 0d40637c..46dd16d7 100644 --- a/RombaSharp/Features/RescanDepots.cs +++ b/RombaSharp/Features/RescanDepots.cs @@ -63,7 +63,7 @@ namespace RombaSharp.Features // Now rescan the depot itself DatFile depot = DatFile.Create(); - depot.PopulateFromDir(depotname, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + depot.PopulateFromDir(depotname, asFiles: TreatAsFile.NonArchive); depot.Items.BucketBy(Field.DatItem_SHA1, DedupeType.None); // Set the base queries to use diff --git a/SabreTools.Library/DatFiles/Enums.cs b/SabreTools.Library/DatFiles/Enums.cs index d329f942..2ac887c0 100644 --- a/SabreTools.Library/DatFiles/Enums.cs +++ b/SabreTools.Library/DatFiles/Enums.cs @@ -283,5 +283,8 @@ namespace SabreTools.Library.DatFiles CHD = 1 << 0, Archive = 1 << 1, AaruFormat = 1 << 2, + + NonArchive = CHD | AaruFormat, + All = CHD | Archive | AaruFormat, } } diff --git a/SabreTools.Library/Skippers/Transform.cs b/SabreTools.Library/Skippers/Transform.cs index 8e9f6f88..3878e2ba 100644 --- a/SabreTools.Library/Skippers/Transform.cs +++ b/SabreTools.Library/Skippers/Transform.cs @@ -119,7 +119,7 @@ namespace SabreTools.Library.Skippers // Now add the information to the database if it's not already there if (!nostore) { - BaseFile baseFile = FileExtensions.GetInfo(newfile, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + BaseFile baseFile = FileExtensions.GetInfo(newfile, asFiles: TreatAsFile.NonArchive); DatabaseTools.AddHeaderToDatabase(hstr, Utilities.ByteArrayToString(baseFile.SHA1), rule.SourceFile); } @@ -139,7 +139,7 @@ namespace SabreTools.Library.Skippers Directory.CreateDirectory(outDir); // First, get the SHA-1 hash of the file - BaseFile baseFile = FileExtensions.GetInfo(file, asFiles: TreatAsFile.AaruFormat | TreatAsFile.CHD); + BaseFile baseFile = FileExtensions.GetInfo(file, asFiles: TreatAsFile.NonArchive); // Retrieve a list of all related headers from the database List headers = DatabaseTools.RetrieveHeadersFromDatabase(Utilities.ByteArrayToString(baseFile.SHA1));