From d02f4e6fccdfa0c67c97dd26f0e17edcd0022b4d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 10 Dec 2020 15:42:39 -0800 Subject: [PATCH] Fix incorrect class name --- RombaSharp/Features/Archive.cs | 4 ++-- RombaSharp/Features/Dir2Dat.cs | 2 +- RombaSharp/Features/RefreshDats.cs | 2 +- RombaSharp/Features/RescanDepots.cs | 2 +- SabreTools.DatFiles/{DirFromDat.cs => DatFromDir.cs} | 2 +- SabreTools/Features/Batch.cs | 2 +- SabreTools/Features/DatFromDir.cs | 2 +- SabreTools/Features/Verify.cs | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename SabreTools.DatFiles/{DirFromDat.cs => DatFromDir.cs} (99%) diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs index faf281dc..c7017be5 100644 --- a/RombaSharp/Features/Archive.cs +++ b/RombaSharp/Features/Archive.cs @@ -65,8 +65,8 @@ have a current entry in the DAT index."; DatFile df = DatFile.Create(); foreach (string dir in onlyDirs) { - DirFromDat.PopulateFromDir(df, dir, asFiles: TreatAsFile.NonArchive); - DirFromDat.PopulateFromDir(df, dir, asFiles: TreatAsFile.All); + DatFromDir.PopulateFromDir(df, dir, asFiles: TreatAsFile.NonArchive); + DatFromDir.PopulateFromDir(df, dir, asFiles: TreatAsFile.All); } // Create an empty Dat for files that need to be rebuilt diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs index 3ca647d6..693ac9b2 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; - DirFromDat.PopulateFromDir(datfile, source, asFiles: TreatAsFile.NonArchive); + DatFromDir.PopulateFromDir(datfile, source, asFiles: TreatAsFile.NonArchive); Modification.ApplyCleaning(datfile, new Cleaner() { ExcludeFields = Hash.DeepHashes.AsFields() }); Writer.Write(datfile, outdat); } diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs index 05f9437b..e3ad8eab 100644 --- a/RombaSharp/Features/RefreshDats.cs +++ b/RombaSharp/Features/RefreshDats.cs @@ -62,7 +62,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"; - DirFromDat.PopulateFromDir(datroot, _dats, asFiles: TreatAsFile.NonArchive); + DatFromDir.PopulateFromDir(datroot, _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 92e5ca6c..584a4640 100644 --- a/RombaSharp/Features/RescanDepots.cs +++ b/RombaSharp/Features/RescanDepots.cs @@ -64,7 +64,7 @@ namespace RombaSharp.Features // Now rescan the depot itself DatFile depot = DatFile.Create(); - DirFromDat.PopulateFromDir(depot, depotname, asFiles: TreatAsFile.NonArchive); + DatFromDir.PopulateFromDir(depot, depotname, asFiles: TreatAsFile.NonArchive); depot.Items.BucketBy(Field.DatItem_SHA1, DedupeType.None); // Set the base queries to use diff --git a/SabreTools.DatFiles/DirFromDat.cs b/SabreTools.DatFiles/DatFromDir.cs similarity index 99% rename from SabreTools.DatFiles/DirFromDat.cs rename to SabreTools.DatFiles/DatFromDir.cs index 02f269c0..9d480e0b 100644 --- a/SabreTools.DatFiles/DirFromDat.cs +++ b/SabreTools.DatFiles/DatFromDir.cs @@ -16,7 +16,7 @@ namespace SabreTools.DatFiles /// This file represents all methods related to populating a DatFile /// from a set of files and directories /// - public class DirFromDat + public class DatFromDir { #region Logging diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs index 2f116655..141fb7d6 100644 --- a/SabreTools/Features/Batch.cs +++ b/SabreTools/Features/Batch.cs @@ -153,7 +153,7 @@ Reset the internal state: reset();"; // Assume there could be multiple foreach (string input in command.Arguments) { - DirFromDat.PopulateFromDir(datFile, input); + DatFiles.DatFromDir.PopulateFromDir(datFile, input); } // TODO: We might not want to remove higher order hashes in the future diff --git a/SabreTools/Features/DatFromDir.cs b/SabreTools/Features/DatFromDir.cs index 236fab48..b5b8f344 100644 --- a/SabreTools/Features/DatFromDir.cs +++ b/SabreTools/Features/DatFromDir.cs @@ -89,7 +89,7 @@ namespace SabreTools.Features datdata.FillHeaderFromPath(basePath, noAutomaticDate); // Now populate from the path - bool success = DirFromDat.PopulateFromDir( + bool success = DatFiles.DatFromDir.PopulateFromDir( datdata, basePath, asFiles, diff --git a/SabreTools/Features/Verify.cs b/SabreTools/Features/Verify.cs index 9fc2491c..c06d8c60 100644 --- a/SabreTools/Features/Verify.cs +++ b/SabreTools/Features/Verify.cs @@ -84,7 +84,7 @@ namespace SabreTools.Features logger.User("Processing files:\n"); foreach (string input in Inputs) { - DirFromDat.PopulateFromDir(datdata, input, asFiles: asFiles, hashes: quickScan ? Hash.CRC : Hash.Standard); + DatFiles.DatFromDir.PopulateFromDir(datdata, input, asFiles: asFiles, hashes: quickScan ? Hash.CRC : Hash.Standard); } Verification.VerifyGeneric(datdata, hashOnly); @@ -133,7 +133,7 @@ namespace SabreTools.Features logger.User("Processing files:\n"); foreach (string input in Inputs) { - DirFromDat.PopulateFromDir(datdata, input, asFiles: asFiles, hashes: quickScan ? Hash.CRC : Hash.Standard); + DatFiles.DatFromDir.PopulateFromDir(datdata, input, asFiles: asFiles, hashes: quickScan ? Hash.CRC : Hash.Standard); } Verification.VerifyGeneric(datdata, hashOnly);