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

Slight code consolodation

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-20 15:37:49 -07:00
parent f82152e0a6
commit ac575438a1
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
SabreHelper/RomManipulation.cs
View File

@@ -29,15 +29,13 @@ namespace SabreTools.Helper
}
/// <summary>
/// Get the name of the DAT for external use
/// Get the XmlDocument associated with a file, if possible
/// </summary>
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="logger">Logger object for console and file output</param>
/// <returns>The internal name of the DAT on success, empty string otherwise</returns>
public static string GetDatName(string filename, Logger logger)
/// <returns>The XmlDocument representing the (possibly converted) file, null otherwise</returns>
public static XmlDocument GetXmlDocument(string filename, Logger logger)
{
string name = "";
XmlDocument doc = new XmlDocument();
try
{
@@ -52,12 +50,32 @@ namespace SabreTools.Helper
catch (Exception ex)
{
logger.Error(ex.ToString());
return name;
return null;
}
}
catch (Exception ex)
{
logger.Error(ex.ToString());
return null;
}
return doc;
}
/// <summary>
/// Get the name of the DAT for external use
/// </summary>
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="logger">Logger object for console and file output</param>
/// <returns>The internal name of the DAT on success, empty string otherwise</returns>
public static string GetDatName(string filename, Logger logger)
{
string name = "";
XmlDocument doc = GetXmlDocument(filename, logger);
// If the returned document is null, return the blank string
if (doc == null)
{
return name;
}
@@ -100,26 +118,11 @@ namespace SabreTools.Helper
List<RomData> roms = new List<RomData>();
bool superdat = false;
XmlDocument doc = new XmlDocument();
try
XmlDocument doc = GetXmlDocument(filename, logger);
// If the returned document is null, return the empty list
if (doc == null)
{
doc.LoadXml(File.ReadAllText(filename));
}
catch (XmlException)
{
try
{
doc.LoadXml(Converters.RomVaultToXML(File.ReadAllLines(filename)).ToString());
}
catch (Exception ex)
{
logger.Error(ex.ToString());
return roms;
}
}
catch (Exception ex)
{
logger.Error(ex.ToString());
return roms;
}