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] Make the process smoother for parsing

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-30 11:50:02 -07:00
parent 810bbf501a
commit 4e956754c2
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.Helper/Objects/Dat/DatFile.cs
View File

@@ -1221,6 +1221,7 @@ namespace SabreTools.Helper
case OutputFormat.OfflineList: case OutputFormat.OfflineList:
case OutputFormat.SabreDat: case OutputFormat.SabreDat:
case OutputFormat.SoftwareList: case OutputFormat.SoftwareList:
case OutputFormat.Xml:
ParseXML(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist); ParseXML(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist);
break; break;
case OutputFormat.RedumpMD5: case OutputFormat.RedumpMD5:
@@ -1235,9 +1236,6 @@ namespace SabreTools.Helper
case OutputFormat.RomCenter: case OutputFormat.RomCenter:
ParseRC(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, clean); ParseRC(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, clean);
break; break;
case OutputFormat.Xml:
ParseXMLString(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist);
break;
default: default:
return; return;
} }
@@ -2241,6 +2239,19 @@ namespace SabreTools.Helper
return; return;
} }
// Check if the input has invalid characters. If it does, then close the reader and use the string version
try
{
XElement x = XElement.Load(xtr, LoadOptions.None);
x = null;
}
catch
{
xtr.Dispose();
ParseXMLString(filename, sysid, srcid, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, itemStatus, trim, single, root, logger, keep, clean, softlist);
return;
}
// Otherwise, read the file to the end // Otherwise, read the file to the end
try try
{ {