Remove redundant helper methods

This commit is contained in:
Matt Nadareski
2024-03-05 15:24:11 -05:00
parent 3166a438a8
commit fa99e6aefb
33 changed files with 260 additions and 592 deletions

View File

@@ -73,8 +73,8 @@ namespace SabreTools.DatItems
[XmlElement("itemtype")]
public ItemType ItemType
{
get => _internal.ReadString(Models.Metadata.DatItem.TypeKey).AsItemType();
set => _internal[Models.Metadata.DatItem.TypeKey] = value.FromItemType();
get => _internal.ReadString(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
set => _internal[Models.Metadata.DatItem.TypeKey] = value.AsStringValue<ItemType>();
}
/// <summary>

View File

@@ -42,8 +42,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public ChipType ChipType
{
get => _internal.ReadString(Models.Metadata.Chip.ChipTypeKey).AsChipType();
set => _internal[Models.Metadata.Chip.ChipTypeKey] = value.FromChipType();
get => _internal.ReadString(Models.Metadata.Chip.ChipTypeKey).AsEnumValue<ChipType>();
set => _internal[Models.Metadata.Chip.ChipTypeKey] = value.AsStringValue<ChipType>();
}
[JsonIgnore]

View File

@@ -42,8 +42,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public Relation Relation
{
get => _internal.ReadString(Models.Metadata.Condition.RelationKey).AsRelation();
set => _internal[Models.Metadata.Condition.RelationKey] = value.FromRelation();
get => _internal.ReadString(Models.Metadata.Condition.RelationKey).AsEnumValue<Relation>();
set => _internal[Models.Metadata.Condition.RelationKey] = value.AsStringValue<Relation>();
}
[JsonIgnore]

View File

@@ -22,8 +22,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public ControlType ControlType
{
get => _internal.ReadString(Models.Metadata.Control.ControlTypeKey).AsControlType();
set => _internal[Models.Metadata.Control.ControlTypeKey] = value.FromControlType();
get => _internal.ReadString(Models.Metadata.Control.ControlTypeKey).AsEnumValue<ControlType>();
set => _internal[Models.Metadata.Control.ControlTypeKey] = value.AsStringValue<ControlType>();
}
[JsonIgnore]

View File

@@ -57,8 +57,8 @@ namespace SabreTools.DatItems.Formats
[JsonProperty("endianness", DefaultValueHandling = DefaultValueHandling.Ignore), XmlElement("endianness")]
public Endianness Endianness
{
get => _internal.ReadString(Models.Metadata.DataArea.WidthKey).AsEndianness();
set => _internal[Models.Metadata.DataArea.WidthKey] = value.FromEndianness();
get => _internal.ReadString(Models.Metadata.DataArea.WidthKey).AsEnumValue<Endianness>();
set => _internal[Models.Metadata.DataArea.WidthKey] = value.AsStringValue<Endianness>();
}
[JsonIgnore]

View File

@@ -24,8 +24,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public DeviceType DeviceType
{
get => _internal.ReadString(Models.Metadata.Device.DeviceTypeKey).AsDeviceType();
set => _internal[Models.Metadata.Device.DeviceTypeKey] = value.FromDeviceType();
get => _internal.ReadString(Models.Metadata.Device.DeviceTypeKey).AsEnumValue<DeviceType>();
set => _internal[Models.Metadata.Device.DeviceTypeKey] = value.AsStringValue<DeviceType>();
}
[JsonIgnore]

View File

@@ -98,8 +98,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public ItemStatus ItemStatus
{
get => _internal.ReadString(Models.Metadata.Disk.StatusKey).AsItemStatus();
set => _internal[Models.Metadata.Disk.StatusKey] = value.FromItemStatus(yesno: false);
get => _internal.ReadString(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>();
set => _internal[Models.Metadata.Disk.StatusKey] = value.AsStringValue<ItemStatus>(useSecond: false);
}
[JsonIgnore]

View File

@@ -32,8 +32,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public DisplayType DisplayType
{
get => _internal.ReadString(Models.Metadata.Display.DisplayTypeKey).AsDisplayType();
set => _internal[Models.Metadata.Display.DisplayTypeKey] = value.FromDisplayType();
get => _internal.ReadString(Models.Metadata.Display.DisplayTypeKey).AsEnumValue<DisplayType>();
set => _internal[Models.Metadata.Display.DisplayTypeKey] = value.AsStringValue<DisplayType>();
}
[JsonIgnore]

View File

@@ -25,8 +25,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public SupportStatus Status
{
get => _internal.ReadString(Models.Metadata.Driver.StatusKey).AsSupportStatus();
set => _internal[Models.Metadata.Driver.StatusKey] = value.FromSupportStatus();
get => _internal.ReadString(Models.Metadata.Driver.StatusKey).AsEnumValue<SupportStatus>();
set => _internal[Models.Metadata.Driver.StatusKey] = value.AsStringValue<SupportStatus>();
}
[JsonIgnore]
@@ -39,8 +39,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public SupportStatus Emulation
{
get => _internal.ReadString(Models.Metadata.Driver.EmulationKey).AsSupportStatus();
set => _internal[Models.Metadata.Driver.EmulationKey] = value.FromSupportStatus();
get => _internal.ReadString(Models.Metadata.Driver.EmulationKey).AsEnumValue<SupportStatus>();
set => _internal[Models.Metadata.Driver.EmulationKey] = value.AsStringValue<SupportStatus>();
}
[JsonIgnore]
@@ -53,8 +53,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public SupportStatus Cocktail
{
get => _internal.ReadString(Models.Metadata.Driver.CocktailKey).AsSupportStatus();
set => _internal[Models.Metadata.Driver.CocktailKey] = value.FromSupportStatus();
get => _internal.ReadString(Models.Metadata.Driver.CocktailKey).AsEnumValue<SupportStatus>();
set => _internal[Models.Metadata.Driver.CocktailKey] = value.AsStringValue<SupportStatus>();
}
[JsonIgnore]
@@ -67,8 +67,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public Supported SaveState
{
get => _internal.ReadString(Models.Metadata.Driver.SaveStateKey).AsSupported();
set => _internal[Models.Metadata.Driver.SaveStateKey] = value.FromSupported(verbose: true);
get => _internal.ReadString(Models.Metadata.Driver.SaveStateKey).AsEnumValue<Supported>();
set => _internal[Models.Metadata.Driver.SaveStateKey] = value.AsStringValue<Supported>(useSecond: true);
}
[JsonIgnore]

View File

@@ -22,8 +22,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureType Type
{
get => _internal.ReadString(Models.Metadata.Feature.FeatureTypeKey).AsFeatureType();
set => _internal[Models.Metadata.Feature.FeatureTypeKey] = value.FromFeatureType();
get => _internal.ReadString(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>();
set => _internal[Models.Metadata.Feature.FeatureTypeKey] = value.AsStringValue<FeatureType>();
}
[JsonIgnore]
@@ -36,8 +36,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureStatus Status
{
get => _internal.ReadString(Models.Metadata.Feature.StatusKey).AsFeatureStatus();
set => _internal[Models.Metadata.Feature.StatusKey] = value.FromFeatureStatus();
get => _internal.ReadString(Models.Metadata.Feature.StatusKey).AsEnumValue<FeatureStatus>();
set => _internal[Models.Metadata.Feature.StatusKey] = value.AsStringValue<FeatureStatus>();
}
[JsonIgnore]
@@ -50,8 +50,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureStatus Overall
{
get => _internal.ReadString(Models.Metadata.Feature.OverallKey).AsFeatureStatus();
set => _internal[Models.Metadata.Feature.OverallKey] = value.FromFeatureStatus();
get => _internal.ReadString(Models.Metadata.Feature.OverallKey).AsEnumValue<FeatureStatus>();
set => _internal[Models.Metadata.Feature.OverallKey] = value.AsStringValue<FeatureStatus>();
}
[JsonIgnore]

View File

@@ -168,8 +168,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public ItemStatus ItemStatus
{
get => _internal.ReadString(Models.Metadata.Rom.StatusKey).AsItemStatus();
set => _internal[Models.Metadata.Rom.StatusKey] = value.FromItemStatus(yesno: false);
get => _internal.ReadString(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>();
set => _internal[Models.Metadata.Rom.StatusKey] = value.AsStringValue<ItemStatus>(useSecond: false);
}
[JsonIgnore]
@@ -324,8 +324,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public OpenMSXSubType OpenMSXSubType
{
get => _internal.ReadString(Models.Metadata.Rom.OpenMSXMediaType).AsOpenMSXSubType();
set => _internal[Models.Metadata.Rom.OpenMSXMediaType] = value.FromOpenMSXSubType();
get => _internal.ReadString(Models.Metadata.Rom.OpenMSXMediaType).AsEnumValue<OpenMSXSubType>();
set => _internal[Models.Metadata.Rom.OpenMSXMediaType] = value.AsStringValue<OpenMSXSubType>();
}
[JsonIgnore]
@@ -398,8 +398,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public LoadFlag LoadFlag
{
get => _internal.ReadString(Models.Metadata.Rom.LoadFlagKey).AsLoadFlag();
set => _internal[Models.Metadata.Rom.LoadFlagKey] = value.FromLoadFlag();
get => _internal.ReadString(Models.Metadata.Rom.LoadFlagKey).AsEnumValue<LoadFlag>();
set => _internal[Models.Metadata.Rom.LoadFlagKey] = value.AsStringValue<LoadFlag>();
}
[JsonIgnore]

View File

@@ -48,8 +48,8 @@ namespace SabreTools.DatItems.Formats
[XmlElement("status")]
public SoftwareListStatus Status
{
get => _internal.ReadString(Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus();
set => _internal[Models.Metadata.SoftwareList.StatusKey] = value.FromSoftwareListStatus();
get => _internal.ReadString(Models.Metadata.SoftwareList.StatusKey).AsEnumValue<SoftwareListStatus>();
set => _internal[Models.Metadata.SoftwareList.StatusKey] = value.AsStringValue<SoftwareListStatus>();
}
[JsonIgnore]

View File

@@ -293,8 +293,8 @@ namespace SabreTools.DatItems
[XmlElement("runnable")]
public Runnable Runnable
{
get => _machine.ReadString(Models.Metadata.Machine.RunnableKey).AsRunnable();
set => _machine[Models.Metadata.Machine.RunnableKey] = value.FromRunnable();
get => _machine.ReadString(Models.Metadata.Machine.RunnableKey).AsEnumValue<Runnable>();
set => _machine[Models.Metadata.Machine.RunnableKey] = value.AsStringValue<Runnable>();
}
[JsonIgnore]
@@ -467,8 +467,8 @@ namespace SabreTools.DatItems
[XmlElement("supported")]
public Supported Supported
{
get => _machine.ReadString(Models.Metadata.Machine.SupportedKey).AsSupported();
set => _machine[Models.Metadata.Machine.SupportedKey] = value.FromSupported(verbose: true);
get => _machine.ReadString(Models.Metadata.Machine.SupportedKey).AsEnumValue<Supported>();
set => _machine[Models.Metadata.Machine.SupportedKey] = value.AsStringValue<Supported>(useSecond: true);
}
[JsonIgnore]
@@ -689,7 +689,7 @@ namespace SabreTools.DatItems
case MachineField.Score: Score = value; return true;
case MachineField.Subgenre: Subgenre = value; return true;
case MachineField.TitleID: TitleID = value; return true;
case MachineField.Type: MachineType = value.AsMachineType(); return true;
case MachineField.Type: MachineType = value.AsEnumValue<MachineType>(); return true;
}
}