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

Removed DatMessBIOSReader due to MAME and MESS being combined.

Browse Source
This commit is contained in:
gjefferyes
2015-09-16 20:01:03 -05:00
parent 33f204fc37
commit 5107b5b850
5 changed files with 3 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
ROMVault2/DatReaders/DatMessBIOSReader.cs
View File

@@ -1,346 +0,0 @@
/******************************************************
* ROMVault2 is written by Gordon J. *
* Contact gordon@romvault.com *
* Copyright 2014 *
******************************************************/
// Adapted to read MESS BIOS xml dat by Natalia Portillo <natalia@claunia.com>
using System;
using System.Xml;
using ROMVault2.RvDB;
using ROMVault2.Utils;
namespace ROMVault2.DatReaders
{
public static class DatMessBIOSXmlReader
{
public static bool ReadMessDat(ref RvDir tDat, XmlDocument doc)
{
FileType thisFileType = FileType.Unknown;
if (!LoadMessHeaderFromDat(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;
}
private static bool LoadHeaderFromDat(ref RvDir tDir, ref XmlDocument doc, ref FileType thisFileType)
{
if (doc.DocumentElement == null)
return false;
XmlNode head = doc.DocumentElement.SelectSingleNode("header");
if (head == null)
return false;
RvDat tDat = new RvDat();
tDat.AddData(RvDat.DatData.DatName, VarFix.CleanFileName(head.SelectSingleNode("name")));
tDat.AddData(RvDat.DatData.RootDir, VarFix.CleanFileName(head.SelectSingleNode("rootdir")));
tDat.AddData(RvDat.DatData.Description, VarFix.String(head.SelectSingleNode("description")));
tDat.AddData(RvDat.DatData.Category, VarFix.String(head.SelectSingleNode("category")));
tDat.AddData(RvDat.DatData.Version, VarFix.String(head.SelectSingleNode("version")));
tDat.AddData(RvDat.DatData.Date, VarFix.String(head.SelectSingleNode("date")));
tDat.AddData(RvDat.DatData.Author, VarFix.String(head.SelectSingleNode("author")));
tDat.AddData(RvDat.DatData.Email, VarFix.String(head.SelectSingleNode("email")));
tDat.AddData(RvDat.DatData.HomePage, VarFix.String(head.SelectSingleNode("homepage")));
tDat.AddData(RvDat.DatData.URL, VarFix.String(head.SelectSingleNode("url")));
thisFileType = FileType.ZipFile;
// Look for: <romvault forcepacking="unzip"/>
XmlNode packingNode = head.SelectSingleNode("romvault");
if (packingNode == null)
// Look for: <clrmamepro forcepacking="unzip"/>
packingNode = head.SelectSingleNode("clrmamepro");
if (packingNode != null)
{
if (packingNode.Attributes != null)
{
string val = VarFix.String(packingNode.Attributes.GetNamedItem("forcepacking")).ToLower();
switch (val.ToLower())
{
case "zip":
tDat.AddData(RvDat.DatData.FileType, "zip");
thisFileType = FileType.ZipFile;
break;
case "unzip":
case "file":
tDat.AddData(RvDat.DatData.FileType, "file");
thisFileType = FileType.File;
break;
default:
thisFileType = FileType.ZipFile;
break;
}
val = VarFix.String(packingNode.Attributes.GetNamedItem("forcemerging")).ToLower();
switch (val.ToLower())
{
case "split":
tDat.AddData(RvDat.DatData.MergeType, "split");
break;
case "full":
tDat.AddData(RvDat.DatData.MergeType, "full");
break;
default:
tDat.AddData(RvDat.DatData.MergeType, "split");
break;
}
val = VarFix.String(packingNode.Attributes.GetNamedItem("dir")).ToLower(); // noautodir , nogame
if (!String.IsNullOrEmpty(val))
tDat.AddData(RvDat.DatData.DirSetup, val);
}
}
// Look for: <notzipped>true</notzipped>
string notzipped = VarFix.String(head.SelectSingleNode("notzipped"));
if (notzipped.ToLower() == "true" || notzipped.ToLower() == "yes") thisFileType = FileType.File;
tDir.Dat = tDat;
return true;
}
private static bool LoadMessHeaderFromDat(ref RvDir tDir, ref XmlDocument doc, ref FileType thisFileType)
{
if (doc.DocumentElement == null)
return false;
XmlNode head = doc.SelectSingleNode("mess");
if (head == null || head.Attributes == null)
return false;
RvDat tDat = new RvDat();
tDat.AddData(RvDat.DatData.DatName, VarFix.CleanFileName(head.Attributes.GetNamedItem("build")));
tDat.AddData(RvDat.DatData.Description, VarFix.String(head.Attributes.GetNamedItem("build")));
thisFileType = FileType.ZipFile;
tDir.Dat = tDat;
return true;
}
private static void LoadDirFromDat(ref RvDir tDat, XmlNode dirNode, FileType thisFileType)
{
if (dirNode.Attributes == null)
return;
RvDir parent = tDat;
string fullname = VarFix.CleanFullFileName(dirNode.Attributes.GetNamedItem("name"));
while (fullname.Contains("/"))
{
int firstSlash = fullname.IndexOf("/", StringComparison.Ordinal);
string dir = fullname.Substring(0, firstSlash);
dir = VarFix.CleanFileName(dir);
fullname = fullname.Substring(firstSlash + 1);
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;
}
}
RvDir tDir = new RvDir(FileType.Dir)
{
Name = fullname,
DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat,
Tree = new RvTreeRow()
};
int index1;
if (parent.ChildNameSearch(tDir, out index1) == 0)
tDir = (RvDir)parent.Child(index1);
else
tDat.ChildAdd(tDir, index1);
XmlNodeList dirNodeList = dirNode.SelectNodes("dir");
if (dirNodeList != null)
{
for (int i = 0; i < dirNodeList.Count; i++)
{
LoadDirFromDat(ref tDir, dirNodeList[i], thisFileType);
}
}
XmlNodeList machineNodeList = dirNode.SelectNodes("machine");
if (machineNodeList != null)
{
for (int i = 0; i < machineNodeList.Count; i++)
{
LoadMachineFromDat(ref tDir, machineNodeList[i], thisFileType);
}
}
}
private static void LoadMachineFromDat(ref RvDir tDat, XmlNode machineNode, FileType thisFileType)
{
if (machineNode.Attributes == null)
return;
RvDir parent = tDat;
RvDir tDir;
int index1 = 0;
string fullname = VarFix.CleanFullFileName(machineNode.Attributes.GetNamedItem("name"));
fullname = fullname.Replace("/", "-");
tDir = new RvDir(DBTypeGet.DirFromFile(thisFileType))
{
Name = fullname,
DatStatus = DatStatus.InDatCollect,
Dat = tDat.Dat
};
string testName = tDir.Name;
int nameCount = 0;
while (parent.ChildNameSearch(tDir, out index1) == 0)
{
tDir.Name = testName + "_" + nameCount;
nameCount++;
}
tDir.Game = new RvGame();
tDir.Game.AddData(RvGame.GameData.RomOf, VarFix.CleanFileName(machineNode.Attributes.GetNamedItem("romof")));
tDir.Game.AddData(RvGame.GameData.Description, VarFix.String(machineNode.SelectSingleNode("description")));
tDir.Game.AddData(RvGame.GameData.Sourcefile, VarFix.String(machineNode.Attributes.GetNamedItem("sourcefile")));
tDir.Game.AddData(RvGame.GameData.IsBios, VarFix.String(machineNode.Attributes.GetNamedItem("isbios")));
tDir.Game.AddData(RvGame.GameData.CloneOf, VarFix.CleanFileName(machineNode.Attributes.GetNamedItem("cloneof")));
tDir.Game.AddData(RvGame.GameData.SampleOf, VarFix.CleanFileName(machineNode.Attributes.GetNamedItem("sampleof")));
tDir.Game.AddData(RvGame.GameData.Board, VarFix.String(machineNode.Attributes.GetNamedItem("board")));
tDir.Game.AddData(RvGame.GameData.Year, VarFix.String(machineNode.SelectSingleNode("year")));
tDir.Game.AddData(RvGame.GameData.Manufacturer, VarFix.String(machineNode.SelectSingleNode("manufacturer")));
XmlNode trurip = machineNode.SelectSingleNode("trurip");
if (trurip != null)
{
tDir.Game.AddData(RvGame.GameData.Trurip, "yes");
tDir.Game.AddData(RvGame.GameData.Year, VarFix.String(trurip.SelectSingleNode("year")));
tDir.Game.AddData(RvGame.GameData.Publisher, VarFix.String(trurip.SelectSingleNode("publisher")));
tDir.Game.AddData(RvGame.GameData.Developer, VarFix.String(trurip.SelectSingleNode("developer")));
tDir.Game.AddData(RvGame.GameData.Edition, VarFix.String(trurip.SelectSingleNode("edition")));
tDir.Game.AddData(RvGame.GameData.Version, VarFix.String(trurip.SelectSingleNode("version")));
tDir.Game.AddData(RvGame.GameData.Type, VarFix.String(trurip.SelectSingleNode("type")));
tDir.Game.AddData(RvGame.GameData.Media, VarFix.String(trurip.SelectSingleNode("media")));
tDir.Game.AddData(RvGame.GameData.Language, VarFix.String(trurip.SelectSingleNode("language")));
tDir.Game.AddData(RvGame.GameData.Players, VarFix.String(trurip.SelectSingleNode("players")));
tDir.Game.AddData(RvGame.GameData.Ratings, VarFix.String(trurip.SelectSingleNode("ratings")));
tDir.Game.AddData(RvGame.GameData.Peripheral, VarFix.String(trurip.SelectSingleNode("peripheral")));
tDir.Game.AddData(RvGame.GameData.Genre, VarFix.String(trurip.SelectSingleNode("genre")));
tDir.Game.AddData(RvGame.GameData.MediaCatalogNumber, VarFix.String(trurip.SelectSingleNode("mediacatalognumber")));
tDir.Game.AddData(RvGame.GameData.BarCode, VarFix.String(trurip.SelectSingleNode("barcode")));
}
RvDir tDirCHD = new RvDir(FileType.Dir)
{
Name = tDir.Name,
DatStatus = tDir.DatStatus,
Dat = tDir.Dat,
Game = tDir.Game
};
XmlNodeList romNodeList = machineNode.SelectNodes("rom");
if (romNodeList != null)
for (int i = 0; i < romNodeList.Count; i++)
LoadRomFromDat(ref tDir, romNodeList[i], thisFileType);
XmlNodeList diskNodeList = machineNode.SelectNodes("disk");
if (diskNodeList != null)
for (int i = 0; i < diskNodeList.Count; i++)
LoadDiskFromDat(ref tDirCHD, diskNodeList[i]);
if (tDir.ChildCount > 0)
parent.ChildAdd(tDir, index1);
if (tDirCHD.ChildCount > 0)
parent.ChildAdd(tDirCHD);
}
private static void LoadRomFromDat(ref RvDir tGame, XmlNode romNode, FileType thisFileType)
{
if (romNode.Attributes == null)
return;
RvFile tRom = new RvFile(thisFileType)
{
Dat = tGame.Dat,
Size = VarFix.ULong(romNode.Attributes.GetNamedItem("size")),
Name = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("name")),
CRC = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("crc"), 8),
SHA1 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("sha1"), 40),
MD5 = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("md5"), 32),
Merge = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("merge")),
Status = VarFix.ToLower(romNode.Attributes.GetNamedItem("status"))
};
if (tRom.Size != null) tRom.FileStatusSet(FileStatus.SizeFromDAT);
if (tRom.CRC != null) tRom.FileStatusSet(FileStatus.CRCFromDAT);
if (tRom.SHA1 != null) tRom.FileStatusSet(FileStatus.SHA1FromDAT);
if (tRom.MD5 != null) tRom.FileStatusSet(FileStatus.MD5FromDAT);
tGame.ChildAdd(tRom);
}
private static void LoadDiskFromDat(ref RvDir tGame, XmlNode romNode)
{
if (romNode.Attributes == null)
return;
RvFile tRom = new RvFile(FileType.File)
{
Dat = tGame.Dat,
Name = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("name")) + ".chd",
SHA1CHD = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("sha1"), 40),
MD5CHD = VarFix.CleanMD5SHA1(romNode.Attributes.GetNamedItem("md5"), 32),
Merge = VarFix.CleanFullFileName(romNode.Attributes.GetNamedItem("merge")),
Status = VarFix.ToLower(romNode.Attributes.GetNamedItem("status"))
};
if (tRom.SHA1CHD != null) tRom.FileStatusSet(FileStatus.SHA1CHDFromDAT);
if (tRom.MD5CHD != null) tRom.FileStatusSet(FileStatus.MD5CHDFromDAT);
tGame.ChildAdd(tRom);
}
}
}

4
ROMVault2/DatReaders/DatReader.cs
View File

@@ -129,10 +129,6 @@ namespace ROMVault2.DatReaders
if (mame != null) if (mame != null)
return DatXmlReader.ReadMameDat(ref tDat, doc); return DatXmlReader.ReadMameDat(ref tDat, doc);
XmlNode mess = doc.SelectSingleNode("mess");
if (mess != null)
return DatMessBIOSXmlReader.ReadMessDat(ref tDat, doc);
if (doc.DocumentElement != null) if (doc.DocumentElement != null)
{ {
XmlNode head = doc.DocumentElement.SelectSingleNode("header"); XmlNode head = doc.DocumentElement.SelectSingleNode("header");

11
ROMVault2/Program.cs
View File

@@ -17,9 +17,6 @@ namespace ROMVault2
public const string Version = "2.2"; public const string Version = "2.2";
public const int SubVersion = 3; public const int SubVersion = 3;
public static string ErrorMessage;
public static string URL;
public static SynchronizationContext SyncCont; public static SynchronizationContext SyncCont;
/// <summary> /// <summary>
@@ -40,14 +37,6 @@ namespace ROMVault2
progress.Dispose(); progress.Dispose();
if (!String.IsNullOrEmpty(ErrorMessage))
{
MessageBox.Show(ErrorMessage);
if (!String.IsNullOrEmpty(URL))
System.Diagnostics.Process.Start(URL);
return;
}
Application.Run(new FrmMain()); Application.Run(new FrmMain());
} }
} }

1
ROMVault2/ROMVault2.csproj
View File

@@ -97,7 +97,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DatMaker.cs" /> <Compile Include="DatMaker.cs" />
<Compile Include="DatReaders\DatMessBIOSReader.cs" />
<Compile Include="Report.cs" /> <Compile Include="Report.cs" />
<Compile Include="SupportedFiles\CHD\CHD.cs" /> <Compile Include="SupportedFiles\CHD\CHD.cs" />
<Compile Include="DatReaders\DatDOSReader.cs" /> <Compile Include="DatReaders\DatDOSReader.cs" />

3
ROMVault2/rvImages.cs
View File

@@ -11,9 +11,6 @@ namespace ROMVault2
{ {
public static class rvImages public static class rvImages
{ {
private static List<string> names;
private static List<Bitmap> images;
public static Bitmap GetBitmap(string bitmapName) public static Bitmap GetBitmap(string bitmapName)
{ {