SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Flatten Analog out of existence

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-09 22:21:15 -04:00
parent 853e2ff5c0
commit ca3ebf33a8
16 changed files with 31 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SabreTools.Metadata.DatItems/DatItem.cs
View File

@@ -12,7 +12,6 @@ namespace SabreTools.Metadata.DatItems
/// </summary>
[JsonObject("datitem"), XmlRoot("datitem")]
[XmlInclude(typeof(Adjuster))]
[XmlInclude(typeof(Analog))]
[XmlInclude(typeof(Archive))]
[XmlInclude(typeof(BiosSet))]
[XmlInclude(typeof(Blank))]

80
SabreTools.Metadata.DatItems/Formats/Analog.cs
View File

@@ -1,80 +0,0 @@
using System.Xml.Serialization;
using Newtonsoft.Json;
namespace SabreTools.Metadata.DatItems.Formats
{
/// <summary>
/// Represents a single analog item
/// </summary>
[JsonObject("analog"), XmlRoot("analog")]
public sealed class Analog : DatItem<Data.Models.Metadata.Analog>
{
#region Properties
/// <inheritdoc>/>
public override Data.Models.Metadata.ItemType ItemType
=> Data.Models.Metadata.ItemType.Analog;
public string? Mask
{
get => _internal.Mask;
set => _internal.Mask = value;
}
#endregion
#region Constructors
public Analog() : base() { }
public Analog(Data.Models.Metadata.Analog item) : base(item) { }
public Analog(Data.Models.Metadata.Analog item, Machine machine, Source source) : this(item)
{
Source = source;
CopyMachineInformation(machine);
}
#endregion
#region Accessors
/// <inheritdoc/>
public override string? GetName() => null;
/// <inheritdoc/>
public override void SetName(string? name) { }
#endregion
#region Cloning Methods
/// <inheritdoc/>
public override object Clone() => new Analog(GetInternalClone());
/// <inheritdoc/>
public override Data.Models.Metadata.Analog GetInternalClone()
=> _internal.Clone() as Data.Models.Metadata.Analog ?? new();
#endregion
#region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem? other)
{
// If the other item is null
if (other is null)
return false;
// If the type matches
if (other is Analog otherAnalog)
return _internal.Equals(otherAnalog._internal);
// Everything else fails
return false;
}
#endregion
}
}

52
SabreTools.Metadata.DatItems/Formats/Port.cs
View File

@@ -1,7 +1,5 @@
using System;
using System.Xml.Serialization;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Metadata.Filter;
namespace SabreTools.Metadata.DatItems.Formats
{
@@ -13,10 +11,11 @@ namespace SabreTools.Metadata.DatItems.Formats
{
#region Properties
public Analog[]? Analog { get; set; }
[JsonIgnore]
public bool AnalogSpecified => Analog is not null && Analog.Length > 0;
public string[]? AnalogMask
{
get => _internal.AnalogMask;
set => _internal.AnalogMask = value;
}
/// <inheritdoc>/>
public override Data.Models.Metadata.ItemType ItemType
@@ -34,12 +33,7 @@ namespace SabreTools.Metadata.DatItems.Formats
public Port() : base() { }
public Port(Data.Models.Metadata.Port item) : base(item)
{
// Handle subitems
if (item.Analog is not null)
Analog = Array.ConvertAll(item.Analog, analog => new Analog(analog)); ;
}
public Port(Data.Models.Metadata.Port item) : base(item) { }
public Port(Data.Models.Metadata.Port item, Machine machine, Source source) : this(item)
{
@@ -66,14 +60,7 @@ namespace SabreTools.Metadata.DatItems.Formats
/// <inheritdoc/>
public override Data.Models.Metadata.Port GetInternalClone()
{
var portItem = _internal.Clone() as Data.Models.Metadata.Port ?? new();
if (Analog is not null)
portItem.Analog = Array.ConvertAll(Analog, analog => analog.GetInternalClone());
return portItem;
}
=> _internal.Clone() as Data.Models.Metadata.Port ?? new();
#endregion
@@ -95,28 +82,5 @@ namespace SabreTools.Metadata.DatItems.Formats
}
#endregion
#region Manipulation
/// <inheritdoc/>
public override bool PassesFilter(FilterRunner filterRunner)
{
if (Machine is not null && !Machine.PassesFilter(filterRunner))
return false;
// TODO: Analog
return filterRunner.Run(_internal);
}
/// <inheritdoc/>
public override bool PassesFilterDB(FilterRunner filterRunner)
{
// TODO: Analog
return filterRunner.Run(_internal);
}
#endregion
}
}