Better optional attributes

This commit is contained in:
Matt Nadareski
2020-08-23 22:54:09 -07:00
parent f8fae70231
commit fd489d5e4b
6 changed files with 223 additions and 385 deletions

View File

@@ -995,8 +995,6 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("mame"); xtw.WriteStartElement("mame");
xtw.WriteAttributeString("build", Header.Name); xtw.WriteAttributeString("build", Header.Name);
if (Header.Debug != null)
{
switch (Header.Debug) switch (Header.Debug)
{ {
case true: case true:
@@ -1006,10 +1004,8 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("debug", "no"); xtw.WriteAttributeString("debug", "no");
break; break;
} }
}
if (!string.IsNullOrEmpty(Header.MameConfig)) xtw.WriteOptionalAttributeString("mameconfig", Header.MameConfig);
xtw.WriteAttributeString("mameconfig", Header.MameConfig);
xtw.Flush(); xtw.Flush();
} }
@@ -1038,21 +1034,15 @@ namespace SabreTools.Library.DatFiles
// Build the state // Build the state
xtw.WriteStartElement("machine"); xtw.WriteStartElement("machine");
xtw.WriteAttributeString("name", datItem.Machine.Name); xtw.WriteAttributeString("name", datItem.Machine.Name);
if (!string.IsNullOrWhiteSpace(datItem.Machine.SourceFile)) xtw.WriteOptionalAttributeString("sourcefile", datItem.Machine.SourceFile);
xtw.WriteAttributeString("sourcefile", datItem.Machine.SourceFile);
if (datItem.Machine.MachineType != MachineType.NULL)
{
if (datItem.Machine.MachineType.HasFlag(MachineType.Bios)) if (datItem.Machine.MachineType.HasFlag(MachineType.Bios))
xtw.WriteAttributeString("isbios", "yes"); xtw.WriteAttributeString("isbios", "yes");
if (datItem.Machine.MachineType.HasFlag(MachineType.Device)) if (datItem.Machine.MachineType.HasFlag(MachineType.Device))
xtw.WriteAttributeString("isdevice", "yes"); xtw.WriteAttributeString("isdevice", "yes");
if (datItem.Machine.MachineType.HasFlag(MachineType.Mechanical)) if (datItem.Machine.MachineType.HasFlag(MachineType.Mechanical))
xtw.WriteAttributeString("ismechanical", "yes"); xtw.WriteAttributeString("ismechanical", "yes");
}
if (datItem.Machine.Runnable != Runnable.NULL)
{
switch (datItem.Machine.Runnable) switch (datItem.Machine.Runnable)
{ {
case Runnable.No: case Runnable.No:
@@ -1065,23 +1055,18 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("runnable", "yes"); xtw.WriteAttributeString("runnable", "yes");
break; break;
} }
}
if (!string.IsNullOrWhiteSpace(datItem.Machine.CloneOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("cloneof", datItem.Machine.CloneOf); xtw.WriteOptionalAttributeString("cloneof", datItem.Machine.CloneOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.RomOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.RomOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.RomOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("romof", datItem.Machine.RomOf); xtw.WriteOptionalAttributeString("romof", datItem.Machine.RomOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.SampleOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.SampleOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.SampleOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("sampleof", datItem.Machine.SampleOf); xtw.WriteOptionalAttributeString("sampleof", datItem.Machine.SampleOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Description)) xtw.WriteOptionalAttributeString("description", datItem.Machine.Description);
xtw.WriteElementString("description", datItem.Machine.Description); xtw.WriteOptionalAttributeString("year", datItem.Machine.Year);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Year)) xtw.WriteOptionalAttributeString("publisher", datItem.Machine.Publisher);
xtw.WriteElementString("year", datItem.Machine.Year); xtw.WriteOptionalAttributeString("category", datItem.Machine.Category);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Publisher))
xtw.WriteElementString("publisher", datItem.Machine.Publisher);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Category))
xtw.WriteElementString("category", datItem.Machine.Category);
if (datItem.Machine.Infos != null && datItem.Machine.Infos.Count > 0) if (datItem.Machine.Infos != null && datItem.Machine.Infos.Count > 0)
{ {
@@ -1153,10 +1138,8 @@ namespace SabreTools.Library.DatFiles
var biosSet = datItem as BiosSet; var biosSet = datItem as BiosSet;
xtw.WriteStartElement("biosset"); xtw.WriteStartElement("biosset");
xtw.WriteAttributeString("name", biosSet.Name); xtw.WriteAttributeString("name", biosSet.Name);
if (!string.IsNullOrWhiteSpace(biosSet.Description)) xtw.WriteOptionalAttributeString("description", biosSet.Description);
xtw.WriteAttributeString("description", biosSet.Description); xtw.WriteOptionalAttributeString("default", biosSet.Default?.ToString().ToLowerInvariant());
if (biosSet.Default != null)
xtw.WriteAttributeString("default", biosSet.Default.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -1164,32 +1147,20 @@ namespace SabreTools.Library.DatFiles
var disk = datItem as Disk; var disk = datItem as Disk;
xtw.WriteStartElement("disk"); xtw.WriteStartElement("disk");
xtw.WriteAttributeString("name", disk.Name); xtw.WriteAttributeString("name", disk.Name);
if (!string.IsNullOrWhiteSpace(disk.MD5)) xtw.WriteOptionalAttributeString("md5", disk.MD5.ToLowerInvariant());
xtw.WriteAttributeString("md5", disk.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(disk.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(disk.SHA1)) xtw.WriteOptionalAttributeString("sha1", disk.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", disk.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", disk.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA256)) xtw.WriteOptionalAttributeString("sha384", disk.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", disk.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA384)) xtw.WriteOptionalAttributeString("merge", disk.MergeTag);
xtw.WriteAttributeString("sha384", disk.SHA384.ToLowerInvariant()); xtw.WriteOptionalAttributeString("region", disk.Region);
if (!string.IsNullOrWhiteSpace(disk.SHA512)) xtw.WriteOptionalAttributeString("index", disk.Index);
xtw.WriteAttributeString("sha512", disk.SHA512.ToLowerInvariant()); xtw.WriteOptionalAttributeString("writable", disk.Writable.FromYesNo());
if (!string.IsNullOrWhiteSpace(disk.MergeTag)) if (disk.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", disk.ItemStatus.ToString());
xtw.WriteAttributeString("merge", disk.MergeTag); xtw.WriteOptionalAttributeString("optional", disk.Optional.FromYesNo());
if (!string.IsNullOrWhiteSpace(disk.Region))
xtw.WriteAttributeString("region", disk.Region);
if (!string.IsNullOrWhiteSpace(disk.Index))
xtw.WriteAttributeString("index", disk.Index);
if (disk.Writable != null)
xtw.WriteAttributeString("writable", disk.Writable == true ? "yes" : "no");
if (disk.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", disk.ItemStatus.ToString());
if (disk.Optional != null)
xtw.WriteAttributeString("optional", disk.Optional == true ? "yes" : "no");
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -1197,36 +1168,22 @@ namespace SabreTools.Library.DatFiles
var rom = datItem as Rom; var rom = datItem as Rom;
xtw.WriteStartElement("rom"); xtw.WriteStartElement("rom");
xtw.WriteAttributeString("name", rom.Name); xtw.WriteAttributeString("name", rom.Name);
if (rom.Size != -1) if (rom.Size != -1) xtw.WriteAttributeString("size", rom.Size.ToString());
xtw.WriteAttributeString("size", rom.Size.ToString()); xtw.WriteOptionalAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.CRC)) xtw.WriteOptionalAttributeString("md5", rom.MD5.ToLowerInvariant());
xtw.WriteAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.MD5))
xtw.WriteAttributeString("md5", rom.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(rom.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(rom.SHA1)) xtw.WriteOptionalAttributeString("sha1", rom.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", rom.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", rom.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA256)) xtw.WriteOptionalAttributeString("sha384", rom.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", rom.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA384)) xtw.WriteOptionalAttributeString("bios", rom.Bios);
xtw.WriteAttributeString("sha384", rom.SHA384.ToLowerInvariant()); xtw.WriteOptionalAttributeString("merge", rom.MergeTag);
if (!string.IsNullOrWhiteSpace(rom.SHA512)) xtw.WriteOptionalAttributeString("region", rom.Region);
xtw.WriteAttributeString("sha512", rom.SHA512.ToLowerInvariant()); xtw.WriteOptionalAttributeString("offset", rom.Offset);
if (!string.IsNullOrWhiteSpace(rom.Bios)) if (rom.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
xtw.WriteAttributeString("bios", rom.Bios); xtw.WriteOptionalAttributeString("optional", rom.Optional.FromYesNo());
if (!string.IsNullOrWhiteSpace(rom.MergeTag))
xtw.WriteAttributeString("merge", rom.MergeTag);
if (!string.IsNullOrWhiteSpace(rom.Region))
xtw.WriteAttributeString("region", rom.Region);
if (!string.IsNullOrWhiteSpace(rom.Offset))
xtw.WriteAttributeString("offset", rom.Offset);
if (rom.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
if (rom.Optional != null)
xtw.WriteAttributeString("optional", rom.Optional == true ? "yes" : "no");
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;

View File

@@ -762,10 +762,7 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("datafile"); xtw.WriteStartElement("datafile");
if (Header.Build != null) xtw.WriteOptionalAttributeString("build", Header.Build);
xtw.WriteAttributeString("build", Header.Build);
if (Header.Debug != null)
{
switch (Header.Debug) switch (Header.Debug)
{ {
case true: case true:
@@ -775,7 +772,6 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("debug", "no"); xtw.WriteAttributeString("debug", "no");
break; break;
} }
}
xtw.WriteStartElement("header"); xtw.WriteStartElement("header");
xtw.WriteElementString("name", Header.Name); xtw.WriteElementString("name", Header.Name);
@@ -844,8 +840,7 @@ namespace SabreTools.Library.DatFiles
break; break;
} }
if (!string.IsNullOrWhiteSpace(Header.HeaderSkipper)) xtw.WriteOptionalAttributeString("header", Header.HeaderSkipper);
xtw.WriteAttributeString("header", Header.HeaderSkipper);
// End clrmamepro // End clrmamepro
xtw.WriteEndElement(); xtw.WriteEndElement();
@@ -858,8 +853,7 @@ namespace SabreTools.Library.DatFiles
{ {
xtw.WriteStartElement("romcenter"); xtw.WriteStartElement("romcenter");
if (!string.IsNullOrWhiteSpace(Header.System)) xtw.WriteOptionalAttributeString("plugin", Header.System);
xtw.WriteAttributeString("plugin", Header.System);
switch (Header.RomMode) switch (Header.RomMode)
{ {
@@ -897,44 +891,9 @@ namespace SabreTools.Library.DatFiles
break; break;
} }
if (Header.LockRomMode != null) xtw.WriteOptionalAttributeString("lockrommode", Header.LockRomMode.FromYesNo());
{ xtw.WriteOptionalAttributeString("lockbiosmode", Header.LockBiosMode.FromYesNo());
switch (Header.LockRomMode) xtw.WriteOptionalAttributeString("locksamplemode", Header.LockSampleMode.FromYesNo());
{
case true:
xtw.WriteAttributeString("lockrommode", "yes");
break;
case false:
xtw.WriteAttributeString("lockrommode", "no");
break;
}
}
if (Header.LockBiosMode != null)
{
switch (Header.LockBiosMode)
{
case true:
xtw.WriteAttributeString("lockbiosmode", "yes");
break;
case false:
xtw.WriteAttributeString("lockbiosmode", "no");
break;
}
}
if (Header.LockSampleMode != null)
{
switch (Header.LockSampleMode)
{
case true:
xtw.WriteAttributeString("locksamplemode", "yes");
break;
case false:
xtw.WriteAttributeString("locksamplemode", "no");
break;
}
}
// End romcenter // End romcenter
xtw.WriteEndElement(); xtw.WriteEndElement();
@@ -970,15 +929,13 @@ namespace SabreTools.Library.DatFiles
// Build the state // Build the state
xtw.WriteStartElement(_deprecated ? "game" : "machine"); xtw.WriteStartElement(_deprecated ? "game" : "machine");
xtw.WriteAttributeString("name", datItem.Machine.Name); xtw.WriteAttributeString("name", datItem.Machine.Name);
if (datItem.Machine.MachineType != MachineType.NULL)
{
if (datItem.Machine.MachineType.HasFlag(MachineType.Bios)) if (datItem.Machine.MachineType.HasFlag(MachineType.Bios))
xtw.WriteAttributeString("isbios", "yes"); xtw.WriteAttributeString("isbios", "yes");
if (datItem.Machine.MachineType.HasFlag(MachineType.Device)) if (datItem.Machine.MachineType.HasFlag(MachineType.Device))
xtw.WriteAttributeString("isdevice", "yes"); xtw.WriteAttributeString("isdevice", "yes");
if (datItem.Machine.MachineType.HasFlag(MachineType.Mechanical)) if (datItem.Machine.MachineType.HasFlag(MachineType.Mechanical))
xtw.WriteAttributeString("ismechanical", "yes"); xtw.WriteAttributeString("ismechanical", "yes");
}
if (datItem.Machine.Runnable != Runnable.NULL) if (datItem.Machine.Runnable != Runnable.NULL)
{ {
@@ -996,25 +953,19 @@ namespace SabreTools.Library.DatFiles
} }
} }
if (!string.IsNullOrWhiteSpace(datItem.Machine.CloneOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("cloneof", datItem.Machine.CloneOf); xtw.WriteOptionalAttributeString("cloneof", datItem.Machine.CloneOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.RomOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.RomOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.RomOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("romof", datItem.Machine.RomOf); xtw.WriteOptionalAttributeString("romof", datItem.Machine.RomOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.SampleOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.SampleOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.SampleOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("sampleof", datItem.Machine.SampleOf); xtw.WriteOptionalAttributeString("sampleof", datItem.Machine.SampleOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Comment)) xtw.WriteOptionalAttributeString("comment", datItem.Machine.Comment);
xtw.WriteElementString("comment", datItem.Machine.Comment); xtw.WriteOptionalAttributeString("description", datItem.Machine.Description);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Description)) xtw.WriteOptionalAttributeString("year", datItem.Machine.Year);
xtw.WriteElementString("description", datItem.Machine.Description); xtw.WriteOptionalAttributeString("publisher", datItem.Machine.Publisher);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Year)) xtw.WriteOptionalAttributeString("manufacturer", datItem.Machine.Manufacturer);
xtw.WriteElementString("year", datItem.Machine.Year); xtw.WriteOptionalAttributeString("category", datItem.Machine.Category);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Publisher))
xtw.WriteElementString("publisher", datItem.Machine.Publisher);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Manufacturer))
xtw.WriteElementString("manufacturer", datItem.Machine.Manufacturer);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Category))
xtw.WriteElementString("category", datItem.Machine.Category);
if (datItem.Machine.TitleID != null if (datItem.Machine.TitleID != null
|| datItem.Machine.Developer != null || datItem.Machine.Developer != null
@@ -1028,41 +979,21 @@ namespace SabreTools.Library.DatFiles
{ {
xtw.WriteStartElement("trurip"); xtw.WriteStartElement("trurip");
if (!string.IsNullOrWhiteSpace(datItem.Machine.TitleID)) xtw.WriteOptionalAttributeString("titleid", datItem.Machine.TitleID);
xtw.WriteElementString("titleid", datItem.Machine.TitleID); xtw.WriteOptionalAttributeString("publisher", datItem.Machine.Publisher);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Publisher)) xtw.WriteOptionalAttributeString("developer", datItem.Machine.Developer);
xtw.WriteElementString("publisher", datItem.Machine.Publisher); xtw.WriteOptionalAttributeString("year", datItem.Machine.Year);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Developer)) xtw.WriteOptionalAttributeString("genre", datItem.Machine.Genre);
xtw.WriteElementString("developer", datItem.Machine.Developer); xtw.WriteOptionalAttributeString("subgenre", datItem.Machine.Subgenre);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Year)) xtw.WriteOptionalAttributeString("ratings", datItem.Machine.Ratings);
xtw.WriteElementString("year", datItem.Machine.Year); xtw.WriteOptionalAttributeString("score", datItem.Machine.Score);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Genre)) xtw.WriteOptionalAttributeString("players", datItem.Machine.Players);
xtw.WriteElementString("genre", datItem.Machine.Genre); xtw.WriteOptionalAttributeString("enabled", datItem.Machine.Enabled);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Subgenre)) xtw.WriteOptionalAttributeString("titleid", datItem.Machine.TitleID);
xtw.WriteElementString("subgenre", datItem.Machine.Subgenre); xtw.WriteOptionalAttributeString("crc", datItem.Machine.HasCrc.FromYesNo());
if (!string.IsNullOrWhiteSpace(datItem.Machine.Ratings)) xtw.WriteOptionalAttributeString("source", datItem.Machine.SourceFile);
xtw.WriteElementString("ratings", datItem.Machine.Ratings); xtw.WriteOptionalAttributeString("cloneof", datItem.Machine.CloneOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Score)) xtw.WriteOptionalAttributeString("relatedto", datItem.Machine.RelatedTo);
xtw.WriteElementString("score", datItem.Machine.Score);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Players))
xtw.WriteElementString("players", datItem.Machine.Players);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Enabled))
xtw.WriteElementString("enabled", datItem.Machine.Enabled);
if (!string.IsNullOrWhiteSpace(datItem.Machine.TitleID))
xtw.WriteElementString("titleid", datItem.Machine.TitleID);
if (datItem.Machine.HasCrc != null)
{
if (datItem.Machine.HasCrc == true)
xtw.WriteElementString("crc", "yes");
else if (datItem.Machine.HasCrc == false)
xtw.WriteElementString("crc", "no");
}
if (!string.IsNullOrWhiteSpace(datItem.Machine.SourceFile))
xtw.WriteElementString("source", datItem.Machine.SourceFile);
if (!string.IsNullOrWhiteSpace(datItem.Machine.CloneOf))
xtw.WriteElementString("cloneof", datItem.Machine.CloneOf);
if (!string.IsNullOrWhiteSpace(datItem.Machine.RelatedTo))
xtw.WriteElementString("relatedto", datItem.Machine.RelatedTo);
// End trurip // End trurip
xtw.WriteEndElement(); xtw.WriteEndElement();
@@ -1133,10 +1064,8 @@ namespace SabreTools.Library.DatFiles
var biosSet = datItem as BiosSet; var biosSet = datItem as BiosSet;
xtw.WriteStartElement("biosset"); xtw.WriteStartElement("biosset");
xtw.WriteAttributeString("name", biosSet.Name); xtw.WriteAttributeString("name", biosSet.Name);
if (!string.IsNullOrWhiteSpace(biosSet.Description)) xtw.WriteOptionalAttributeString("description", biosSet.Description);
xtw.WriteAttributeString("description", biosSet.Description); xtw.WriteOptionalAttributeString("default", biosSet.Default.FromYesNo());
if (biosSet.Default != null)
xtw.WriteAttributeString("default", biosSet.Default.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -1144,22 +1073,15 @@ namespace SabreTools.Library.DatFiles
var disk = datItem as Disk; var disk = datItem as Disk;
xtw.WriteStartElement("disk"); xtw.WriteStartElement("disk");
xtw.WriteAttributeString("name", disk.Name); xtw.WriteAttributeString("name", disk.Name);
if (!string.IsNullOrWhiteSpace(disk.MD5)) xtw.WriteOptionalAttributeString("md5", disk.MD5.ToLowerInvariant());
xtw.WriteAttributeString("md5", disk.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(disk.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(disk.SHA1)) xtw.WriteOptionalAttributeString("sha1", disk.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", disk.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", disk.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA256)) xtw.WriteOptionalAttributeString("sha384", disk.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", disk.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA384)) if (disk.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", disk.ItemStatus.ToString().ToLowerInvariant());
xtw.WriteAttributeString("sha384", disk.SHA384.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA512))
xtw.WriteAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (disk.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", disk.ItemStatus.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -1167,14 +1089,10 @@ namespace SabreTools.Library.DatFiles
var release = datItem as Release; var release = datItem as Release;
xtw.WriteStartElement("release"); xtw.WriteStartElement("release");
xtw.WriteAttributeString("name", release.Name); xtw.WriteAttributeString("name", release.Name);
if (!string.IsNullOrWhiteSpace(release.Region)) xtw.WriteOptionalAttributeString("region", release.Region);
xtw.WriteAttributeString("region", release.Region); xtw.WriteOptionalAttributeString("language", release.Language);
if (!string.IsNullOrWhiteSpace(release.Language)) xtw.WriteOptionalAttributeString("date", release.Date);
xtw.WriteAttributeString("language", release.Language); xtw.WriteOptionalAttributeString("default", release.Default.FromYesNo());
if (!string.IsNullOrWhiteSpace(release.Date))
xtw.WriteAttributeString("date", release.Date);
if (release.Default != null)
xtw.WriteAttributeString("default", release.Default.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -1184,28 +1102,18 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("name", rom.Name); xtw.WriteAttributeString("name", rom.Name);
if (rom.Size != -1) if (rom.Size != -1)
xtw.WriteAttributeString("size", rom.Size.ToString()); xtw.WriteAttributeString("size", rom.Size.ToString());
if (!string.IsNullOrWhiteSpace(rom.CRC)) xtw.WriteOptionalAttributeString("crc", rom.CRC.ToLowerInvariant());
xtw.WriteAttributeString("crc", rom.CRC.ToLowerInvariant()); xtw.WriteOptionalAttributeString("md5", rom.MD5.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.MD5))
xtw.WriteAttributeString("md5", rom.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(rom.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(rom.SHA1)) xtw.WriteOptionalAttributeString("sha1", rom.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", rom.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", rom.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA256)) xtw.WriteOptionalAttributeString("sha384", rom.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", rom.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA384)) xtw.WriteOptionalAttributeString("date", rom.Date);
xtw.WriteAttributeString("sha384", rom.SHA384.ToLowerInvariant()); if (rom.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA512)) xtw.WriteOptionalAttributeString("inverted", rom.Inverted.FromYesNo());
xtw.WriteAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.Date))
xtw.WriteAttributeString("date", rom.Date);
if (rom.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
if (rom.Inverted != null)
xtw.WriteAttributeString("inverted", rom.Inverted.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;

View File

@@ -896,10 +896,8 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("file"); xtw.WriteStartElement("file");
xtw.WriteAttributeString("type", "biosset"); xtw.WriteAttributeString("type", "biosset");
xtw.WriteAttributeString("name", biosSet.Name); xtw.WriteAttributeString("name", biosSet.Name);
if (!string.IsNullOrWhiteSpace(biosSet.Description)) xtw.WriteOptionalAttributeString("description", biosSet.Description);
xtw.WriteAttributeString("description", biosSet.Description); xtw.WriteOptionalAttributeString("default", biosSet.Default.FromYesNo());
if (biosSet.Default != null)
xtw.WriteAttributeString("default", biosSet.Default.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -908,20 +906,14 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("file"); xtw.WriteStartElement("file");
xtw.WriteAttributeString("type", "disk"); xtw.WriteAttributeString("type", "disk");
xtw.WriteAttributeString("name", disk.Name); xtw.WriteAttributeString("name", disk.Name);
if (!string.IsNullOrWhiteSpace(disk.MD5)) xtw.WriteOptionalAttributeString("md5", disk.MD5.ToLowerInvariant());
xtw.WriteAttributeString("md5", disk.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(disk.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(disk.SHA1)) xtw.WriteOptionalAttributeString("sha1", disk.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", disk.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", disk.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA256)) xtw.WriteOptionalAttributeString("sha384", disk.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", disk.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA384))
xtw.WriteAttributeString("sha384", disk.SHA384.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA512))
xtw.WriteAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (disk.ItemStatus != ItemStatus.None) if (disk.ItemStatus != ItemStatus.None)
{ {
xtw.WriteStartElement("flags"); xtw.WriteStartElement("flags");
@@ -942,14 +934,10 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("file"); xtw.WriteStartElement("file");
xtw.WriteAttributeString("type", "release"); xtw.WriteAttributeString("type", "release");
xtw.WriteAttributeString("name", release.Name); xtw.WriteAttributeString("name", release.Name);
if (!string.IsNullOrWhiteSpace(release.Region)) xtw.WriteOptionalAttributeString("region", release.Region);
xtw.WriteAttributeString("region", release.Region); xtw.WriteOptionalAttributeString("language", release.Language);
if (!string.IsNullOrWhiteSpace(release.Language)) xtw.WriteOptionalAttributeString("date", release.Date);
xtw.WriteAttributeString("language", release.Language); xtw.WriteOptionalAttributeString("default", release.Default.FromYesNo());
if (!string.IsNullOrWhiteSpace(release.Date))
xtw.WriteAttributeString("date", release.Date);
if (release.Default != null)
xtw.WriteAttributeString("default", release.Default.ToString().ToLowerInvariant());
xtw.WriteEndElement(); xtw.WriteEndElement();
break; break;
@@ -958,26 +946,17 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("file"); xtw.WriteStartElement("file");
xtw.WriteAttributeString("type", "rom"); xtw.WriteAttributeString("type", "rom");
xtw.WriteAttributeString("name", rom.Name); xtw.WriteAttributeString("name", rom.Name);
if (rom.Size != -1) if (rom.Size != -1) xtw.WriteAttributeString("size", rom.Size.ToString());
xtw.WriteAttributeString("size", rom.Size.ToString()); xtw.WriteOptionalAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.CRC)) xtw.WriteOptionalAttributeString("md5", rom.MD5.ToLowerInvariant());
xtw.WriteAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.MD5))
xtw.WriteAttributeString("md5", rom.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(rom.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(rom.SHA1)) xtw.WriteOptionalAttributeString("sha1", rom.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", rom.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", rom.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA256)) xtw.WriteOptionalAttributeString("sha384", rom.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", rom.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA384)) xtw.WriteOptionalAttributeString("date", rom.Date);
xtw.WriteAttributeString("sha384", rom.SHA384.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA512))
xtw.WriteAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.Date))
xtw.WriteAttributeString("date", rom.Date);
if (rom.ItemStatus != ItemStatus.None) if (rom.ItemStatus != ItemStatus.None)
{ {
xtw.WriteStartElement("flags"); xtw.WriteStartElement("flags");

View File

@@ -804,11 +804,9 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("software"); xtw.WriteStartElement("software");
xtw.WriteAttributeString("name", datItem.Machine.Name); xtw.WriteAttributeString("name", datItem.Machine.Name);
if (!string.IsNullOrWhiteSpace(datItem.Machine.CloneOf) && !string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(datItem.Machine.Name, datItem.Machine.CloneOf, StringComparison.OrdinalIgnoreCase))
xtw.WriteAttributeString("cloneof", datItem.Machine.CloneOf); xtw.WriteOptionalAttributeString("cloneof", datItem.Machine.CloneOf);
if (datItem.Machine.Supported != Supported.NULL)
{
switch (datItem.Machine.Supported) switch (datItem.Machine.Supported)
{ {
case Supported.No: case Supported.No:
@@ -821,16 +819,11 @@ namespace SabreTools.Library.DatFiles
xtw.WriteAttributeString("supported", "yes"); xtw.WriteAttributeString("supported", "yes");
break; break;
} }
}
if (!string.IsNullOrWhiteSpace(datItem.Machine.Description)) xtw.WriteOptionalAttributeString("description", datItem.Machine.Description);
xtw.WriteElementString("description", datItem.Machine.Description); xtw.WriteOptionalAttributeString("year", datItem.Machine.Year);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Year)) xtw.WriteOptionalAttributeString("publisher", datItem.Machine.Publisher);
xtw.WriteElementString("year", datItem.Machine.Year); xtw.WriteOptionalAttributeString("category", datItem.Machine.Category);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Publisher))
xtw.WriteElementString("publisher", datItem.Machine.Publisher);
if (!string.IsNullOrWhiteSpace(datItem.Machine.Category))
xtw.WriteElementString("category", datItem.Machine.Category);
if (datItem.Machine.Infos != null && datItem.Machine.Infos.Count > 0) if (datItem.Machine.Infos != null && datItem.Machine.Infos.Count > 0)
{ {
@@ -955,29 +948,20 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("diskarea"); xtw.WriteStartElement("diskarea");
xtw.WriteAttributeString("name", areaName); xtw.WriteAttributeString("name", areaName);
if (disk.AreaSize != null) xtw.WriteOptionalAttributeString("size", disk.AreaSize.ToString());
xtw.WriteAttributeString("size", disk.AreaSize.ToString());
xtw.WriteStartElement("disk"); xtw.WriteStartElement("disk");
xtw.WriteAttributeString("name", disk.Name); xtw.WriteAttributeString("name", disk.Name);
if (!string.IsNullOrWhiteSpace(disk.MD5)) xtw.WriteOptionalAttributeString("md5", disk.MD5.ToLowerInvariant());
xtw.WriteAttributeString("md5", disk.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(disk.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", disk.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(disk.SHA1)) xtw.WriteOptionalAttributeString("sha1", disk.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", disk.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", disk.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA256)) xtw.WriteOptionalAttributeString("sha384", disk.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", disk.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(disk.SHA384)) if (disk.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", disk.ItemStatus.ToString().ToLowerInvariant());
xtw.WriteAttributeString("sha384", disk.SHA384.ToLowerInvariant()); xtw.WriteOptionalAttributeString("writable", disk.Writable.FromYesNo());
if (!string.IsNullOrWhiteSpace(disk.SHA512))
xtw.WriteAttributeString("sha512", disk.SHA512.ToLowerInvariant());
if (disk.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", disk.ItemStatus.ToString().ToLowerInvariant());
if (disk.Writable != null)
xtw.WriteAttributeString("writable", disk.Writable == true ? "yes" : "no");
xtw.WriteEndElement(); xtw.WriteEndElement();
// End diskarea // End diskarea
@@ -991,41 +975,26 @@ namespace SabreTools.Library.DatFiles
xtw.WriteStartElement("dataarea"); xtw.WriteStartElement("dataarea");
xtw.WriteAttributeString("name", areaName); xtw.WriteAttributeString("name", areaName);
if (rom.AreaSize != null) xtw.WriteOptionalAttributeString("size", rom.AreaSize.ToString());
xtw.WriteAttributeString("size", rom.AreaSize.ToString()); xtw.WriteOptionalAttributeString("width", rom.AreaWidth);
if (rom.AreaWidth != null) xtw.WriteOptionalAttributeString("endianness", rom.AreaEndianness);
xtw.WriteAttributeString("width", rom.AreaWidth);
if (rom.AreaEndianness != null)
xtw.WriteAttributeString("endianness", rom.AreaEndianness);
xtw.WriteStartElement("rom"); xtw.WriteStartElement("rom");
xtw.WriteAttributeString("name", rom.Name); xtw.WriteAttributeString("name", rom.Name);
if (rom.Size != -1) if (rom.Size != -1) xtw.WriteAttributeString("size", rom.Size.ToString());
xtw.WriteAttributeString("size", rom.Size.ToString()); xtw.WriteOptionalAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.CRC)) xtw.WriteOptionalAttributeString("md5", rom.MD5.ToLowerInvariant());
xtw.WriteAttributeString("crc", rom.CRC.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.MD5))
xtw.WriteAttributeString("md5", rom.MD5.ToLowerInvariant());
#if NET_FRAMEWORK #if NET_FRAMEWORK
if (!string.IsNullOrWhiteSpace(rom.RIPEMD160)) xtw.WriteOptionalAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
xtw.WriteAttributeString("ripemd160", rom.RIPEMD160.ToLowerInvariant());
#endif #endif
if (!string.IsNullOrWhiteSpace(rom.SHA1)) xtw.WriteOptionalAttributeString("sha1", rom.SHA1.ToLowerInvariant());
xtw.WriteAttributeString("sha1", rom.SHA1.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha256", rom.SHA256.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA256)) xtw.WriteOptionalAttributeString("sha384", rom.SHA384.ToLowerInvariant());
xtw.WriteAttributeString("sha256", rom.SHA256.ToLowerInvariant()); xtw.WriteOptionalAttributeString("sha512", rom.SHA512.ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.SHA384)) xtw.WriteOptionalAttributeString("offset", rom.Offset);
xtw.WriteAttributeString("sha384", rom.SHA384.ToLowerInvariant()); xtw.WriteOptionalAttributeString("value", rom.Value);
if (!string.IsNullOrWhiteSpace(rom.SHA512)) if (rom.ItemStatus != ItemStatus.None) xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
xtw.WriteAttributeString("sha512", rom.SHA512.ToLowerInvariant()); xtw.WriteOptionalAttributeString("loadflag", rom.LoadFlag);
if (!string.IsNullOrWhiteSpace(rom.Offset))
xtw.WriteAttributeString("offset", rom.Offset);
if (!string.IsNullOrWhiteSpace(rom.Value))
xtw.WriteAttributeString("value", rom.Value);
if (rom.ItemStatus != ItemStatus.None)
xtw.WriteAttributeString("status", rom.ItemStatus.ToString().ToLowerInvariant());
if (!string.IsNullOrWhiteSpace(rom.LoadFlag))
xtw.WriteAttributeString("loadflag", rom.LoadFlag);
xtw.WriteEndElement(); xtw.WriteEndElement();
// End dataarea // End dataarea

View File

@@ -13,7 +13,7 @@ namespace SabreTools.Library.IO
/// <param name="writer">XmlTextWriter to write out with</param> /// <param name="writer">XmlTextWriter to write out with</param>
/// <param name="localName">Name of the attribute</param> /// <param name="localName">Name of the attribute</param>
/// <param name="value">Value to write in the attribute</param> /// <param name="value">Value to write in the attribute</param>
public static void WriteAttributeStringIfExists(this XmlTextWriter writer, string localName, string value) public static void WriteOptionalAttributeString(this XmlTextWriter writer, string localName, string value)
{ {
if (string.IsNullOrEmpty(value)) if (string.IsNullOrEmpty(value))
writer.WriteAttributeString(localName, value); writer.WriteAttributeString(localName, value);

View File

@@ -895,7 +895,6 @@ namespace SabreTools.Library.Tools
case "no": case "no":
case "false": case "false":
return false; return false;
case "partial":
default: default:
return null; return null;
} }
@@ -906,7 +905,33 @@ namespace SabreTools.Library.Tools
"true" => true, "true" => true,
"no" => false, "no" => false,
"false" => false, "false" => false,
"partial" => null, _ => null,
};
#endif
}
/// <summary>
/// Get string value from input bool?
/// </summary>
/// <param name="yesno">bool? to get value from</param>
/// <returns>string corresponding to the bool?</returns>
public static string FromYesNo(this bool? yesno)
{
#if NET_FRAMEWORK
switch (yesno)
{
case true:
return "yes";
case false:
return "no";
default:
return null;
}
#else
return yesno switch
{
true => "yes",
false => "no",
_ => null, _ => null,
}; };
#endif #endif