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

[ALL] Move things around

Browse Source
This commit is contained in:
Matt Nadareski
2016-08-29 16:55:55 -07:00
parent 2c6819cec4
commit cfdc88463a
7 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Deheader/Headerer.cs
View File

@@ -254,7 +254,7 @@ namespace SabreTools
}
// Now add the information to the database if it's not already there
Rom rom = RomTools.GetSingleFileInfo(newfile);
Rom rom = FileTools.GetSingleFileInfo(newfile);
AddHeaderToDatabase(hstr, rom.HashData.SHA1, type);
}
@@ -309,7 +309,7 @@ namespace SabreTools
public bool ReplaceHeader(string file)
{
// First, get the SHA-1 hash of the file
Rom rom = RomTools.GetSingleFileInfo(file);
Rom rom = FileTools.GetSingleFileInfo(file);
// Then try to pull the corresponding headers from the database
string header = "";

60
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -295,9 +295,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
rom.HashData.CRC = RomTools.CleanHashData(rom.HashData.CRC, Constants.CRCLength);
rom.HashData.MD5 = RomTools.CleanHashData(rom.HashData.MD5, Constants.MD5Length);
rom.HashData.SHA1 = RomTools.CleanHashData(rom.HashData.SHA1, Constants.SHA1Length);
rom.HashData.CRC = Style.CleanHashData(rom.HashData.CRC, Constants.CRCLength);
rom.HashData.MD5 = Style.CleanHashData(rom.HashData.MD5, Constants.MD5Length);
rom.HashData.SHA1 = Style.CleanHashData(rom.HashData.SHA1, Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (rom.Type == ItemType.Rom && (rom.HashData.Size == 0 || rom.HashData.Size == -1) && ((rom.HashData.CRC == Constants.CRCZero || rom.HashData.CRC == "") || rom.HashData.MD5 == Constants.MD5Zero || rom.HashData.SHA1 == Constants.SHA1Zero))
@@ -583,9 +583,9 @@ namespace SabreTools.Helper
};
// Sanitize the hashes from null, hex sizes, and "true blank" strings
rom.HashData.CRC = RomTools.CleanHashData(rom.HashData.CRC, Constants.CRCLength);
rom.HashData.MD5 = RomTools.CleanHashData(rom.HashData.MD5, Constants.MD5Length);
rom.HashData.SHA1 = RomTools.CleanHashData(rom.HashData.SHA1, Constants.SHA1Length);
rom.HashData.CRC = Style.CleanHashData(rom.HashData.CRC, Constants.CRCLength);
rom.HashData.MD5 = Style.CleanHashData(rom.HashData.MD5, Constants.MD5Length);
rom.HashData.SHA1 = Style.CleanHashData(rom.HashData.SHA1, Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (rom.Type == ItemType.Rom && (rom.HashData.Size == 0 || rom.HashData.Size == -1) && ((rom.HashData.CRC == Constants.CRCZero || rom.HashData.CRC == "") || rom.HashData.MD5 == Constants.MD5Zero || rom.HashData.SHA1 == Constants.SHA1Zero))
@@ -1089,9 +1089,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
crc = RomTools.CleanHashData(subreader.GetAttribute("crc"), Constants.CRCLength);
md5 = RomTools.CleanHashData(subreader.GetAttribute("md5"), Constants.MD5Length);
sha1 = RomTools.CleanHashData(subreader.GetAttribute("sha1"), Constants.SHA1Length);
crc = Style.CleanHashData(subreader.GetAttribute("crc"), Constants.CRCLength);
md5 = Style.CleanHashData(subreader.GetAttribute("md5"), Constants.MD5Length);
sha1 = Style.CleanHashData(subreader.GetAttribute("sha1"), Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (subreader.Name == "rom" && (size == 0 || size == -1) &&
@@ -1320,9 +1320,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
crc = RomTools.CleanHashData(xtr.GetAttribute("crc"), Constants.CRCLength);
md5 = RomTools.CleanHashData(xtr.GetAttribute("md5"), Constants.MD5Length);
sha1 = RomTools.CleanHashData(xtr.GetAttribute("sha1"), Constants.SHA1Length);
crc = Style.CleanHashData(xtr.GetAttribute("crc"), Constants.CRCLength);
md5 = Style.CleanHashData(xtr.GetAttribute("md5"), Constants.MD5Length);
sha1 = Style.CleanHashData(xtr.GetAttribute("sha1"), Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (xtr.GetAttribute("type") == "rom" && (size == 0 || size == -1) && ((crc == Constants.CRCZero || crc == "") || md5 == Constants.MD5Zero || sha1 == Constants.SHA1Zero))
@@ -2519,9 +2519,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
hashData.CRC = RomTools.CleanHashData(hashData.CRC, Constants.CRCBytesLength);
hashData.MD5 = RomTools.CleanHashData(hashData.MD5, Constants.MD5BytesLength);
hashData.SHA1 = RomTools.CleanHashData(hashData.SHA1, Constants.SHA1BytesLength);
hashData.CRC = Style.CleanHashData(hashData.CRC, Constants.CRCBytesLength);
hashData.MD5 = Style.CleanHashData(hashData.MD5, Constants.MD5BytesLength);
hashData.SHA1 = Style.CleanHashData(hashData.SHA1, Constants.SHA1BytesLength);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (romData.Type == ItemType.Rom
@@ -2806,9 +2806,9 @@ namespace SabreTools.Helper
};
// Sanitize the hashes from null, hex sizes, and "true blank" strings
hashData.CRC = RomTools.CleanHashData(hashData.CRC, Constants.CRCBytesLength);
hashData.MD5 = RomTools.CleanHashData(hashData.MD5, Constants.MD5BytesLength);
hashData.SHA1 = RomTools.CleanHashData(hashData.SHA1, Constants.SHA1BytesLength);
hashData.CRC = Style.CleanHashData(hashData.CRC, Constants.CRCBytesLength);
hashData.MD5 = Style.CleanHashData(hashData.MD5, Constants.MD5BytesLength);
hashData.SHA1 = Style.CleanHashData(hashData.SHA1, Constants.SHA1BytesLength);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (romData.Type == ItemType.Rom
@@ -3299,9 +3299,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
crc = RomTools.CleanHashData(subreader.GetAttribute("crc"), Constants.CRCLength);
md5 = RomTools.CleanHashData(subreader.GetAttribute("md5"), Constants.MD5Length);
sha1 = RomTools.CleanHashData(subreader.GetAttribute("sha1"), Constants.SHA1Length);
crc = Style.CleanHashData(subreader.GetAttribute("crc"), Constants.CRCLength);
md5 = Style.CleanHashData(subreader.GetAttribute("md5"), Constants.MD5Length);
sha1 = Style.CleanHashData(subreader.GetAttribute("sha1"), Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (subreader.Name == "rom" && (size == 0 || size == -1) &&
@@ -3353,9 +3353,9 @@ namespace SabreTools.Helper
HashData hashData = new HashData
{
Size = size,
CRC = RomTools.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = RomTools.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = RomTools.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
CRC = Style.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = Style.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = Style.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
Roms = new List<RomData>(),
};
hashData.Roms.Add(romData);
@@ -3513,9 +3513,9 @@ namespace SabreTools.Helper
}
// Sanitize the hashes from null, hex sizes, and "true blank" strings
crc = RomTools.CleanHashData(xtr.GetAttribute("crc"), Constants.CRCLength);
md5 = RomTools.CleanHashData(xtr.GetAttribute("md5"), Constants.MD5Length);
sha1 = RomTools.CleanHashData(xtr.GetAttribute("sha1"), Constants.SHA1Length);
crc = Style.CleanHashData(xtr.GetAttribute("crc"), Constants.CRCLength);
md5 = Style.CleanHashData(xtr.GetAttribute("md5"), Constants.MD5Length);
sha1 = Style.CleanHashData(xtr.GetAttribute("sha1"), Constants.SHA1Length);
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
if (xtr.GetAttribute("type") == "rom" && (size == 0 || size == -1) && ((crc == Constants.CRCZero || crc == "") || md5 == Constants.MD5Zero || sha1 == Constants.SHA1Zero))
@@ -3575,9 +3575,9 @@ namespace SabreTools.Helper
HashData hashData = new HashData
{
Size = size,
CRC = RomTools.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = RomTools.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = RomTools.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
CRC = Style.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = Style.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = Style.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
Roms = new List<RomData>(),
};
hashData.Roms.Add(romData);

86
SabreTools.Helper/Tools/FileTools.cs
View File

@@ -1,4 +1,5 @@
using SharpCompress.Archive;
using DamienG.Security.Cryptography;
using SharpCompress.Archive;
using SharpCompress.Archive.SevenZip;
using SharpCompress.Common;
using SharpCompress.Reader;
@@ -7,6 +8,7 @@ using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Security.Cryptography;
using System.Text.RegularExpressions;
namespace SabreTools.Helper
@@ -141,7 +143,7 @@ namespace SabreTools.Helper
outdir = Path.GetFullPath(outdir);
// Now get the Rom info for the file so we have hashes and size
Rom rom = RomTools.GetSingleFileInfo(input);
Rom rom = FileTools.GetSingleFileInfo(input);
// If it doesn't exist, create the output file and then write
string outfile = Path.Combine(outdir, rom.HashData.SHA1 + ".gz");
@@ -575,6 +577,86 @@ namespace SabreTools.Helper
#region File Information Methods
/// <summary>
/// Retrieve file information for a single file
/// </summary>
/// <param name="input">Filename to get information from</param>
/// <param name="noMD5">True if MD5 hashes should not be calculated, false otherwise</param>
/// <param name="noSHA1">True if SHA-1 hashes should not be calcluated, false otherwise</param>
/// <returns>Populated RomData object if success, empty one on error</returns>
/// <remarks>Add read-offset for hash info</remarks>
public static Rom GetSingleFileInfo(string input, bool noMD5 = false, bool noSHA1 = false, long offset = 0)
{
// Add safeguard if file doesn't exist
if (!File.Exists(input))
{
return new Rom();
}
Rom rom = new Rom
{
Name = Path.GetFileName(input),
Type = ItemType.Rom,
HashData = new Hash
{
Size = (new FileInfo(input)).Length,
CRC = string.Empty,
MD5 = string.Empty,
SHA1 = string.Empty,
}
};
try
{
using (Crc32 crc = new Crc32())
using (MD5 md5 = MD5.Create())
using (SHA1 sha1 = SHA1.Create())
using (FileStream fs = File.OpenRead(input))
{
// Seek to the starting position, if one is set
if (offset > 0)
{
fs.Seek(offset, SeekOrigin.Begin);
}
byte[] buffer = new byte[1024];
int read;
while ((read = fs.Read(buffer, 0, buffer.Length)) > 0)
{
crc.TransformBlock(buffer, 0, read, buffer, 0);
if (!noMD5)
{
md5.TransformBlock(buffer, 0, read, buffer, 0);
}
if (!noSHA1)
{
sha1.TransformBlock(buffer, 0, read, buffer, 0);
}
}
crc.TransformFinalBlock(buffer, 0, 0);
rom.HashData.CRC = BitConverter.ToString(crc.Hash).Replace("-", "").ToLowerInvariant();
if (!noMD5)
{
md5.TransformFinalBlock(buffer, 0, 0);
rom.HashData.MD5 = BitConverter.ToString(md5.Hash).Replace("-", "").ToLowerInvariant();
}
if (!noSHA1)
{
sha1.TransformFinalBlock(buffer, 0, 0);
rom.HashData.SHA1 = BitConverter.ToString(sha1.Hash).Replace("-", "").ToLowerInvariant();
}
}
}
catch (IOException)
{
return new Rom();
}
return rom;
}
/// <summary>
/// Generate a list of RomData objects from the header values in an archive
/// </summary>

155
SabreTools.Helper/Tools/RomTools.cs
View File

@@ -1,95 +1,12 @@
using DamienG.Security.Cryptography;
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Security.Cryptography;
using System.Text.RegularExpressions;
namespace SabreTools.Helper
{
public class RomTools
{
/// <summary>
/// Retrieve file information for a single file
/// </summary>
/// <param name="input">Filename to get information from</param>
/// <param name="noMD5">True if MD5 hashes should not be calculated, false otherwise</param>
/// <param name="noSHA1">True if SHA-1 hashes should not be calcluated, false otherwise</param>
/// <returns>Populated RomData object if success, empty one on error</returns>
/// <remarks>Add read-offset for hash info</remarks>
public static Rom GetSingleFileInfo(string input, bool noMD5 = false, bool noSHA1 = false, long offset = 0)
{
// Add safeguard if file doesn't exist
if (!File.Exists(input))
{
return new Rom();
}
Rom rom = new Rom
{
Name = Path.GetFileName(input),
Type = ItemType.Rom,
HashData = new Hash
{
Size = (new FileInfo(input)).Length,
CRC = string.Empty,
MD5 = string.Empty,
SHA1 = string.Empty,
}
};
try
{
using (Crc32 crc = new Crc32())
using (MD5 md5 = MD5.Create())
using (SHA1 sha1 = SHA1.Create())
using (FileStream fs = File.OpenRead(input))
{
// Seek to the starting position, if one is set
if (offset > 0)
{
fs.Seek(offset, SeekOrigin.Begin);
}
byte[] buffer = new byte[1024];
int read;
while ((read = fs.Read(buffer, 0, buffer.Length)) > 0)
{
crc.TransformBlock(buffer, 0, read, buffer, 0);
if (!noMD5)
{
md5.TransformBlock(buffer, 0, read, buffer, 0);
}
if (!noSHA1)
{
sha1.TransformBlock(buffer, 0, read, buffer, 0);
}
}
crc.TransformFinalBlock(buffer, 0, 0);
rom.HashData.CRC = BitConverter.ToString(crc.Hash).Replace("-", "").ToLowerInvariant();
if (!noMD5)
{
md5.TransformFinalBlock(buffer, 0, 0);
rom.HashData.MD5 = BitConverter.ToString(md5.Hash).Replace("-", "").ToLowerInvariant();
}
if (!noSHA1)
{
sha1.TransformFinalBlock(buffer, 0, 0);
rom.HashData.SHA1 = BitConverter.ToString(sha1.Hash).Replace("-", "").ToLowerInvariant();
}
}
}
catch (IOException)
{
return new Rom();
}
return rom;
}
/// <summary>
/// Merge an arbitrary set of ROMs based on the supplied information
/// </summary>
@@ -488,75 +405,5 @@ namespace SabreTools.Helper
});
return true;
}
/// <summary>
/// Clean a hash string and pad to the correct size
/// </summary>
/// <param name="hash">Hash string to sanitize</param>
/// <param name="padding">Amount of characters to pad to</param>
/// <returns>Cleaned string</returns>
public static string CleanHashData(string hash, int padding)
{
// First get the hash to the correct length
hash = (String.IsNullOrEmpty(hash) ? "" : hash.Trim());
hash = (hash.StartsWith("0x") ? hash.Remove(0, 2) : hash);
hash = (hash == "-" ? "" : hash);
hash = (String.IsNullOrEmpty(hash) ? "" : hash.PadLeft(padding, '0'));
hash = hash.ToLowerInvariant();
// Then make sure that it has the correct characters
if (!Regex.IsMatch(hash, "[0-9a-f]{" + padding + "}"))
{
hash = "";
}
return hash;
}
/// <summary>
/// Clean a hash byte array and pad to the correct size
/// </summary>
/// <param name="hash">Hash byte array to sanitize</param>
/// <param name="padding">Amount of bytes to pad to</param>
/// <returns>Cleaned byte array</returns>
public static byte[] CleanHashData(byte[] hash, int padding)
{
// If we have a null hash or a <=0 padding, return the hash
if (hash == null || padding <= 0)
{
return hash;
}
// If we have a hash longer than the padding, trim and return
if (hash.Length > padding)
{
return hash.Take(padding).ToArray();
}
// If we have a hash of the correct length, return
if (hash.Length == padding)
{
return hash;
}
// Otherwise get the output byte array of the correct length
byte[] newhash = new byte[padding];
// Then write the proper number of empty bytes
int padNeeded = padding - hash.Length;
int index = 0;
for (index = 0; index < padNeeded; index++)
{
newhash[index] = 0x00;
}
// Now add the original hash
for (int i = 0; i < hash.Length; i++)
{
newhash[index + i] = hash[index];
}
return newhash;
}
}
}

71
SabreTools.Helper/Tools/Style.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
namespace SabreTools.Helper
@@ -210,6 +211,76 @@ namespace SabreTools.Helper
return outgame;
}
/// <summary>
/// Clean a hash string and pad to the correct size
/// </summary>
/// <param name="hash">Hash string to sanitize</param>
/// <param name="padding">Amount of characters to pad to</param>
/// <returns>Cleaned string</returns>
public static string CleanHashData(string hash, int padding)
{
// First get the hash to the correct length
hash = (String.IsNullOrEmpty(hash) ? "" : hash.Trim());
hash = (hash.StartsWith("0x") ? hash.Remove(0, 2) : hash);
hash = (hash == "-" ? "" : hash);
hash = (String.IsNullOrEmpty(hash) ? "" : hash.PadLeft(padding, '0'));
hash = hash.ToLowerInvariant();
// Then make sure that it has the correct characters
if (!Regex.IsMatch(hash, "[0-9a-f]{" + padding + "}"))
{
hash = "";
}
return hash;
}
/// <summary>
/// Clean a hash byte array and pad to the correct size
/// </summary>
/// <param name="hash">Hash byte array to sanitize</param>
/// <param name="padding">Amount of bytes to pad to</param>
/// <returns>Cleaned byte array</returns>
public static byte[] CleanHashData(byte[] hash, int padding)
{
// If we have a null hash or a <=0 padding, return the hash
if (hash == null || padding <= 0)
{
return hash;
}
// If we have a hash longer than the padding, trim and return
if (hash.Length > padding)
{
return hash.Take(padding).ToArray();
}
// If we have a hash of the correct length, return
if (hash.Length == padding)
{
return hash;
}
// Otherwise get the output byte array of the correct length
byte[] newhash = new byte[padding];
// Then write the proper number of empty bytes
int padNeeded = padding - hash.Length;
int index = 0;
for (index = 0; index < padNeeded; index++)
{
newhash[index] = 0x00;
}
// Now add the original hash
for (int i = 0; i < hash.Length; i++)
{
newhash[index + i] = hash[index];
}
return newhash;
}
#region Externally sourced methods
/// <summary>

2
SabreTools/DATFromDir.cs
View File

@@ -462,7 +462,7 @@ namespace SabreTools
private string ProcessFile(string item, StreamWriter sw, string basepath, string parent, Dat datdata, string lastparent)
{
_logger.Log(Path.GetFileName(item) + " treated like a file");
Rom rom = RomTools.GetSingleFileInfo(item, _noMD5, _noSHA1);
Rom rom = FileTools.GetSingleFileInfo(item, _noMD5, _noSHA1);
return ProcessFileHelper(item, rom, sw, basepath, parent, datdata, lastparent);
}

6
SimpleSort/SimpleSort.cs
View File

@@ -492,7 +492,7 @@ namespace SabreTools
// Hash and match the external files
if (shouldExternalScan)
{
Rom rom = RomTools.GetSingleFileInfo(input);
Rom rom = FileTools.GetSingleFileInfo(input);
// If we have a blank RomData, it's an error
if (rom.Name == null)
@@ -558,7 +558,7 @@ namespace SabreTools
// Otherwise, apply the rule ot the file
string newinput = input + ".new";
Skippers.TransformFile(input, newinput, rule, _logger);
Rom drom = RomTools.GetSingleFileInfo(newinput);
Rom drom = FileTools.GetSingleFileInfo(newinput);
// If we have a blank RomData, it's an error
if (drom.Name == null)
@@ -841,7 +841,7 @@ namespace SabreTools
FileTools.ExtractArchive(Path.GetFullPath(archive), temparcdir, _logger);
foreach (string tempfile in Directory.EnumerateFiles(temparcdir, "*", SearchOption.AllDirectories))
{
roms.Add(RomTools.GetSingleFileInfo(Path.GetFullPath(tempfile)));
roms.Add(FileTools.GetSingleFileInfo(Path.GetFullPath(tempfile)));
}
// Clear the temporary archive directory