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

Handle blank folders in DATFromDir and output alike

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-19 10:28:53 -07:00
parent b10e5e9502
commit 41063921f2
4 changed files with 222 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
SabreHelper/RomManipulation.cs
View File

@@ -102,7 +102,7 @@ namespace SabreTools.Helper
{
// Prepare all internal variables
XmlReader subreader, headreader, flagreader;
bool superdat = false, shouldbreak = false, nodump = false;
bool superdat = false, shouldbreak = false, nodump = false, empty = true;
string key = "", crc = "", md5 = "", sha1 = "";
long size = -1;
List<string> parent = new List<string>();
@@ -113,16 +113,50 @@ namespace SabreTools.Helper
xtr.MoveToContent();
while (xtr.NodeType != XmlNodeType.None)
{
// If we have an end folder element, remove one item from the parent, if possible
if (xtr.NodeType == XmlNodeType.EndElement && (xtr.Name == "directory" || xtr.Name == "dir") && parent.Count > 0)
// If we're ending a folder or game, take care of possibly empty games and removing from the parent
if (xtr.NodeType == XmlNodeType.EndElement && (xtr.Name == "directory" || xtr.Name == "dir"))
{
parent.RemoveAt(parent.Count - 1);
if (keep)
// If we didn't find any items in the folder, make sure to add the blank rom
if (empty)
{
datdata.Type = (String.IsNullOrEmpty(datdata.Type) ? "SuperDAT" : datdata.Type);
RomData rom = new RomData
{
Name = "null",
Game = String.Join("\\", parent),
Size = -1,
CRC = "null",
MD5 = "null",
SHA1 = "null",
};
key = rom.Size + "-" + rom.CRC;
if (datdata.Roms.ContainsKey(key))
{
datdata.Roms[key].Add(rom);
}
else
{
List<RomData> temp = new List<RomData>();
temp.Add(rom);
datdata.Roms.Add(key, temp);
}
}
// Regardless, end the current folder
empty = true;
// If we have an end folder element, remove one item from the parent, if possible
if (parent.Count > 0)
{
parent.RemoveAt(parent.Count - 1);
if (keep)
{
datdata.Type = (String.IsNullOrEmpty(datdata.Type) ? "SuperDAT" : datdata.Type);
}
}
}
// We only want elements
if (xtr.NodeType != XmlNodeType.Element)
{
@@ -395,6 +429,8 @@ namespace SabreTools.Helper
{
case "rom":
case "disk":
empty = false;
// If the rom is nodump, flag it
nodump = false;
if (xtr.GetAttribute("flags") == "nodump" || xtr.GetAttribute("status") == "nodump")
@@ -498,6 +534,37 @@ namespace SabreTools.Helper
}
}
// If we didn't find any items in the folder, make sure to add the blank rom
if (empty)
{
tempname = (parent.Count > 0 ? String.Join("\\", parent) + Path.DirectorySeparatorChar : "") + tempname;
RomData rom = new RomData
{
Name = "null",
Game = tempname,
Size = -1,
CRC = "null",
MD5 = "null",
SHA1 = "null",
};
key = rom.Size + "-" + rom.CRC;
if (datdata.Roms.ContainsKey(key))
{
datdata.Roms[key].Add(rom);
}
else
{
List<RomData> temp = new List<RomData>();
temp.Add(rom);
datdata.Roms.Add(key, temp);
}
}
// Regardless, end the current folder
empty = true;
// Read to next game
if (!xtr.ReadToNextSibling(temptype))
{
@@ -521,6 +588,8 @@ namespace SabreTools.Helper
xtr.Read();
break;
case "file":
empty = false;
// If the rom is nodump, flag it
nodump = false;
flagreader = xtr.ReadSubtree();