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

[DatFile] Clean up CMP parsing, add exception handling

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-01 10:10:36 -08:00
parent 3349be25d1
commit 02874111bd
1 changed files with 69 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
View File

@@ -101,6 +101,8 @@ namespace SabreTools.Helper.Dats
DatFormat = (DatFormat == 0 ? FileTools.GetDatFormat(filename, logger) : DatFormat); DatFormat = (DatFormat == 0 ? FileTools.GetDatFormat(filename, logger) : DatFormat);
// Now parse the correct type of DAT // Now parse the correct type of DAT
try
{
switch (FileTools.GetDatFormat(filename, logger)) switch (FileTools.GetDatFormat(filename, logger))
{ {
case DatFormat.AttractMode: case DatFormat.AttractMode:
@@ -146,6 +148,11 @@ namespace SabreTools.Helper.Dats
default: default:
return; return;
} }
}
catch (Exception ex)
{
logger.Error("Error with file '" + filename + "': " + ex.ToString());
}
// If we are using tags from the DAT, set the proper input for split type unless overridden // If we are using tags from the DAT, set the proper input for split type unless overridden
if (useTags && splitType == SplitType.None) if (useTags && splitType == SplitType.None)
@@ -565,36 +572,34 @@ namespace SabreTools.Helper.Dats
// Regular attributes // Regular attributes
case "name": case "name":
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
item.Name = quoteless; item.Name = quoteless;
break; break;
case "size": case "size":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", ""); if (Int64.TryParse(quoteless, out long size))
long size = -1;
if (Int64.TryParse(quoteless, out size))
{ {
((Rom)item).Size = size; ((Rom)item).Size = size;
} }
else
{
((Rom)item).Size = -1;
}
} }
break; break;
case "crc": case "crc":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).CRC = quoteless.ToLowerInvariant(); ((Rom)item).CRC = quoteless.ToLowerInvariant();
} }
break; break;
case "md5": case "md5":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).MD5 = quoteless.ToLowerInvariant(); ((Rom)item).MD5 = quoteless.ToLowerInvariant();
} }
else if (item.Type == ItemType.Disk) else if (item.Type == ItemType.Disk)
@@ -607,63 +612,54 @@ namespace SabreTools.Helper.Dats
case "sha1": case "sha1":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).SHA1 = quoteless.ToLowerInvariant(); ((Rom)item).SHA1 = quoteless.ToLowerInvariant();
} }
else if (item.Type == ItemType.Disk) else if (item.Type == ItemType.Disk)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Disk)item).SHA1 = quoteless.ToLowerInvariant(); ((Disk)item).SHA1 = quoteless.ToLowerInvariant();
} }
break; break;
case "sha256": case "sha256":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).SHA256 = quoteless.ToLowerInvariant(); ((Rom)item).SHA256 = quoteless.ToLowerInvariant();
} }
else if (item.Type == ItemType.Disk) else if (item.Type == ItemType.Disk)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Disk)item).SHA256 = quoteless.ToLowerInvariant(); ((Disk)item).SHA256 = quoteless.ToLowerInvariant();
} }
break; break;
case "sha384": case "sha384":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).SHA384 = quoteless.ToLowerInvariant(); ((Rom)item).SHA384 = quoteless.ToLowerInvariant();
} }
else if (item.Type == ItemType.Disk) else if (item.Type == ItemType.Disk)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Disk)item).SHA384 = quoteless.ToLowerInvariant(); ((Disk)item).SHA384 = quoteless.ToLowerInvariant();
} }
break; break;
case "sha512": case "sha512":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Rom)item).SHA512 = quoteless.ToLowerInvariant(); ((Rom)item).SHA512 = quoteless.ToLowerInvariant();
} }
else if (item.Type == ItemType.Disk) else if (item.Type == ItemType.Disk)
{ {
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
((Disk)item).SHA512 = quoteless.ToLowerInvariant(); ((Disk)item).SHA512 = quoteless.ToLowerInvariant();
} }
break; break;
case "status": case "status":
case "flags": case "flags":
i++; quoteless = gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "");
if (quoteless.ToLowerInvariant() == "good") if (quoteless.ToLowerInvariant() == "good")
{ {
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
@@ -712,8 +708,7 @@ namespace SabreTools.Helper.Dats
case "date": case "date":
if (item.Type == ItemType.Rom) if (item.Type == ItemType.Rom)
{ {
i++; quoteless = gc[++i].Replace("\"", "") + " " + gc[++i].Replace("\"", "");
quoteless = gc[i].Replace("\"", "") + " " + gc[i + 1].Replace("\"", "");
((Rom)item).Date = quoteless; ((Rom)item).Date = quoteless;
} }
i++; i++;