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

Update formatting of DatItems

Browse Source
This commit is contained in:
Matt Nadareski
2022-11-03 12:22:17 -07:00
parent 7e3c04e8a2
commit ee356fb8a2
38 changed files with 305 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.DatItems/Formats/Adjuster.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,15 +16,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Determine whether the value is default /// Determine whether the value is default
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -34,8 +31,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Conditions associated with the adjustment /// Conditions associated with the adjustment
/// </summary> /// </summary>
[JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")]
[XmlElement("conditions")]
public List<Condition> Conditions { get; set; } public List<Condition> Conditions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -68,6 +64,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Adjuster() return new Adjuster()
@@ -89,6 +86,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Adjuster, return false // If we don't have a Adjuster, return false
@@ -99,7 +97,8 @@ namespace SabreTools.DatItems.Formats
Adjuster newOther = other as Adjuster; Adjuster newOther = other as Adjuster;
// If the Adjuster information matches // If the Adjuster information matches
bool match = (Name == newOther.Name && Default == newOther.Default); bool match = (Name == newOther.Name
&& Default == newOther.Default);
if (!match) if (!match)
return match; return match;

8
SabreTools.DatItems/Formats/Analog.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Analog mask value /// Analog mask value
/// </summary> /// </summary>
[JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")]
[XmlElement("mask")]
public string Mask { get; set; } public string Mask { get; set; }
#endregion #endregion
@@ -36,6 +34,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Analog() return new Analog()
@@ -55,6 +54,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Analog, return false // If we don't have a Analog, return false

8
SabreTools.DatItems/Formats/Archive.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
#endregion #endregion
@@ -46,6 +44,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Archive() return new Archive()
@@ -65,6 +64,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have an archive, return false // If we don't have an archive, return false

5
SabreTools.DatItems/Formats/Auxiliary.cs
View File

@@ -1,5 +1,4 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
/// <summary> /// <summary>
@@ -17,10 +16,10 @@ namespace SabreTools.DatItems.Formats
[JsonObject("original"), XmlRoot("original")] [JsonObject("original"), XmlRoot("original")]
public class Original public class Original
{ {
[JsonProperty("value")] [JsonProperty("value"), XmlElement("value")]
public bool? Value { get; set; } public bool? Value { get; set; }
[JsonProperty("content")] [JsonProperty("content"), XmlElement("content")]
public string Content { get; set; } public string Content { get; set; }
} }

14
SabreTools.DatItems/Formats/BiosSet.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,22 +15,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Description of the BIOS /// Description of the BIOS
/// </summary> /// </summary>
[JsonProperty("description", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("description", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("description")]
[XmlElement("description")]
public string Description { get; set; } public string Description { get; set; }
/// <summary> /// <summary>
/// Determine whether the BIOS is default /// Determine whether the BIOS is default
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -64,6 +60,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new BiosSet() return new BiosSet()
@@ -85,6 +82,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a BiosSet, return false // If we don't have a BiosSet, return false

5
SabreTools.DatItems/Formats/Blank.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -25,6 +24,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Blank() return new Blank()
@@ -42,6 +42,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a blank, return false // If we don't have a blank, return false

17
SabreTools.DatItems/Formats/Chip.cs
View File

@@ -1,8 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,23 +16,20 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Internal tag /// Internal tag
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Type of the chip /// Type of the chip
/// </summary> /// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("type")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("type")]
public ChipType ChipType { get; set; } public ChipType ChipType { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -42,8 +38,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Clock speed /// Clock speed
/// </summary> /// </summary>
[JsonProperty("clock", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("clock", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("clock")]
[XmlElement("clock")]
public long? Clock { get; set; } public long? Clock { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -76,6 +71,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Chip() return new Chip()
@@ -98,6 +94,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a chip, return false // If we don't have a chip, return false

17
SabreTools.DatItems/Formats/Condition.cs
View File

@@ -1,8 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,23 +16,20 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Condition tag value /// Condition tag value
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Condition mask /// Condition mask
/// </summary> /// </summary>
[JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")]
[XmlElement("mask")]
public string Mask { get; set; } public string Mask { get; set; }
/// <summary> /// <summary>
/// Condition relationship /// Condition relationship
/// </summary> /// </summary>
[JsonProperty("relation", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("relation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("relation")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("relation")]
public Relation Relation { get; set; } public Relation Relation { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -42,8 +38,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Condition value /// Condition value
/// </summary> /// </summary>
[JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
#endregion #endregion
@@ -62,6 +57,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Condition() return new Condition()
@@ -84,6 +80,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Condition, return false // If we don't have a Condition, return false

23
SabreTools.DatItems/Formats/Configuration.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,29 +16,25 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Tag associated with the configuration /// Tag associated with the configuration
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Mask associated with the configuration /// Mask associated with the configuration
/// </summary> /// </summary>
[JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")]
[XmlElement("mask")]
public string Mask { get; set; } public string Mask { get; set; }
/// <summary> /// <summary>
/// Conditions associated with the configuration /// Conditions associated with the configuration
/// </summary> /// </summary>
[JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")]
[XmlElement("conditions")]
public List<Condition> Conditions { get; set; } public List<Condition> Conditions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -48,8 +43,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Locations associated with the configuration /// Locations associated with the configuration
/// </summary> /// </summary>
[JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("locations")]
[XmlElement("locations")]
public List<Location> Locations { get; set; } public List<Location> Locations { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -58,8 +52,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Settings associated with the configuration /// Settings associated with the configuration
/// </summary> /// </summary>
[JsonProperty("settings", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("settings", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("settings")]
[XmlElement("settings")]
public List<Setting> Settings { get; set; } public List<Setting> Settings { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -92,6 +85,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Configuration() return new Configuration()
@@ -116,6 +110,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Configuration, return false // If we don't have a Configuration, return false

41
SabreTools.DatItems/Formats/Control.cs
View File

@@ -1,8 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,9 +16,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// General type of input /// General type of input
/// </summary> /// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("type")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("type")]
public ControlType ControlType { get; set; } public ControlType ControlType { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -28,8 +26,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Player which the input belongs to /// Player which the input belongs to
/// </summary> /// </summary>
[JsonProperty("player", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("player", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("player")]
[XmlElement("player")]
public long? Player { get; set; } public long? Player { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -38,8 +35,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Total number of buttons /// Total number of buttons
/// </summary> /// </summary>
[JsonProperty("buttons", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("buttons", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("buttons")]
[XmlElement("buttons")]
public long? Buttons { get; set; } public long? Buttons { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -48,8 +44,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Total number of non-optional buttons /// Total number of non-optional buttons
/// </summary> /// </summary>
[JsonProperty("reqbuttons", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("reqbuttons", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("reqbuttons")]
[XmlElement("reqbuttons")]
public long? RequiredButtons { get; set; } public long? RequiredButtons { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -58,8 +53,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Analog minimum value /// Analog minimum value
/// </summary> /// </summary>
[JsonProperty("minimum", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("minimum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("minimum")]
[XmlElement("minimum")]
public long? Minimum { get; set; } public long? Minimum { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -68,8 +62,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Analog maximum value /// Analog maximum value
/// </summary> /// </summary>
[JsonProperty("maximum", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("maximum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("maximum")]
[XmlElement("maximum")]
public long? Maximum { get; set; } public long? Maximum { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -78,8 +71,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Default analog sensitivity /// Default analog sensitivity
/// </summary> /// </summary>
[JsonProperty("sensitivity", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sensitivity", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sensitivity")]
[XmlElement("sensitivity")]
public long? Sensitivity { get; set; } public long? Sensitivity { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -88,8 +80,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Default analog keydelta /// Default analog keydelta
/// </summary> /// </summary>
[JsonProperty("keydelta", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("keydelta", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("keydelta")]
[XmlElement("keydelta")]
public long? KeyDelta { get; set; } public long? KeyDelta { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -98,8 +89,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Default analog reverse setting /// Default analog reverse setting
/// </summary> /// </summary>
[JsonProperty("reverse", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("reverse", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("reverse")]
[XmlElement("reverse")]
public bool? Reverse { get; set; } public bool? Reverse { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -108,22 +98,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// First set of ways /// First set of ways
/// </summary> /// </summary>
[JsonProperty("ways", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("ways", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways")]
[XmlElement("ways")]
public string Ways { get; set; } public string Ways { get; set; }
/// <summary> /// <summary>
/// Second set of ways /// Second set of ways
/// </summary> /// </summary>
[JsonProperty("ways2", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("ways2", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways2")]
[XmlElement("ways2")]
public string Ways2 { get; set; } public string Ways2 { get; set; }
/// <summary> /// <summary>
/// Third set of ways /// Third set of ways
/// </summary> /// </summary>
[JsonProperty("ways3", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("ways3", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ways3")]
[XmlElement("ways3")]
public string Ways3 { get; set; } public string Ways3 { get; set; }
#endregion #endregion
@@ -142,6 +129,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Control() return new Control()
@@ -172,6 +160,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Control, return false // If we don't have a Control, return false

17
SabreTools.DatItems/Formats/DataArea.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,15 +16,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Total size of the area /// Total size of the area
/// </summary> /// </summary>
[JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("size")]
[XmlElement("size")]
public long? Size { get; set; } public long? Size { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -34,8 +31,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Word width for the area /// Word width for the area
/// </summary> /// </summary>
[JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("width")]
[XmlElement("width")]
public long? Width { get; set; } public long? Width { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -44,8 +40,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Byte endianness of the area /// Byte endianness of the area
/// </summary> /// </summary>
[JsonProperty("endianness", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("endianness", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("endianness")]
[XmlElement("endianness")]
public Endianness Endianness { get; set; } public Endianness Endianness { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -78,6 +73,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new DataArea() return new DataArea()
@@ -100,6 +96,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a DataArea, return false // If we don't have a DataArea, return false

26
SabreTools.DatItems/Formats/Device.cs
View File

@@ -1,9 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -18,9 +17,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Device type /// Device type
/// </summary> /// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("type")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("type")]
public DeviceType DeviceType { get; set; } public DeviceType DeviceType { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -29,23 +27,20 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Device tag /// Device tag
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Fixed image format /// Fixed image format
/// </summary> /// </summary>
[JsonProperty("fixed_image", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("fixed_image", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("fixed_image")]
[XmlElement("fixed_image")]
public string FixedImage { get; set; } public string FixedImage { get; set; }
/// <summary> /// <summary>
/// Determines if the devices is mandatory /// Determines if the devices is mandatory
/// </summary> /// </summary>
/// <remarks>Only value used seems to be 1. Used like bool, but actually int</remarks> /// <remarks>Only value used seems to be 1. Used like bool, but actually int</remarks>
[JsonProperty("mandatory", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("mandatory", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mandatory")]
[XmlElement("mandatory")]
public long? Mandatory { get; set; } public long? Mandatory { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -54,15 +49,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Device interface /// Device interface
/// </summary> /// </summary>
[JsonProperty("interface", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("interface", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("interface")]
[XmlElement("interface")]
public string Interface { get; set; } public string Interface { get; set; }
/// <summary> /// <summary>
/// Device instances /// Device instances
/// </summary> /// </summary>
[JsonProperty("instances", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("instances", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("instances")]
[XmlElement("instances")]
public List<Instance> Instances { get; set; } public List<Instance> Instances { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -71,8 +64,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Device extensions /// Device extensions
/// </summary> /// </summary>
[JsonProperty("extensions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("extensions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("extensions")]
[XmlElement("extensions")]
public List<Extension> Extensions { get; set; } public List<Extension> Extensions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -94,6 +86,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Device() return new Device()
@@ -119,6 +112,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Device, return false // If we don't have a Device, return false

8
SabreTools.DatItems/Formats/DeviceReference.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
#endregion #endregion
@@ -47,6 +45,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new DeviceReference() return new DeviceReference()
@@ -66,6 +65,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a device reference, return false // If we don't have a device reference, return false

26
SabreTools.DatItems/Formats/DipSwitch.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -19,29 +18,25 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Tag associated with the dipswitch /// Tag associated with the dipswitch
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Mask associated with the dipswitch /// Mask associated with the dipswitch
/// </summary> /// </summary>
[JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("mask", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("mask")]
[XmlElement("mask")]
public string Mask { get; set; } public string Mask { get; set; }
/// <summary> /// <summary>
/// Conditions associated with the dipswitch /// Conditions associated with the dipswitch
/// </summary> /// </summary>
[JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")]
[XmlElement("conditions")]
public List<Condition> Conditions { get; set; } public List<Condition> Conditions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -50,8 +45,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Locations associated with the dipswitch /// Locations associated with the dipswitch
/// </summary> /// </summary>
[JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("locations", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("locations")]
[XmlElement("locations")]
public List<Location> Locations { get; set; } public List<Location> Locations { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -60,8 +54,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Settings associated with the dipswitch /// Settings associated with the dipswitch
/// </summary> /// </summary>
[JsonProperty("values", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("values", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("values")]
[XmlElement("values")]
public List<Setting> Values { get; set; } public List<Setting> Values { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -74,8 +67,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Original hardware part associated with the item /// Original hardware part associated with the item
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("part")]
[XmlElement("part")]
public Part Part { get; set; } = null; public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -118,6 +110,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new DipSwitch() return new DipSwitch()
@@ -144,6 +137,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a DipSwitch, return false // If we don't have a DipSwitch, return false

40
SabreTools.DatItems/Formats/Disk.cs
View File

@@ -1,10 +1,9 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes; using SabreTools.FileTypes;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -28,15 +27,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Data MD5 hash /// Data MD5 hash
/// </summary> /// </summary>
[JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")]
[XmlElement("md5")]
public string MD5 public string MD5
{ {
get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); } get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); }
@@ -46,8 +43,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Data SHA-1 hash /// Data SHA-1 hash
/// </summary> /// </summary>
[JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")]
[XmlElement("sha1")]
public string SHA1 public string SHA1
{ {
get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); } get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); }
@@ -57,29 +53,25 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Disk name to merge from parent /// Disk name to merge from parent
/// </summary> /// </summary>
[JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("merge")]
[XmlElement("merge")]
public string MergeTag { get; set; } public string MergeTag { get; set; }
/// <summary> /// <summary>
/// Disk region /// Disk region
/// </summary> /// </summary>
[JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("region")]
[XmlElement("region")]
public string Region { get; set; } public string Region { get; set; }
/// <summary> /// <summary>
/// Disk index /// Disk index
/// </summary> /// </summary>
[JsonProperty("index", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("index", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("index")]
[XmlElement("index")]
public string Index { get; set; } public string Index { get; set; }
/// <summary> /// <summary>
/// Disk writable flag /// Disk writable flag
/// </summary> /// </summary>
[JsonProperty("writable", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("writable", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("writable")]
[XmlElement("writable")]
public bool? Writable { get; set; } = null; public bool? Writable { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -88,9 +80,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Disk dump status /// Disk dump status
/// </summary> /// </summary>
[JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("status")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("status")]
public ItemStatus ItemStatus { get; set; } public ItemStatus ItemStatus { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -99,8 +90,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determine if the disk is optional in the set /// Determine if the disk is optional in the set
/// </summary> /// </summary>
[JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("optional")]
[XmlElement("optional")]
public bool? Optional { get; set; } = null; public bool? Optional { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -113,8 +103,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Disk area information /// Disk area information
/// </summary> /// </summary>
[JsonProperty("diskarea", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("diskarea", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("diskarea")]
[XmlElement("diskarea")]
public DiskArea DiskArea { get; set; } = null; public DiskArea DiskArea { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -130,8 +119,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Original hardware part associated with the item /// Original hardware part associated with the item
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("part")]
[XmlElement("part")]
public Part Part { get; set; } = null; public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -191,6 +179,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Disk() return new Disk()
@@ -266,6 +255,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
bool dupefound = false; bool dupefound = false;

8
SabreTools.DatItems/Formats/DiskArea.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,8 +16,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("name", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
#endregion #endregion
@@ -48,6 +46,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new DiskArea() return new DiskArea()
@@ -67,6 +66,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a DiskArea, return false // If we don't have a DiskArea, return false

47
SabreTools.DatItems/Formats/Display.cs
View File

@@ -1,8 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,16 +16,14 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Display tag /// Display tag
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// Display type /// Display type
/// </summary> /// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("type")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("type")]
public DisplayType DisplayType { get; set; } public DisplayType DisplayType { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -35,8 +32,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Display rotation /// Display rotation
/// </summary> /// </summary>
[JsonProperty("rotate", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("rotate", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("rotate")]
[XmlElement("rotate")]
public long? Rotate { get; set; } public long? Rotate { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -45,8 +41,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determines if display is flipped in the X-coordinates /// Determines if display is flipped in the X-coordinates
/// </summary> /// </summary>
[JsonProperty("flipx", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("flipx", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("flipx")]
[XmlElement("flipx")]
public bool? FlipX { get; set; } public bool? FlipX { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -55,8 +50,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Display width /// Display width
/// </summary> /// </summary>
[JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("width", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("width")]
[XmlElement("width")]
public long? Width { get; set; } public long? Width { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -65,8 +59,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Display height /// Display height
/// </summary> /// </summary>
[JsonProperty("height", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("height", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("height")]
[XmlElement("height")]
public long? Height { get; set; } public long? Height { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -75,8 +68,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Refresh rate /// Refresh rate
/// </summary> /// </summary>
[JsonProperty("refresh", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("refresh", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("refresh")]
[XmlElement("refresh")]
public double? Refresh { get; set; } public double? Refresh { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -85,8 +77,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Pixel clock timer /// Pixel clock timer
/// </summary> /// </summary>
[JsonProperty("pixclock", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("pixclock", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("pixclock")]
[XmlElement("pixclock")]
public long? PixClock { get; set; } public long? PixClock { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -95,8 +86,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Total horizontal lines /// Total horizontal lines
/// </summary> /// </summary>
[JsonProperty("htotal", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("htotal", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("htotal")]
[XmlElement("htotal")]
public long? HTotal { get; set; } public long? HTotal { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -105,8 +95,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Horizontal blank end /// Horizontal blank end
/// </summary> /// </summary>
[JsonProperty("hbend", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("hbend", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("hbend")]
[XmlElement("hbend")]
public long? HBEnd { get; set; } public long? HBEnd { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -115,8 +104,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Horizontal blank start /// Horizontal blank start
/// </summary> /// </summary>
[JsonProperty("hbstart", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("hbstart", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("hbstart")]
[XmlElement("hbstart")]
public long? HBStart { get; set; } public long? HBStart { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -125,8 +113,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Total vertical lines /// Total vertical lines
/// </summary> /// </summary>
[JsonProperty("vtotal", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("vtotal", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vtotal")]
[XmlElement("vtotal")]
public long? VTotal { get; set; } public long? VTotal { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -135,8 +122,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Vertical blank end /// Vertical blank end
/// </summary> /// </summary>
[JsonProperty("vbend", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("vbend", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vbend")]
[XmlElement("vbend")]
public long? VBEnd { get; set; } public long? VBEnd { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -145,8 +131,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Vertical blank start /// Vertical blank start
/// </summary> /// </summary>
[JsonProperty("vbstart", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("vbstart", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("vbstart")]
[XmlElement("vbstart")]
public long? VBStart { get; set; } public long? VBStart { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -168,6 +153,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Display() return new Display()
@@ -200,6 +186,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Display, return false // If we don't have a Display, return false

36
SabreTools.DatItems/Formats/Driver.cs
View File

@@ -1,14 +1,16 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
/// <summary> /// <summary>
/// Represents the a driver of the machine /// Represents the a driver of the machine
/// </summary> /// </summary>
/// <remarks>
/// TODO: Add new fields to documentation
/// </remarks>
[JsonObject("driver"), XmlRoot("driver")] [JsonObject("driver"), XmlRoot("driver")]
public class Driver : DatItem public class Driver : DatItem
{ {
@@ -17,9 +19,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Overall driver status /// Overall driver status
/// </summary> /// </summary>
[JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("status")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("status")]
public SupportStatus Status { get; set; } public SupportStatus Status { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -28,31 +29,28 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Driver emulation status /// Driver emulation status
/// </summary> /// </summary>
[JsonProperty("emulation", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("emulation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("emulation")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("emulation")]
public SupportStatus Emulation { get; set; } public SupportStatus Emulation { get; set; }
[JsonIgnore] [JsonIgnore]
public bool EmulationSpecified { get { return Emulation != SupportStatus.NULL; ; } } public bool EmulationSpecified { get { return Emulation != SupportStatus.NULL; } }
/// <summary> /// <summary>
/// Cocktail orientation status /// Cocktail orientation status
/// </summary> /// </summary>
[JsonProperty("cocktail", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("cocktail", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("cocktail")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("cocktail")]
public SupportStatus Cocktail { get; set; } public SupportStatus Cocktail { get; set; }
[JsonIgnore] [JsonIgnore]
public bool CocktailSpecified { get { return Cocktail != SupportStatus.NULL; ; } } public bool CocktailSpecified { get { return Cocktail != SupportStatus.NULL; } }
/// <summary> /// <summary>
/// Save state support status /// Save state support status
/// </summary> /// </summary>
[JsonProperty("savestate", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("savestate", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("savestate")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("savestate")]
public Supported SaveState { get; set; } public Supported SaveState { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -61,8 +59,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Requires artwork /// Requires artwork
/// </summary> /// </summary>
[JsonProperty("requiresartwork", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("requiresartwork", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("requiresartwork")]
[XmlElement("requiresartwork")]
public bool? RequiresArtwork { get; set; } public bool? RequiresArtwork { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -71,8 +68,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Unofficial /// Unofficial
/// </summary> /// </summary>
[JsonProperty("unofficial", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("unofficial", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("unofficial")]
[XmlElement("unofficial")]
public bool? Unofficial { get; set; } public bool? Unofficial { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -81,8 +77,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// No sound hardware /// No sound hardware
/// </summary> /// </summary>
[JsonProperty("nosoundhardware", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("nosoundhardware", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("nosoundhardware")]
[XmlElement("nosoundhardware")]
public bool? NoSoundHardware { get; set; } public bool? NoSoundHardware { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -91,8 +86,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Incomplete /// Incomplete
/// </summary> /// </summary>
[JsonProperty("incomplete", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("incomplete", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("incomplete")]
[XmlElement("incomplete")]
public bool? Incomplete { get; set; } public bool? Incomplete { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -114,6 +108,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Driver() return new Driver()
@@ -140,6 +135,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Driver, return false // If we don't have a Driver, return false

8
SabreTools.DatItems/Formats/Extension.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
#endregion #endregion
@@ -47,6 +45,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Extension() return new Extension()
@@ -66,6 +65,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Extension, return false // If we don't have a Extension, return false

18
SabreTools.DatItems/Formats/Feature.cs
View File

@@ -1,8 +1,7 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,9 +16,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Type of feature /// Type of feature
/// </summary> /// </summary>
[JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("type")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("type")]
public FeatureType Type { get; set; } public FeatureType Type { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -28,9 +26,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Emulation status /// Emulation status
/// </summary> /// </summary>
[JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("status")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("status")]
public FeatureStatus Status { get; set; } public FeatureStatus Status { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -39,9 +36,8 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Overall status /// Overall status
/// </summary> /// </summary>
[JsonProperty("overall", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("overall", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("overall")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("overall")]
public FeatureStatus Overall { get; set; } public FeatureStatus Overall { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -63,6 +59,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Feature() return new Feature()
@@ -84,6 +81,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Feature, return false // If we don't have a Feature, return false
@@ -94,7 +92,9 @@ namespace SabreTools.DatItems.Formats
Feature newOther = other as Feature; Feature newOther = other as Feature;
// If the Feature information matches // If the Feature information matches
return (Type == newOther.Type && Status == newOther.Status && Overall == newOther.Overall); return (Type == newOther.Type
&& Status == newOther.Status
&& Overall == newOther.Overall);
} }
#endregion #endregion

14
SabreTools.DatItems/Formats/Info.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Information value /// Information value
/// </summary> /// </summary>
[JsonProperty("value")] [JsonProperty("value"), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
#endregion #endregion
@@ -54,6 +51,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Info() return new Info()
@@ -74,6 +72,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a sample, return false // If we don't have a sample, return false
@@ -84,7 +83,8 @@ namespace SabreTools.DatItems.Formats
Info newOther = other as Info; Info newOther = other as Info;
// If the archive information matches // If the archive information matches
return (Name == newOther.Name && Value == newOther.Value); return (Name == newOther.Name
&& Value == newOther.Value);
} }
#endregion #endregion

20
SabreTools.DatItems/Formats/Input.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,8 +16,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Input service ID /// Input service ID
/// </summary> /// </summary>
[JsonProperty("service", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("service", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("service")]
[XmlElement("service")]
public bool? Service { get; set; } public bool? Service { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -27,8 +25,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determins if this has a tilt sensor /// Determins if this has a tilt sensor
/// </summary> /// </summary>
[JsonProperty("tilt", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tilt", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tilt")]
[XmlElement("tilt")]
public bool? Tilt { get; set; } public bool? Tilt { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -37,8 +34,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Number of players on the input /// Number of players on the input
/// </summary> /// </summary>
[JsonProperty("players", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("players", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("players")]
[XmlElement("players")]
public long? Players { get; set; } public long? Players { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -47,8 +43,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Number of coins required /// Number of coins required
/// </summary> /// </summary>
[JsonProperty("coins", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("coins", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("coins")]
[XmlElement("coins")]
public long? Coins { get; set; } public long? Coins { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -57,8 +52,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Set of controls for the input /// Set of controls for the input
/// </summary> /// </summary>
[JsonProperty("controls", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("controls", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("controls")]
[XmlElement("controls")]
public List<Control> Controls { get; set; } public List<Control> Controls { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -80,6 +74,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Input() return new Input()
@@ -103,6 +98,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Input, return false // If we don't have a Input, return false

14
SabreTools.DatItems/Formats/Instance.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Short name for the instance /// Short name for the instance
/// </summary> /// </summary>
[JsonProperty("briefname", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("briefname", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("briefname")]
[XmlElement("briefname")]
public string BriefName { get; set; } public string BriefName { get; set; }
#endregion #endregion
@@ -54,6 +51,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Instance() return new Instance()
@@ -74,6 +72,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Instance, return false // If we don't have a Instance, return false
@@ -84,7 +83,8 @@ namespace SabreTools.DatItems.Formats
Instance newOther = other as Instance; Instance newOther = other as Instance;
// If the Instance information matches // If the Instance information matches
return (Name == newOther.Name && BriefName == newOther.BriefName); return (Name == newOther.Name
&& BriefName == newOther.BriefName);
} }
#endregion #endregion

14
SabreTools.DatItems/Formats/Location.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Location name /// Location name
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Location ID /// Location ID
/// </summary> /// </summary>
[JsonProperty("number", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("number", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("number")]
[XmlElement("number")]
public long? Number { get; set; } public long? Number { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -33,8 +30,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determines if location is inverted or not /// Determines if location is inverted or not
/// </summary> /// </summary>
[JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("inverted")]
[XmlElement("inverted")]
public bool? Inverted { get; set; } public bool? Inverted { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -67,6 +63,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Location() return new Location()
@@ -88,6 +85,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Location, return false // If we don't have a Location, return false

20
SabreTools.DatItems/Formats/Media.cs
View File

@@ -1,10 +1,9 @@
using System.Text; using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes; using SabreTools.FileTypes;
using Newtonsoft.Json;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -28,15 +27,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Data MD5 hash /// Data MD5 hash
/// </summary> /// </summary>
[JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")]
[XmlElement("md5")]
public string MD5 public string MD5
{ {
get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); } get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); }
@@ -46,8 +43,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Data SHA-1 hash /// Data SHA-1 hash
/// </summary> /// </summary>
[JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")]
[XmlElement("sha1")]
public string SHA1 public string SHA1
{ {
get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); } get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); }
@@ -57,8 +53,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Data SHA-256 hash /// Data SHA-256 hash
/// </summary> /// </summary>
[JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha256")]
[XmlElement("sha256")]
public string SHA256 public string SHA256
{ {
get { return _sha256.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha256); } get { return _sha256.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha256); }
@@ -68,8 +63,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SpamSum fuzzy hash /// File SpamSum fuzzy hash
/// </summary> /// </summary>
[JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("spamsum")]
[XmlElement("spamsum")]
public string SpamSum public string SpamSum
{ {
get { return _spamsum.IsNullOrEmpty() ? null : Encoding.UTF8.GetString(_spamsum); } get { return _spamsum.IsNullOrEmpty() ? null : Encoding.UTF8.GetString(_spamsum); }
@@ -120,6 +114,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Media() return new Media()
@@ -184,6 +179,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
bool dupefound = false; bool dupefound = false;

14
SabreTools.DatItems/Formats/Part.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -15,16 +14,13 @@ namespace SabreTools.DatItems.Formats
{ {
#region Fields #region Fields
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
[JsonProperty("interface")] [JsonProperty("interface"), XmlElement("interface")]
[XmlElement("interface")]
public string Interface { get; set; } public string Interface { get; set; }
[JsonProperty("features", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("features", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("features")]
[XmlElement("features")]
public List<PartFeature> Features { get; set; } public List<PartFeature> Features { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -57,6 +53,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Part() return new Part()
@@ -78,6 +75,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Part, return false // If we don't have a Part, return false

14
SabreTools.DatItems/Formats/PartFeature.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// PartFeature value /// PartFeature value
/// </summary> /// </summary>
[JsonProperty("value")] [JsonProperty("value"), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
#endregion #endregion
@@ -54,6 +51,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new PartFeature() return new PartFeature()
@@ -74,6 +72,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a sample, return false // If we don't have a sample, return false
@@ -84,7 +83,8 @@ namespace SabreTools.DatItems.Formats
PartFeature newOther = other as PartFeature; PartFeature newOther = other as PartFeature;
// If the archive information matches // If the archive information matches
return (Name == newOther.Name && Value == newOther.Value); return (Name == newOther.Name
&& Value == newOther.Value);
} }
#endregion #endregion

11
SabreTools.DatItems/Formats/Port.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,15 +16,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Tag for the port /// Tag for the port
/// </summary> /// </summary>
[JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("tag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("tag")]
[XmlElement("tag")]
public string Tag { get; set; } public string Tag { get; set; }
/// <summary> /// <summary>
/// List of analogs on the port /// List of analogs on the port
/// </summary> /// </summary>
[JsonProperty("analogs", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("analogs", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("analogs")]
[XmlElement("analogs")]
public List<Analog> Analogs { get; set; } public List<Analog> Analogs { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -47,6 +44,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Port() return new Port()
@@ -67,6 +65,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Port, return false // If we don't have a Port, return false

18
SabreTools.DatItems/Formats/RamOption.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Determine whether the RamOption is default /// Determine whether the RamOption is default
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -33,8 +30,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determines the content of the RamOption /// Determines the content of the RamOption
/// </summary> /// </summary>
[JsonProperty("content", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("content", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("content")]
[XmlElement("content")]
public string Content { get; set; } public string Content { get; set; }
#endregion #endregion
@@ -64,6 +60,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new RamOption() return new RamOption()
@@ -85,6 +82,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a RamOption, return false // If we don't have a RamOption, return false
@@ -95,7 +93,9 @@ namespace SabreTools.DatItems.Formats
RamOption newOther = other as RamOption; RamOption newOther = other as RamOption;
// If the BiosSet information matches // If the BiosSet information matches
return (Name == newOther.Name && Default == newOther.Default && Content == newOther.Content); return (Name == newOther.Name
&& Default == newOther.Default
&& Content == newOther.Content);
} }
#endregion #endregion

20
SabreTools.DatItems/Formats/Release.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,36 +15,31 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Release region(s) /// Release region(s)
/// </summary> /// </summary>
[JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("region")]
[XmlElement("region")]
public string Region { get; set; } public string Region { get; set; }
/// <summary> /// <summary>
/// Release language(s) /// Release language(s)
/// </summary> /// </summary>
[JsonProperty("language", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("language", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("language")]
[XmlElement("language")]
public string Language { get; set; } public string Language { get; set; }
/// <summary> /// <summary>
/// Date of release /// Date of release
/// </summary> /// </summary>
[JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("date")]
[XmlElement("date")]
public string Date { get; set; } public string Date { get; set; }
/// <summary> /// <summary>
/// Default release, if applicable /// Default release, if applicable
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -82,6 +76,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Release() return new Release()
@@ -105,6 +100,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a release return false // If we don't have a release return false

106
SabreTools.DatItems/Formats/Rom.cs
View File

@@ -2,12 +2,11 @@
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Core.Tools; using SabreTools.Core.Tools;
using SabreTools.FileTypes; using SabreTools.FileTypes;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -36,22 +35,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// What BIOS is required for this rom /// What BIOS is required for this rom
/// </summary> /// </summary>
[JsonProperty("bios", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("bios", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("bios")]
[XmlElement("bios")]
public string Bios { get; set; } public string Bios { get; set; }
/// <summary> /// <summary>
/// Byte size of the rom /// Byte size of the rom
/// </summary> /// </summary>
[JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("size", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("size")]
[XmlElement("size")]
public long? Size { get; set; } = null; public long? Size { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -60,8 +56,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File CRC32 hash /// File CRC32 hash
/// </summary> /// </summary>
[JsonProperty("crc", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("crc", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("crc")]
[XmlElement("crc")]
public string CRC public string CRC
{ {
get { return _crc.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_crc); } get { return _crc.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_crc); }
@@ -71,8 +66,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File MD5 hash /// File MD5 hash
/// </summary> /// </summary>
[JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("md5", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("md5")]
[XmlElement("md5")]
public string MD5 public string MD5
{ {
get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); } get { return _md5.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_md5); }
@@ -82,8 +76,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SHA-1 hash /// File SHA-1 hash
/// </summary> /// </summary>
[JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha1", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha1")]
[XmlElement("sha1")]
public string SHA1 public string SHA1
{ {
get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); } get { return _sha1.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha1); }
@@ -93,8 +86,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SHA-256 hash /// File SHA-256 hash
/// </summary> /// </summary>
[JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha256", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha256")]
[XmlElement("sha256")]
public string SHA256 public string SHA256
{ {
get { return _sha256.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha256); } get { return _sha256.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha256); }
@@ -104,8 +96,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SHA-384 hash /// File SHA-384 hash
/// </summary> /// </summary>
[JsonProperty("sha384", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha384", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha384")]
[XmlElement("sha384")]
public string SHA384 public string SHA384
{ {
get { return _sha384.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha384); } get { return _sha384.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha384); }
@@ -115,8 +106,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SHA-512 hash /// File SHA-512 hash
/// </summary> /// </summary>
[JsonProperty("sha512", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("sha512", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("sha512")]
[XmlElement("sha512")]
public string SHA512 public string SHA512
{ {
get { return _sha512.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha512); } get { return _sha512.IsNullOrEmpty() ? null : Utilities.ByteArrayToString(_sha512); }
@@ -126,8 +116,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// File SpamSum fuzzy hash /// File SpamSum fuzzy hash
/// </summary> /// </summary>
[JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("spamsum", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("spamsum")]
[XmlElement("spamsum")]
public string SpamSum public string SpamSum
{ {
get { return _spamsum.IsNullOrEmpty() ? null : Encoding.UTF8.GetString(_spamsum); } get { return _spamsum.IsNullOrEmpty() ? null : Encoding.UTF8.GetString(_spamsum); }
@@ -137,37 +126,32 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Rom name to merge from parent /// Rom name to merge from parent
/// </summary> /// </summary>
[JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("merge", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("merge")]
[XmlElement("merge")]
public string MergeTag { get; set; } public string MergeTag { get; set; }
/// <summary> /// <summary>
/// Rom region /// Rom region
/// </summary> /// </summary>
[JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("region", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("biregionos")]
[XmlElement("biregionos")]
public string Region { get; set; } public string Region { get; set; }
/// <summary> /// <summary>
/// Data offset within rom /// Data offset within rom
/// </summary> /// </summary>
[JsonProperty("offset", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("offset", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("offset")]
[XmlElement("offset")]
public string Offset { get; set; } public string Offset { get; set; }
/// <summary> /// <summary>
/// File created date /// File created date
/// </summary> /// </summary>
[JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("date", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("date")]
[XmlElement("date")]
public string Date { get; set; } public string Date { get; set; }
/// <summary> /// <summary>
/// Rom dump status /// Rom dump status
/// </summary> /// </summary>
[JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("status")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
[XmlElement("status")]
public ItemStatus ItemStatus { get; set; } public ItemStatus ItemStatus { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -176,8 +160,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determine if the rom is optional in the set /// Determine if the rom is optional in the set
/// </summary> /// </summary>
[JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("optional", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("optional")]
[XmlElement("optional")]
public bool? Optional { get; set; } = null; public bool? Optional { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -186,8 +169,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Determine if the CRC32 hash is inverted /// Determine if the CRC32 hash is inverted
/// </summary> /// </summary>
[JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("inverted", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("inverted")]
[XmlElement("inverted")]
public bool? Inverted { get; set; } = null; public bool? Inverted { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -200,22 +182,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Source of file /// Source of file
/// </summary> /// </summary>
[JsonProperty("ado_source", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("ado_source", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ado_source")]
[XmlElement("ado_source")]
public string ArchiveDotOrgSource { get; set; } public string ArchiveDotOrgSource { get; set; }
/// <summary> /// <summary>
/// Archive.org recognized file format /// Archive.org recognized file format
/// </summary> /// </summary>
[JsonProperty("ado_format", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("ado_format", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("ado_format")]
[XmlElement("ado_format")]
public string ArchiveDotOrgFormat { get; set; } public string ArchiveDotOrgFormat { get; set; }
/// <summary> /// <summary>
/// Original filename /// Original filename
/// </summary> /// </summary>
[JsonProperty("original_filename", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("original_filename", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("original_filename")]
[XmlElement("original_filename")]
public string OriginalFilename { get; set; } public string OriginalFilename { get; set; }
/// <summary> /// <summary>
@@ -224,15 +203,13 @@ namespace SabreTools.DatItems.Formats
/// <remarks> /// <remarks>
/// TODO: This might be Int32? /// TODO: This might be Int32?
/// </remarks> /// </remarks>
[JsonProperty("rotation", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("rotation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("rotation")]
[XmlElement("rotation")]
public string Rotation { get; set; } public string Rotation { get; set; }
/// <summary> /// <summary>
/// Summation value? /// Summation value?
/// </summary> /// </summary>
[JsonProperty("summation", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("summation", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("summation")]
[XmlElement("summation")]
public string Summation { get; set; } public string Summation { get; set; }
#endregion #endregion
@@ -242,15 +219,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Alternate name for the item /// Alternate name for the item
/// </summary> /// </summary>
[JsonProperty("alt_romname", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("alt_romname", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("alt_romname")]
[XmlElement("alt_romname")]
public string AltName { get; set; } public string AltName { get; set; }
/// <summary> /// <summary>
/// Alternate title for the item /// Alternate title for the item
/// </summary> /// </summary>
[JsonProperty("alt_title", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("alt_title", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("alt_title")]
[XmlElement("alt_title")]
public string AltTitle { get; set; } public string AltTitle { get; set; }
#endregion #endregion
@@ -260,8 +235,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// OpenMSX sub item type /// OpenMSX sub item type
/// </summary> /// </summary>
[JsonProperty("original", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("original", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("original")]
[XmlElement("original")]
public Original Original { get; set; } = null; public Original Original { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -270,8 +244,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// OpenMSX sub item type /// OpenMSX sub item type
/// </summary> /// </summary>
[JsonProperty("openmsx_subtype", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("openmsx_subtype", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("openmsx_subtype")]
[XmlElement("openmsx_subtype")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public OpenMSXSubType OpenMSXSubType { get; set; } public OpenMSXSubType OpenMSXSubType { get; set; }
@@ -282,22 +255,19 @@ namespace SabreTools.DatItems.Formats
/// OpenMSX sub item type /// OpenMSX sub item type
/// </summary> /// </summary>
/// <remarks>Not related to the subtype above</remarks> /// <remarks>Not related to the subtype above</remarks>
[JsonProperty("openmsx_type", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("openmsx_type", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("openmsx_type")]
[XmlElement("openmsx_type")]
public string OpenMSXType { get; set; } public string OpenMSXType { get; set; }
/// <summary> /// <summary>
/// Item remark (like a comment) /// Item remark (like a comment)
/// </summary> /// </summary>
[JsonProperty("remark", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("remark", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("remark")]
[XmlElement("remark")]
public string Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// Boot state /// Boot state
/// </summary> /// </summary>
[JsonProperty("boot", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("boot", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("boot")]
[XmlElement("boot")]
public string Boot { get; set; } public string Boot { get; set; }
#endregion #endregion
@@ -307,8 +277,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Data area information /// Data area information
/// </summary> /// </summary>
[JsonProperty("dataarea", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("dataarea", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("dataarea")]
[XmlElement("dataarea")]
public DataArea DataArea { get; set; } = null; public DataArea DataArea { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -327,8 +296,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Loading flag /// Loading flag
/// </summary> /// </summary>
[JsonProperty("loadflag", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("loadflag", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("loadflag")]
[XmlElement("loadflag")]
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public LoadFlag LoadFlag { get; set; } public LoadFlag LoadFlag { get; set; }
@@ -338,8 +306,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Original hardware part associated with the item /// Original hardware part associated with the item
/// </summary> /// </summary>
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("part")]
[XmlElement("part")]
public Part Part { get; set; } = null; public Part Part { get; set; } = null;
[JsonIgnore] [JsonIgnore]
@@ -356,8 +323,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// SoftwareList value associated with the item /// SoftwareList value associated with the item
/// </summary> /// </summary>
[JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
#endregion #endregion
@@ -433,6 +399,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Rom() return new Rom()
@@ -503,6 +470,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
bool dupefound = false; bool dupefound = false;

8
SabreTools.DatItems/Formats/Sample.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
#endregion #endregion
@@ -47,6 +45,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Sample() return new Sample()
@@ -66,6 +65,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a sample, return false // If we don't have a sample, return false

17
SabreTools.DatItems/Formats/Setting.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,22 +16,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Setting name /// Setting name
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Setting value /// Setting value
/// </summary> /// </summary>
[JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
/// <summary> /// <summary>
/// Determines if the setting is default or not /// Determines if the setting is default or not
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -41,8 +37,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// List of conditions on the setting /// List of conditions on the setting
/// </summary> /// </summary>
[JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("conditions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("conditions")]
[XmlElement("conditions")]
public List<Condition> Conditions { get; set; } public List<Condition> Conditions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -75,6 +70,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Setting() return new Setting()
@@ -97,6 +93,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Setting, return false // If we don't have a Setting, return false

14
SabreTools.DatItems/Formats/SharedFeature.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,15 +15,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// SharedFeature value /// SharedFeature value
/// </summary> /// </summary>
[JsonProperty("value")] [JsonProperty("value"), XmlElement("value")]
[XmlElement("value")]
public string Value { get; set; } public string Value { get; set; }
#endregion #endregion
@@ -54,6 +51,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new SharedFeature() return new SharedFeature()
@@ -74,6 +72,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a sample, return false // If we don't have a sample, return false
@@ -84,7 +83,8 @@ namespace SabreTools.DatItems.Formats
SharedFeature newOther = other as SharedFeature; SharedFeature newOther = other as SharedFeature;
// If the archive information matches // If the archive information matches
return (Name == newOther.Name && Value == newOther.Value); return (Name == newOther.Name
&& Value == newOther.Value);
} }
#endregion #endregion

11
SabreTools.DatItems/Formats/Slot.cs
View File

@@ -1,8 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -17,15 +16,13 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Name of the item /// Name of the item
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Slot options associated with the slot /// Slot options associated with the slot
/// </summary> /// </summary>
[JsonProperty("slotoptions", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("slotoptions", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("slotoptions")]
[XmlElement("slotoptions")]
public List<SlotOption> SlotOptions { get; set; } public List<SlotOption> SlotOptions { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -58,6 +55,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Slot() return new Slot()
@@ -78,6 +76,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Slot, return false // If we don't have a Slot, return false

14
SabreTools.DatItems/Formats/SlotOption.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,22 +15,19 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Slot option name /// Slot option name
/// </summary> /// </summary>
[JsonProperty("name")] [JsonProperty("name"), XmlElement("name")]
[XmlElement("name")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// Referenced device name /// Referenced device name
/// </summary> /// </summary>
[JsonProperty("devname")] [JsonProperty("devname"), XmlElement("devname")]
[XmlElement("devname")]
public string DeviceName { get; set; } public string DeviceName { get; set; }
/// <summary> /// <summary>
/// Determines if this slot option is default or not /// Determines if this slot option is default or not
/// </summary> /// </summary>
[JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("default", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("default")]
[XmlElement("default")]
public bool? Default { get; set; } public bool? Default { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -64,6 +60,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new SlotOption() return new SlotOption()
@@ -85,6 +82,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a SlotOption, return false // If we don't have a SlotOption, return false

3
SabreTools.DatItems/Formats/SoftwareList.cs
View File

@@ -9,6 +9,9 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Represents which SoftwareList(s) is associated with a set /// Represents which SoftwareList(s) is associated with a set
/// </summary> /// </summary>
/// <remarks>
/// TODO: Add new fields to documentation
/// </remarks>
[JsonObject("softwarelist"), XmlRoot("softwarelist")] [JsonObject("softwarelist"), XmlRoot("softwarelist")]
public class SoftwareList : DatItem public class SoftwareList : DatItem
{ {

8
SabreTools.DatItems/Formats/Sound.cs
View File

@@ -1,7 +1,6 @@
using System.Xml.Serialization; using System.Xml.Serialization;
using SabreTools.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using SabreTools.Core;
namespace SabreTools.DatItems.Formats namespace SabreTools.DatItems.Formats
{ {
@@ -16,8 +15,7 @@ namespace SabreTools.DatItems.Formats
/// <summary> /// <summary>
/// Number of speakers or channels /// Number of speakers or channels
/// </summary> /// </summary>
[JsonProperty("channels", DefaultValueHandling = DefaultValueHandling.Ignore)] [JsonProperty("channels", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("channels")]
[XmlElement("channels")]
public long? Channels { get; set; } public long? Channels { get; set; }
[JsonIgnore] [JsonIgnore]
@@ -39,6 +37,7 @@ namespace SabreTools.DatItems.Formats
#region Cloning Methods #region Cloning Methods
/// <inheritdoc/>
public override object Clone() public override object Clone()
{ {
return new Sound() return new Sound()
@@ -58,6 +57,7 @@ namespace SabreTools.DatItems.Formats
#region Comparision Methods #region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem other) public override bool Equals(DatItem other)
{ {
// If we don't have a Sound, return false // If we don't have a Sound, return false