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

[DatTools] Better hashing

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-13 23:01:52 -07:00
parent 49bde7c33f
commit b70f8e1a4e
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1990,8 +1990,10 @@ namespace SabreTools.Helper
/// 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>
public static RomData GetSingleFileInfo(string input)
public static RomData GetSingleFileInfo(string input, bool noMD5 = false, bool noSHA1 = false)
{
RomData rom = new RomData
{
@@ -2005,24 +2007,39 @@ namespace SabreTools.Helper
try
{
Crc32 crc = new Crc32();
MD5 md5 = MD5.Create();
SHA1 sha1 = SHA1.Create();
using (Crc32 crc = new Crc32())
using (MD5 md5 = MD5.Create())
using (SHA1 sha1 = SHA1.Create())
using (FileStream fs = File.OpenRead(input))
{
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);
}
}
using (FileStream fs = File.Open(input, FileMode.Open))
crc.TransformFinalBlock(buffer, 0, 0);
rom.CRC = BitConverter.ToString(crc.Hash).Replace("-", "").ToLowerInvariant();
if (!noMD5)
{
foreach (byte b in crc.ComputeHash(fs))
{
rom.CRC += b.ToString("x2").ToLowerInvariant();
md5.TransformFinalBlock(buffer, 0, 0);
rom.MD5 = BitConverter.ToString(md5.Hash).Replace("-", "").ToLowerInvariant();
}
}
using (FileStream fs = File.Open(input, FileMode.Open))
if (!noSHA1)
{
rom.MD5 = BitConverter.ToString(md5.ComputeHash(fs)).Replace("-", "").ToLowerInvariant();
sha1.TransformFinalBlock(buffer, 0, 0);
rom.SHA1 = BitConverter.ToString(sha1.Hash).Replace("-", "").ToLowerInvariant();
}
using (FileStream fs = File.Open(input, FileMode.Open))
{
rom.SHA1 = BitConverter.ToString(sha1.ComputeHash(fs)).Replace("-", "").ToLowerInvariant();
}
}
catch (IOException)

2
SabreTools/DATFromDir.cs
View File

@@ -371,7 +371,7 @@ namespace SabreTools
private string ProcessFile(string item, StreamWriter sw, string basepath, string parent, DatData datdata, string lastparent)
{
_logger.Log(Path.GetFileName(item) + " treated like a file");
RomData rom = DatTools.GetSingleFileInfo(item);
RomData rom = DatTools.GetSingleFileInfo(item, _noMD5, _noSHA1);
try
{