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

[DatFile] Fix attributes with spaces in the name

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-30 17:52:57 -07:00
parent 5240d1d65a
commit 6d3717bac7
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SabreTools.Helper/Objects/Dat/DatFile.cs
View File

@@ -2930,7 +2930,7 @@ namespace SabreTools.Helper
// Handle MAME listxml since they're halfway between a SL and a Logiqx XML // Handle MAME listxml since they're halfway between a SL and a Logiqx XML
else if (line.StartsWith("<mame")) else if (line.StartsWith("<mame"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
if (attribs.ContainsKey("build")) if (attribs.ContainsKey("build"))
{ {
@@ -2942,7 +2942,7 @@ namespace SabreTools.Helper
// New software lists have this behavior // New software lists have this behavior
else if (line.StartsWith("<softwarelist")) else if (line.StartsWith("<softwarelist"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
if (attribs.ContainsKey("name")) if (attribs.ContainsKey("name"))
{ {
@@ -3002,7 +3002,7 @@ namespace SabreTools.Helper
Name = (String.IsNullOrEmpty(Name) ? "M1" : Name); Name = (String.IsNullOrEmpty(Name) ? "M1" : Name);
Description = (String.IsNullOrEmpty(Description) ? "M1" : Description); Description = (String.IsNullOrEmpty(Description) ? "M1" : Description);
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
if (attribs.ContainsKey("version")) if (attribs.ContainsKey("version"))
{ {
@@ -3153,7 +3153,7 @@ namespace SabreTools.Helper
if (line.StartsWith("flag")) if (line.StartsWith("flag"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
if (attribs.ContainsKey("name") && attribs.ContainsKey("value")) if (attribs.ContainsKey("name") && attribs.ContainsKey("value"))
{ {
@@ -3217,7 +3217,7 @@ namespace SabreTools.Helper
bool isbios = false; bool isbios = false;
// Get the game information // Get the game information
Dictionary<string, string> gameattribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> gameattribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
string tempname = (gameattribs.ContainsKey("name") ? gameattribs["name"] : ""); string tempname = (gameattribs.ContainsKey("name") ? gameattribs["name"] : "");
string sourcefile = (gameattribs.ContainsKey("sourcefile") ? gameattribs["sourcefile"] : ""); string sourcefile = (gameattribs.ContainsKey("sourcefile") ? gameattribs["sourcefile"] : "");
@@ -3267,7 +3267,7 @@ namespace SabreTools.Helper
// Now for the different file types // Now for the different file types
else if (line.StartsWith("<archive")) else if (line.StartsWith("<archive"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
Archive item = new Archive((attribs.ContainsKey("name") ? attribs["name"] : ""), Archive item = new Archive((attribs.ContainsKey("name") ? attribs["name"] : ""),
tempname, tempname,
@@ -3293,7 +3293,7 @@ namespace SabreTools.Helper
} }
else if (line.StartsWith("<biosset")) else if (line.StartsWith("<biosset"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
bool @default = false; bool @default = false;
if (attribs.ContainsKey("default")) if (attribs.ContainsKey("default"))
@@ -3335,7 +3335,7 @@ namespace SabreTools.Helper
} }
else if (line.StartsWith("<disk")) else if (line.StartsWith("<disk"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
ItemStatus its = ItemStatus.None; ItemStatus its = ItemStatus.None;
if (attribs.ContainsKey("flags")) if (attribs.ContainsKey("flags"))
@@ -3433,7 +3433,7 @@ namespace SabreTools.Helper
} }
else if (line.StartsWith("<release")) else if (line.StartsWith("<release"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
bool @default = false; bool @default = false;
if (attribs.ContainsKey("default")) if (attribs.ContainsKey("default"))
@@ -3477,7 +3477,7 @@ namespace SabreTools.Helper
} }
else if (line.StartsWith("<rom")) else if (line.StartsWith("<rom"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
ItemStatus its = ItemStatus.None; ItemStatus its = ItemStatus.None;
if (attribs.ContainsKey("flags")) if (attribs.ContainsKey("flags"))
@@ -3597,7 +3597,7 @@ namespace SabreTools.Helper
} }
else if (line.StartsWith("<sample")) else if (line.StartsWith("<sample"))
{ {
Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 3)); Dictionary<string, string> attribs = GetLogiqxAttributes(line.Substring(1, line.Length - 2));
Sample item = new Sample((attribs.ContainsKey("name") ? attribs["name"] : ""), Sample item = new Sample((attribs.ContainsKey("name") ? attribs["name"] : ""),
tempname, tempname,
@@ -3648,6 +3648,12 @@ namespace SabreTools.Helper
{ {
Dictionary<string, string> attribs = new Dictionary<string, string>(); Dictionary<string, string> attribs = new Dictionary<string, string>();
// If the line ends with a '/', remove it
if (line.EndsWith("/"))
{
line = line.TrimEnd('/');
}
string[] gc = line.Trim().Split(' '); string[] gc = line.Trim().Split(' ');
// Loop over all attributes and add them if possible // Loop over all attributes and add them if possible