[RomManipulation] Further improvment to parsing

This commit is contained in:
Matt Nadareski
2016-06-10 14:49:07 -07:00
parent 30a760abc2
commit b4c84ac362
2 changed files with 24 additions and 0 deletions

View File

@@ -285,18 +285,30 @@ namespace SabreTools.Helper
rom.CRC = (rom.CRC == "-" ? "" : rom.CRC);
rom.CRC = (rom.CRC == "" ? "" : rom.CRC.PadLeft(8, '0'));
}
else
{
rom.CRC = "";
}
if (rom.MD5 != null)
{
rom.MD5 = (rom.MD5.StartsWith("0x") ? rom.MD5.Remove(0, 2) : rom.MD5);
rom.MD5 = (rom.MD5 == "-" ? "" : rom.MD5);
rom.MD5 = (rom.MD5 == "" ? "" : rom.MD5.PadLeft(32, '0'));
}
else
{
rom.MD5 = "";
}
if (rom.SHA1 != null)
{
rom.SHA1 = (rom.SHA1.StartsWith("0x") ? rom.SHA1.Remove(0, 2) : rom.SHA1);
rom.SHA1 = (rom.SHA1 == "-" ? "" : rom.SHA1);
rom.SHA1 = (rom.SHA1 == "" ? "" : rom.SHA1.PadLeft(40, '0'));
}
else
{
rom.SHA1 = "";
}
// 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 == "rom" && (rom.Size == 0 || rom.Size == -1) && ((rom.CRC == Constants.CRCZero || rom.CRC == "") || rom.MD5 == Constants.MD5Zero || rom.SHA1 == Constants.SHA1Zero))
@@ -569,18 +581,30 @@ namespace SabreTools.Helper
rom.CRC = (rom.CRC == "-" ? "" : rom.CRC);
rom.CRC = (rom.CRC == "" ? "" : rom.CRC.PadLeft(8, '0'));
}
else
{
rom.CRC = "";
}
if (rom.MD5 != null)
{
rom.MD5 = (rom.MD5.StartsWith("0x") ? rom.MD5.Remove(0, 2) : rom.MD5);
rom.MD5 = (rom.MD5 == "-" ? "" : rom.MD5);
rom.MD5 = (rom.MD5 == "" ? "" : rom.MD5.PadLeft(32, '0'));
}
else
{
rom.MD5 = "";
}
if (rom.SHA1 != null)
{
rom.SHA1 = (rom.SHA1.StartsWith("0x") ? rom.SHA1.Remove(0, 2) : rom.SHA1);
rom.SHA1 = (rom.SHA1 == "-" ? "" : rom.SHA1);
rom.SHA1 = (rom.SHA1 == "" ? "" : rom.SHA1.PadLeft(40, '0'));
}
else
{
rom.SHA1 = "";
}
// 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 == "rom" && (rom.Size == 0 || rom.Size == -1) && ((rom.CRC == Constants.CRCZero || rom.CRC == "") || rom.MD5 == Constants.MD5Zero || rom.SHA1 == Constants.SHA1Zero))

Binary file not shown.