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

[Style] Move StringToByteArray to Style where it belongs

Browse Source
This commit is contained in:
Matt Nadareski
2016-08-29 16:34:35 -07:00
parent 0b97b046c8
commit a1a7e411d5
3 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -682,8 +682,8 @@ namespace SabreTools.Helper
{ {
// Write standard header and TGZ info // Write standard header and TGZ info
byte[] data = Constants.TorrentGZHeader byte[] data = Constants.TorrentGZHeader
.Concat(StringToByteArray(rom.HashData.MD5)) // MD5 .Concat(Style.StringToByteArray(rom.HashData.MD5)) // MD5
.Concat(StringToByteArray(rom.HashData.CRC)) // CRC .Concat(Style.StringToByteArray(rom.HashData.CRC)) // CRC
.Concat(BitConverter.GetBytes(rom.HashData.Size).Reverse().ToArray()) // Long size (Mirrored) .Concat(BitConverter.GetBytes(rom.HashData.Size).Reverse().ToArray()) // Long size (Mirrored)
.ToArray(); .ToArray();
sw.Write(data); sw.Write(data);
@@ -840,17 +840,7 @@ namespace SabreTools.Helper
} }
} }
/// <summary>
/// http://stackoverflow.com/questions/311165/how-do-you-convert-byte-array-to-hexadecimal-string-and-vice-versa
/// </summary>
public static byte[] StringToByteArray(String hex)
{
int NumberChars = hex.Length;
byte[] bytes = new byte[NumberChars / 2];
for (int i = 0; i < NumberChars; i += 2)
bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16);
return bytes;
}
#region Hash-to-Dat functions #region Hash-to-Dat functions

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

@@ -2441,13 +2441,13 @@ namespace SabreTools.Helper
Int64.TryParse(gc[i].Replace("\"", ""), out hashData.Size); Int64.TryParse(gc[i].Replace("\"", ""), out hashData.Size);
break; break;
case "crc": case "crc":
hashData.CRC = ArchiveTools.StringToByteArray(gc[i].Replace("\"", "")); hashData.CRC = Style.StringToByteArray(gc[i].Replace("\"", ""));
break; break;
case "md5": case "md5":
hashData.MD5 = ArchiveTools.StringToByteArray(gc[i].Replace("\"", "")); hashData.MD5 = Style.StringToByteArray(gc[i].Replace("\"", ""));
break; break;
case "sha1": case "sha1":
hashData.SHA1 = ArchiveTools.StringToByteArray(gc[i].Replace("\"", "")); hashData.SHA1 = Style.StringToByteArray(gc[i].Replace("\"", ""));
break; break;
case "flags": case "flags":
if (gc[i].Replace("\"", "").ToLowerInvariant() == "nodump") if (gc[i].Replace("\"", "").ToLowerInvariant() == "nodump")
@@ -2498,13 +2498,13 @@ namespace SabreTools.Helper
Int64.TryParse(val, out hashData.Size); Int64.TryParse(val, out hashData.Size);
break; break;
case "crc": case "crc":
hashData.CRC = ArchiveTools.StringToByteArray(val); hashData.CRC = Style.StringToByteArray(val);
break; break;
case "md5": case "md5":
hashData.MD5 = ArchiveTools.StringToByteArray(val); hashData.MD5 = Style.StringToByteArray(val);
break; break;
case "sha1": case "sha1":
hashData.SHA1 = ArchiveTools.StringToByteArray(val); hashData.SHA1 = Style.StringToByteArray(val);
break; break;
case "flags": case "flags":
if (val.ToLowerInvariant() == "nodump") if (val.ToLowerInvariant() == "nodump")
@@ -2806,7 +2806,7 @@ namespace SabreTools.Helper
HashData hashData = new HashData HashData hashData = new HashData
{ {
Size = Int64.Parse(rominfo[7]), Size = Int64.Parse(rominfo[7]),
CRC = ArchiveTools.StringToByteArray(rominfo[6]), CRC = Style.StringToByteArray(rominfo[6]),
}; };
// Sanitize the hashes from null, hex sizes, and "true blank" strings // Sanitize the hashes from null, hex sizes, and "true blank" strings
@@ -3361,9 +3361,9 @@ namespace SabreTools.Helper
HashData hashData = new HashData HashData hashData = new HashData
{ {
Size = size, Size = size,
CRC = RomTools.CleanHashData(ArchiveTools.StringToByteArray(crc), Constants.CRCBytesLength), CRC = RomTools.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = RomTools.CleanHashData(ArchiveTools.StringToByteArray(md5), Constants.MD5BytesLength), MD5 = RomTools.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = RomTools.CleanHashData(ArchiveTools.StringToByteArray(sha1), Constants.SHA1BytesLength), SHA1 = RomTools.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
Roms = new List<RomData>(), Roms = new List<RomData>(),
}; };
hashData.Roms.Add(romData); hashData.Roms.Add(romData);
@@ -3587,9 +3587,9 @@ namespace SabreTools.Helper
HashData hashData = new HashData HashData hashData = new HashData
{ {
Size = size, Size = size,
CRC = RomTools.CleanHashData(ArchiveTools.StringToByteArray(crc), Constants.CRCBytesLength), CRC = RomTools.CleanHashData(Style.StringToByteArray(crc), Constants.CRCBytesLength),
MD5 = RomTools.CleanHashData(ArchiveTools.StringToByteArray(md5), Constants.MD5BytesLength), MD5 = RomTools.CleanHashData(Style.StringToByteArray(md5), Constants.MD5BytesLength),
SHA1 = RomTools.CleanHashData(ArchiveTools.StringToByteArray(sha1), Constants.SHA1BytesLength), SHA1 = RomTools.CleanHashData(Style.StringToByteArray(sha1), Constants.SHA1BytesLength),
Roms = new List<RomData>(), Roms = new List<RomData>(),
}; };
hashData.Roms.Add(romData); hashData.Roms.Add(romData);

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

@@ -210,6 +210,8 @@ namespace SabreTools.Helper
return outgame; return outgame;
} }
#region Externally sourced methods
/// <summary> /// <summary>
/// Returns the human-readable file size for an arbitrary, 64-bit file size /// Returns the human-readable file size for an arbitrary, 64-bit file size
/// The default format is "0.### XB", e.g. "4.2 KB" or "1.434 GB" /// The default format is "0.### XB", e.g. "4.2 KB" or "1.434 GB"
@@ -280,5 +282,19 @@ namespace SabreTools.Helper
string sentence = input.ToLower(); string sentence = input.ToLower();
return sentence[0].ToString().ToUpper() + sentence.Substring(1); return sentence[0].ToString().ToUpper() + sentence.Substring(1);
} }
/// <summary>
/// http://stackoverflow.com/questions/311165/how-do-you-convert-byte-array-to-hexadecimal-string-and-vice-versa
/// </summary>
public static byte[] StringToByteArray(String hex)
{
int NumberChars = hex.Length;
byte[] bytes = new byte[NumberChars / 2];
for (int i = 0; i < NumberChars; i += 2)
bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16);
return bytes;
}
#endregion
} }
} }