diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index f1e3d638..f4bf9fcb 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -1309,7 +1309,7 @@ Make a selection: if (File.Exists(filename)) { - logger.User("Converting " + filename); + logger.User("Converting \"" + Path.GetFileName(filename) + "\""); DatData datdata = new DatData { Name = "", @@ -1348,7 +1348,7 @@ Make a selection: foreach (string file in Directory.EnumerateFiles(filename, "*", SearchOption.AllDirectories)) { - logger.User("Converting " + file); + logger.User("Converting \"" + Path.GetFullPath(file).Remove(0, filename.Length + 1) + "\""); DatData datdata = new DatData { Name = "", diff --git a/SabreHelper/Converters.cs b/SabreHelper/Converters.cs index 42ffbd6f..420806e1 100644 --- a/SabreHelper/Converters.cs +++ b/SabreHelper/Converters.cs @@ -75,6 +75,11 @@ namespace SabreTools.Helper { continue; } + // Special case for nodump... + else if (gc[i] == "nodump" && attrib != "status" && attrib != "flags") + { + temp.SetAttributeValue("status", "nodump"); + } // Even number of quotes, not in a quote, not in attribute else if (Regex.Matches(gc[i], "\"").Count % 2 == 0 && !quote && attrib == "") { diff --git a/SabreHelper/RomManipulation.cs b/SabreHelper/RomManipulation.cs index 483b6407..47eac922 100644 --- a/SabreHelper/RomManipulation.cs +++ b/SabreHelper/RomManipulation.cs @@ -55,7 +55,7 @@ namespace SabreTools.Helper /// The XmlTextReader representing the (possibly converted) file, null otherwise public static XmlTextReader GetXmlTextReader(string filename, Logger logger) { - logger.Log("Attempting to read file: " + filename); + logger.Log("Attempting to read file: \"" + filename + "\""); // Check if file exists if (!File.Exists(filename)) @@ -291,7 +291,8 @@ namespace SabreTools.Helper // If the rom is nodump, skip it if (xtr.GetAttribute("flags") == "nodump" || xtr.GetAttribute("status") == "nodump") { - logger.Log("Nodump detected; skipping..."); + logger.Log("Nodump detected: " + + (xtr.GetAttribute("name") != null && xtr.GetAttribute("name") != "" ? "\"" + xtr.GetAttribute("name") + "\"" : "ROM NAME NOT FOUND") + "; skipping..."); break; } @@ -342,7 +343,7 @@ namespace SabreTools.Helper // If the file has no size and it's not the above case, skip and log else if (subreader.Name == "rom" && (size == 0 || size == -1)) { - logger.Warning("Potentially incomplete entry found for " + xtr.GetAttribute("name")); + logger.Warning("Potentially incomplete entry found for \"" + xtr.GetAttribute("name") + "\""); break; }