claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RombaSharp, DatFile] Clean up code

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-17 15:48:49 -07:00
parent 809b6aff14
commit 0ebcd51cf9
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RombaSharp/Partials/RombaSharp.Helpers.cs
View File

@@ -402,7 +402,8 @@ namespace RombaSharp
// First get a list of SHA-1's from the input DATs // First get a list of SHA-1's from the input DATs
DatFile datroot = new DatFile { Type = "SuperDAT", }; DatFile datroot = new DatFile { Type = "SuperDAT", };
datroot.PopulateFromDir(_dats, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, false, false, false, _tmpdir, false, null); // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
datroot.PopulateFromDir(_dats, Hash.DeepHashes, false, false, false, false, false, _tmpdir, false, null);
datroot.BucketBy(SortedBy.SHA1, false /* mergeroms */); datroot.BucketBy(SortedBy.SHA1, false /* mergeroms */);
// Create a List of dat hashes in the database (SHA-1) // Create a List of dat hashes in the database (SHA-1)
@@ -616,7 +617,8 @@ namespace RombaSharp
// Now rescan the depot itself // Now rescan the depot itself
DatFile depot = new DatFile(); DatFile depot = new DatFile();
depot.PopulateFromDir(depotname, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, true, false, false, _tmpdir, false, null); // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
depot.PopulateFromDir(depotname, Hash.DeepHashes, false, false, true, false, false, _tmpdir, false, null);
depot.BucketBy(SortedBy.SHA1, false /* mergeroms */); depot.BucketBy(SortedBy.SHA1, false /* mergeroms */);
// Set the base queries to use // Set the base queries to use

9
RombaSharp/Partials/RombaSharp.Inits.cs
View File

@@ -41,12 +41,14 @@ namespace RombaSharp
DatFile df = new DatFile(); DatFile df = new DatFile();
foreach (string dir in onlyDirs) foreach (string dir in onlyDirs)
{ {
df.PopulateFromDir(dir, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, true, false, false, _tmpdir, false, null); // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
df.PopulateFromDir(dir, Hash.DeepHashes, false, false, true, false, false, _tmpdir, false, null);
// If we're looking for only needed, consider the zipfiles themselves too // If we're looking for only needed, consider the zipfiles themselves too
if (onlyNeeded) if (onlyNeeded)
{ {
df.PopulateFromDir(dir, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, true, true, false, false, _tmpdir, false, null); // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
df.PopulateFromDir(dir, Hash.DeepHashes, false, true, true, false, false, _tmpdir, false, null);
} }
} }
@@ -249,7 +251,8 @@ namespace RombaSharp
foreach (string input in inputs) foreach (string input in inputs)
{ {
datdata.PopulateFromDir(input, Hash.SHA256 & Hash.SHA384 & Hash.SHA512 /* omitFromScan */, true /* bare */, false /* archivesAsFiles */, // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
datdata.PopulateFromDir(input, Hash.DeepHashes /* omitFromScan */, true /* bare */, false /* archivesAsFiles */,
true /* enableGzip */, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */, true /* enableGzip */, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */,
null /* headerToCheckAgainst */); null /* headerToCheckAgainst */);
datdata.WriteToFile(""); datdata.WriteToFile("");

3
SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
View File

@@ -1028,8 +1028,7 @@ namespace SabreTools.Helper.Dats
/// <param name="quickScan">True to enable external scanning of archives, false otherwise</param> /// <param name="quickScan">True to enable external scanning of archives, false otherwise</param>
/// <param name="headerToCheckAgainst">Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise</param> /// <param name="headerToCheckAgainst">Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise</param>
/// <returns>True if verification was a success, false otherwise</returns> /// <returns>True if verification was a success, false otherwise</returns>
public bool VerifyGeneric(List<string> inputs, string tempDir, bool hashOnly, bool quickScan, public bool VerifyGeneric(List<string> inputs, string tempDir, bool hashOnly, bool quickScan, string headerToCheckAgainst)
string headerToCheckAgainst)
{ {
// Check the temp directory exists // Check the temp directory exists
if (String.IsNullOrEmpty(tempDir)) if (String.IsNullOrEmpty(tempDir))