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

Add nullable context to SabreTools.DatItems

Browse Source 
This change also starts migrating the internals of the DatItem formats to the new internal models. Right now, it's basically just acting like a wrapper around those models.
This commit is contained in:
Matt Nadareski
2023-08-14 13:17:51 -04:00
parent 1752b1a0ac
commit b37aed389e
87 changed files with 3266 additions and 2199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,82 +16,92 @@ namespace SabreTools.DatItems.Formats
/// Name of the item
/// </summary>
[JsonProperty("name"), XmlElement("name")]
public string Name { get; set; }
public string? Name
{
get => _archive.ReadString(Models.Internal.Archive.NameKey);
set => _archive[Models.Internal.Archive.NameKey] = value;
}
/// <summary>
/// Archive ID number
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("number"), XmlElement("number")]
public string Number { get; set; }
public string? Number { get; set; }
/// <summary>
/// Clone value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("clone"), XmlElement("clone")]
public string CloneValue { get; set; }
public string? CloneValue { get; set; }
/// <summary>
/// Regional parent value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("regparent"), XmlElement("regparent")]
public string RegParent { get; set; }
public string? RegParent { get; set; }
/// <summary>
/// Region value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("region"), XmlElement("region")]
public string Region { get; set; }
public string? Region { get; set; }
/// <summary>
/// Languages value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("languages"), XmlElement("languages")]
public string Languages { get; set; }
public string? Languages { get; set; }
/// <summary>
/// Development status value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("devstatus"), XmlElement("devstatus")]
public string DevStatus { get; set; }
public string? DevStatus { get; set; }
/// <summary>
/// Physical value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
/// <remarks>TODO: Is this numeric or a flag?</remarks>
[JsonProperty("physical"), XmlElement("physical")]
public string Physical { get; set; }
public string? Physical { get; set; }
/// <summary>
/// Complete value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
/// <remarks>TODO: Is this numeric or a flag?</remarks>
[JsonProperty("complete"), XmlElement("complete")]
public string Complete { get; set; }
public string? Complete { get; set; }
/// <summary>
/// Categories value
/// </summary>
/// <remarks>No-Intro database export only</remarks>
/// <remarks>TODO: No-Intro database export only</remarks>
[JsonProperty("categories"), XmlElement("categories")]
public string Categories { get; set; }
public string? Categories { get; set; }
/// <summary>
/// Internal Archive model
/// </summary>
[JsonIgnore]
private Models.Internal.Archive _archive = new();
#endregion
#region Accessors
/// <inheritdoc/>
public override string GetName() => Name;
public override string? GetName() => Name;
/// <inheritdoc/>
public override void SetName(string name) => Name = name;
public override void SetName(string? name) => Name = name;
#endregion
@@ -118,20 +128,11 @@ namespace SabreTools.DatItems.Formats
ItemType = this.ItemType,
DupeType = this.DupeType,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,
Machine = this.Machine?.Clone() as Machine,
Source = this.Source?.Clone() as Source,
Remove = this.Remove,
Name = this.Name,
Number = this.Number,
CloneValue = this.CloneValue,
RegParent = this.RegParent,
Region = this.Region,
Languages = this.Languages,
DevStatus = this.DevStatus,
Physical = this.Physical,
Complete = this.Complete,
Categories = this.Categories,
_archive = this._archive?.Clone() as Models.Internal.Archive ?? new Models.Internal.Archive(),
};
}
@@ -140,26 +141,14 @@ namespace SabreTools.DatItems.Formats
#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 (ItemType != other.ItemType)
// If we don't have a Archive, return false
if (ItemType != other?.ItemType || other is not Archive otherInternal)
return false;
// Otherwise, treat it as an archive
Archive newOther = other as Archive;
// If the archive information matches
return (Name == newOther.Name
&& Number == newOther.Number
&& CloneValue == newOther.CloneValue
&& RegParent == newOther.RegParent
&& Region == newOther.Region
&& Languages == newOther.Languages
&& DevStatus == newOther.DevStatus
&& Physical == newOther.Physical
&& Complete == newOther.Complete
&& Categories == newOther.Categories);
// Compare the internal models
return _archive.EqualTo(otherInternal._archive);
}
#endregion