claunia/RomVault
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up Natalia Portillo's Mess Bios xml Reader.

Browse Source
This commit is contained in:
gjefferyes
2015-09-16 17:41:26 -05:00
parent dc99d2328d
commit 33f204fc37
1 changed files with 47 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
ROMVault2/DatReaders/DatMessBIOSReader.cs
View File

@@ -15,40 +15,6 @@ namespace ROMVault2.DatReaders
{ {
public static class DatMessBIOSXmlReader public static class DatMessBIOSXmlReader
{ {
private static bool _cleanFileNames = true;
public static bool ReadDat(ref RvDir tDat, XmlDocument doc)
{
FileType thisFileType = FileType.Unknown;
if (!LoadHeaderFromDat(ref tDat, ref doc, ref thisFileType))
return false;
if (doc.DocumentElement == null)
return false;
XmlNodeList dirNodeList = doc.DocumentElement.SelectNodes("dir");
if (dirNodeList != null)
{
for (int i = 0; i < dirNodeList.Count; i++)
{
LoadDirFromDat(ref tDat, dirNodeList[i], thisFileType);
}
}
XmlNodeList machineNodeList = doc.DocumentElement.SelectNodes("machine");
if (machineNodeList != null)
{
for (int i = 0; i < machineNodeList.Count; i++)
{
LoadMachineFromDat(ref tDat, machineNodeList[i], thisFileType);
}
}
return true;
}
public static bool ReadMessDat(ref RvDir tDat, XmlDocument doc) public static bool ReadMessDat(ref RvDir tDat, XmlDocument doc)
{ {
FileType thisFileType = FileType.Unknown; FileType thisFileType = FileType.Unknown;
@@ -104,10 +70,6 @@ namespace ROMVault2.DatReaders
tDat.AddData(RvDat.DatData.URL, VarFix.String(head.SelectSingleNode("url"))); tDat.AddData(RvDat.DatData.URL, VarFix.String(head.SelectSingleNode("url")));
string superDAT = VarFix.String(head.SelectSingleNode("type"));
_cleanFileNames = superDAT.ToLower() != "superdat" && superDAT.ToLower() != "gigadat";
if (!_cleanFileNames) tDat.AddData(RvDat.DatData.SuperDat, "superdat");
thisFileType = FileType.ZipFile; thisFileType = FileType.ZipFile;
// Look for: <romvault forcepacking="unzip"/> // Look for: <romvault forcepacking="unzip"/>
@@ -151,7 +113,7 @@ namespace ROMVault2.DatReaders
} }
val = VarFix.String(packingNode.Attributes.GetNamedItem("dir")).ToLower(); // noautodir , nogame val = VarFix.String(packingNode.Attributes.GetNamedItem("dir")).ToLower(); // noautodir , nogame
if (!String.IsNullOrEmpty(val)) if (!String.IsNullOrEmpty(val))
tDat.AddData(RvDat.DatData.DirSetup,val); tDat.AddData(RvDat.DatData.DirSetup, val);
} }
} }
@@ -204,24 +166,24 @@ namespace ROMVault2.DatReaders
else else
{ {
RvDir tpDir = new RvDir(FileType.Dir) RvDir tpDir = new RvDir(FileType.Dir)
{ {
Name = dir, Name = dir,
DatStatus = DatStatus.InDatCollect, DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat, Dat = tDat.Dat,
Tree = new RvTreeRow() Tree = new RvTreeRow()
}; };
parent.ChildAdd(tpDir, index); parent.ChildAdd(tpDir, index);
parent = tpDir; parent = tpDir;
} }
} }
RvDir tDir = new RvDir(FileType.Dir) RvDir tDir = new RvDir(FileType.Dir)
{ {
Name = fullname, Name = fullname,
DatStatus = DatStatus.InDatCollect, DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat, Dat = tDat.Dat,
Tree = new RvTreeRow() Tree = new RvTreeRow()
}; };
int index1; int index1;
if (parent.ChildNameSearch(tDir, out index1) == 0) if (parent.ChildNameSearch(tDir, out index1) == 0)
@@ -258,43 +220,15 @@ namespace ROMVault2.DatReaders
int index1 = 0; int index1 = 0;
string fullname = VarFix.CleanFullFileName(machineNode.Attributes.GetNamedItem("name")); string fullname = VarFix.CleanFullFileName(machineNode.Attributes.GetNamedItem("name"));
if (_cleanFileNames)
fullname = fullname.Replace("/", "-");
else
{
while (fullname.Contains("/"))
{
int firstSlash = fullname.IndexOf("/", StringComparison.Ordinal);
string dir = fullname.Substring(0, firstSlash);
dir = VarFix.CleanFileName(dir);
fullname = fullname.Substring(firstSlash + 1); fullname = fullname.Replace("/", "-");
int index;
if (parent.ChildNameSearch(new RvDir(FileType.Dir) { Name = dir }, out index) == 0)
{
parent = (RvDir)parent.Child(index);
}
else
{
RvDir tpDir = new RvDir(FileType.Dir)
{
Name = dir,
DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat,
Tree = new RvTreeRow()
};
parent.ChildAdd(tpDir, index);
parent = tpDir;
}
}
}
tDir = new RvDir(DBTypeGet.DirFromFile(thisFileType)) tDir = new RvDir(DBTypeGet.DirFromFile(thisFileType))
{ {
Name = fullname, Name = fullname,
DatStatus = DatStatus.InDatCollect, DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat Dat = tDat.Dat
}; };
string testName = tDir.Name; string testName = tDir.Name;
int nameCount = 0; int nameCount = 0;
@@ -337,12 +271,12 @@ namespace ROMVault2.DatReaders
} }
RvDir tDirCHD = new RvDir(FileType.Dir) RvDir tDirCHD = new RvDir(FileType.Dir)
{ {
Name = tDir.Name, Name = tDir.Name,
DatStatus = tDir.DatStatus, DatStatus = tDir.DatStatus,
Dat = tDir.Dat, Dat = tDir.Dat,
Game = tDir.Game Game = tDir.Game
}; };
XmlNodeList romNodeList = machineNode.SelectNodes("rom"); XmlNodeList romNodeList = machineNode.SelectNodes("rom");
if (romNodeList != null) if (romNodeList != null)
@@ -367,16 +301,16 @@ namespace ROMVault2.DatReaders
RvFile tRom = new RvFile(thisFileType) RvFile tRom = new RvFile(thisFileType)
{ {
Dat = tGame.Dat, Dat = tGame.Dat,
Size = VarFix.ULong(romNode.Attributes.GetNamedItem("size")), Size = VarFix.ULong(romNode.Attributes.GetNamedItem("size")),
Name = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("name")), Name = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("name")),
CRC = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("crc"), 8), CRC = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("crc"), 8),
SHA1 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("sha1"), 40), SHA1 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("sha1"), 40),
MD5 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("md5"), 32), MD5 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("md5"), 32),
Merge = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("merge")), Merge = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("merge")),
Status = VarFix.ToLower(romNode.Attributes.GetNamedItem("status")) Status = VarFix.ToLower(romNode.Attributes.GetNamedItem("status"))
}; };
if (tRom.Size != null) tRom.FileStatusSet(FileStatus.SizeFromDAT); if (tRom.Size != null) tRom.FileStatusSet(FileStatus.SizeFromDAT);
if (tRom.CRC != null) tRom.FileStatusSet(FileStatus.CRCFromDAT); if (tRom.CRC != null) tRom.FileStatusSet(FileStatus.CRCFromDAT);