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

[Logiqx] Re-introduce support for <dir> tags

Browse Source
This commit is contained in:
Matt Nadareski
2018-02-09 18:21:48 -08:00
parent ccbae68ec1
commit d4d0e1b5cd
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SabreTools.Library/DatFiles/Logiqx.cs
View File

@@ -66,6 +66,7 @@ namespace SabreTools.Library.DatFiles
// Prepare all internal variables // Prepare all internal variables
Encoding enc = Utilities.GetEncoding(filename); Encoding enc = Utilities.GetEncoding(filename);
XmlReader xtr = Utilities.GetXmlTextReader(filename); XmlReader xtr = Utilities.GetXmlTextReader(filename);
List<string> dirs = new List<string>();
// If we got a null reader, just return // If we got a null reader, just return
if (xtr == null) if (xtr == null)
@@ -82,6 +83,12 @@ namespace SabreTools.Library.DatFiles
// We only want elements // We only want elements
if (xtr.NodeType != XmlNodeType.Element) if (xtr.NodeType != XmlNodeType.Element)
{ {
// If we're ending a dir, remove the last item from the dirs list, if possible
if (xtr.Name == "dir" && dirs.Count > 0)
{
dirs.RemoveAt(dirs.Count - 1);
}
xtr.Read(); xtr.Read();
continue; continue;
} }
@@ -101,10 +108,16 @@ namespace SabreTools.Library.DatFiles
// Skip the header node now that we've processed it // Skip the header node now that we've processed it
xtr.Skip(); xtr.Skip();
break; break;
// Unique to RomVault-created DATs
case "dir":
Type = "SuperDAT";
dirs.Add(xtr.GetAttribute("name") ?? "");
xtr.Read();
break;
// We want to process the entire subtree of the game // We want to process the entire subtree of the game
case "machine": // New-style Logiqx case "machine": // New-style Logiqx
case "game": // Old-style Logiqx case "game": // Old-style Logiqx
ReadMachine(xtr.ReadSubtree(), filename, sysid, srcid, keep, clean, remUnicode); ReadMachine(xtr.ReadSubtree(), dirs, filename, sysid, srcid, keep, clean, remUnicode);
// Skip the machine now that we've processed it // Skip the machine now that we've processed it
xtr.Skip(); xtr.Skip();
@@ -271,6 +284,8 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Read game/machine information /// Read game/machine information
/// </summary> /// </summary>
/// <param name="reader">XmlReader to use to parse the machine</param>
/// <param name="dirs">List of dirs to prepend to the game name</param>
/// <param name="filename">Name of the file to be parsed</param> /// <param name="filename">Name of the file to be parsed</param>
/// <param name="sysid">System ID for the DAT</param> /// <param name="sysid">System ID for the DAT</param>
/// <param name="srcid">Source ID for the DAT</param> /// <param name="srcid">Source ID for the DAT</param>
@@ -279,6 +294,7 @@ namespace SabreTools.Library.DatFiles
/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param> /// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
private void ReadMachine( private void ReadMachine(
XmlReader reader, XmlReader reader,
List<string> dirs,
// Standard Dat parsing // Standard Dat parsing
string filename, string filename,
@@ -302,7 +318,6 @@ namespace SabreTools.Library.DatFiles
string key = ""; string key = "";
string temptype = reader.Name; string temptype = reader.Name;
bool containsItems = false; bool containsItems = false;
List<string> parent = new List<string>();
// Create a new machine // Create a new machine
MachineType machineType = MachineType.NULL; MachineType machineType = MachineType.NULL;
@@ -319,10 +334,11 @@ namespace SabreTools.Library.DatFiles
machineType |= MachineType.Mechanical; machineType |= MachineType.Mechanical;
} }
string dirsString = (dirs != null && dirs.Count() > 0 ? string.Join("/", dirs) + "/" : "");
Machine machine = new Machine Machine machine = new Machine
{ {
Name = reader.GetAttribute("name"), Name = dirsString + reader.GetAttribute("name"),
Description = reader.GetAttribute("name"), Description = dirsString + reader.GetAttribute("name"),
SourceFile = reader.GetAttribute("sourcefile"), SourceFile = reader.GetAttribute("sourcefile"),
Board = reader.GetAttribute("board"), Board = reader.GetAttribute("board"),
RebuildTo = reader.GetAttribute("rebuildto"), RebuildTo = reader.GetAttribute("rebuildto"),
@@ -345,11 +361,6 @@ namespace SabreTools.Library.DatFiles
machine.Name = tempout; machine.Name = tempout;
} }
} }
// Get the name of the game from the parent
else if (Type == "SuperDAT" && keep && parent.Count > 0)
{
machine.Name = String.Join("\\", parent) + "\\" + machine.Name;
}
while (!reader.EOF) while (!reader.EOF)
{ {