diff --git a/RombaSharp/Partials/RombaSharp_Helpers.cs b/RombaSharp/Partials/RombaSharp_Helpers.cs index d7568ba5..e26da279 100644 --- a/RombaSharp/Partials/RombaSharp_Helpers.cs +++ b/RombaSharp/Partials/RombaSharp_Helpers.cs @@ -33,7 +33,7 @@ namespace SabreTools Dictionary> depots = new Dictionary>(); // Get the XML text reader for the configuration file, if possible - XmlTextReader xtr = DatFile.GetXmlTextReader(_config, _logger); + XmlTextReader xtr = FileTools.GetXmlTextReader(_config, _logger); // Now parse the XML file for settings if (xtr != null) diff --git a/SabreTools.Helper/Objects/Dat/DatFile.cs b/SabreTools.Helper/Objects/Dat/DatFile.cs index 51138281..73a23f8f 100644 --- a/SabreTools.Helper/Objects/Dat/DatFile.cs +++ b/SabreTools.Helper/Objects/Dat/DatFile.cs @@ -519,30 +519,6 @@ namespace SabreTools.Helper } } - /// - /// Get the XmlTextReader associated with a file, if possible - /// - /// Name of the file to be parsed - /// Logger object for console and file output - /// The XmlTextReader representing the (possibly converted) file, null otherwise - public static XmlTextReader GetXmlTextReader(string filename, Logger logger) - { - logger.Log("Attempting to read file: \"" + filename + "\""); - - // Check if file exists - if (!File.Exists(filename)) - { - logger.Warning("File '" + filename + "' could not read from!"); - return null; - } - - XmlTextReader xtr; - xtr = new XmlTextReader(filename); - xtr.WhitespaceHandling = WhitespaceHandling.None; - xtr.DtdProcessing = DtdProcessing.Ignore; - return xtr; - } - /// /// Parse a DAT and return all found games and roms within /// @@ -1509,7 +1485,7 @@ namespace SabreTools.Helper ItemStatus its = ItemStatus.None; List parent = new List(); - XmlTextReader xtr = GetXmlTextReader(filename, logger); + XmlTextReader xtr = FileTools.GetXmlTextReader(filename, logger); if (xtr != null) { xtr.MoveToContent(); diff --git a/SabreTools.Helper/Skippers/Skippers.cs b/SabreTools.Helper/Skippers/Skippers.cs index f01a8cc8..e463674b 100644 --- a/SabreTools.Helper/Skippers/Skippers.cs +++ b/SabreTools.Helper/Skippers/Skippers.cs @@ -80,7 +80,7 @@ namespace SabreTools.Helper } Logger logger = new Logger(false, ""); - XmlTextReader xtr = DatFile.GetXmlTextReader(filename, logger); + XmlTextReader xtr = FileTools.GetXmlTextReader(filename, logger); if (xtr == null) { diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs index 2c6cd695..3005c657 100644 --- a/SabreTools.Helper/Tools/FileTools.cs +++ b/SabreTools.Helper/Tools/FileTools.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text.RegularExpressions; using System.Threading.Tasks; +using System.Xml; namespace SabreTools.Helper { @@ -1080,6 +1081,30 @@ namespace SabreTools.Helper #region File Manipulation + /// + /// Get the XmlTextReader associated with a file, if possible + /// + /// Name of the file to be parsed + /// Logger object for console and file output + /// The XmlTextReader representing the (possibly converted) file, null otherwise + public static XmlTextReader GetXmlTextReader(string filename, Logger logger) + { + logger.Log("Attempting to read file: \"" + filename + "\""); + + // Check if file exists + if (!File.Exists(filename)) + { + logger.Warning("File '" + filename + "' could not read from!"); + return null; + } + + XmlTextReader xtr; + xtr = new XmlTextReader(filename); + xtr.WhitespaceHandling = WhitespaceHandling.None; + xtr.DtdProcessing = DtdProcessing.Ignore; + return xtr; + } + /// /// Remove an arbitrary number of bytes from the inputted file ///