Replace AsEnumValue for performance

This commit is contained in:
Matt Nadareski
2025-05-11 22:55:38 -04:00
parent 99580515eb
commit bd09810180
45 changed files with 791 additions and 252 deletions

View File

@@ -39,7 +39,7 @@ namespace SabreTools.DatItems.Formats
blank.SetFieldValue<Machine>(DatItem.MachineKey, GetMachine());
blank.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
blank.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
blank.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
blank.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return blank;
}

View File

@@ -27,7 +27,7 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Chip.SoundOnlyKey) != null)
SetFieldValue<string?>(Models.Metadata.Chip.SoundOnlyKey, GetBoolFieldValue(Models.Metadata.Chip.SoundOnlyKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Chip.ChipTypeKey, GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey).AsEnumValue<ChipType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Chip.ChipTypeKey, GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey).AsChipType().AsStringValue());
}
#endregion

View File

@@ -25,7 +25,7 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.Condition.RelationKey) != null)
SetFieldValue<string?>(Models.Metadata.Condition.RelationKey, GetStringFieldValue(Models.Metadata.Condition.RelationKey).AsEnumValue<Relation>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Condition.RelationKey, GetStringFieldValue(Models.Metadata.Condition.RelationKey).AsRelation().AsStringValue());
}
#endregion

View File

@@ -41,7 +41,7 @@ namespace SabreTools.DatItems.Formats
if (GetInt64FieldValue(Models.Metadata.Control.SensitivityKey) != null)
SetFieldValue<string?>(Models.Metadata.Control.SensitivityKey, GetInt64FieldValue(Models.Metadata.Control.SensitivityKey).ToString());
if (GetStringFieldValue(Models.Metadata.Control.ControlTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Control.ControlTypeKey, GetStringFieldValue(Models.Metadata.Control.ControlTypeKey).AsEnumValue<ControlType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Control.ControlTypeKey, GetStringFieldValue(Models.Metadata.Control.ControlTypeKey).AsControlType().AsStringValue());
}
#endregion

View File

@@ -26,7 +26,7 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey) != null)
SetFieldValue<string?>(Models.Metadata.DataArea.EndiannessKey, GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey).AsEnumValue<Endianness>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.DataArea.EndiannessKey, GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey).AsEndianness().AsStringValue());
if (GetInt64FieldValue(Models.Metadata.DataArea.SizeKey) != null)
SetFieldValue<string?>(Models.Metadata.DataArea.SizeKey, GetInt64FieldValue(Models.Metadata.DataArea.SizeKey).ToString());
if (GetInt64FieldValue(Models.Metadata.DataArea.WidthKey) != null)

View File

@@ -49,7 +49,7 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Device.MandatoryKey) != null)
SetFieldValue<string?>(Models.Metadata.Device.MandatoryKey, GetBoolFieldValue(Models.Metadata.Device.MandatoryKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Device.DeviceTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Device.DeviceTypeKey, GetStringFieldValue(Models.Metadata.Device.DeviceTypeKey).AsEnumValue<DeviceType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Device.DeviceTypeKey, GetStringFieldValue(Models.Metadata.Device.DeviceTypeKey).AsDeviceType().AsStringValue());
// Handle subitems
var instance = item.Read<Models.Metadata.Instance>(Models.Metadata.Device.InstanceKey);

View File

@@ -70,7 +70,7 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Disk.OptionalKey) != null)
SetFieldValue<string?>(Models.Metadata.Disk.OptionalKey, GetBoolFieldValue(Models.Metadata.Disk.OptionalKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Disk.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsEnumValue<ItemStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Disk.StatusKey, GetStringFieldValue(Models.Metadata.Disk.StatusKey).AsItemStatus().AsStringValue());
if (GetBoolFieldValue(Models.Metadata.Disk.WritableKey) != null)
SetFieldValue<string?>(Models.Metadata.Disk.WritableKey, GetBoolFieldValue(Models.Metadata.Disk.WritableKey).FromYesNo());

View File

@@ -41,7 +41,7 @@ namespace SabreTools.DatItems.Formats
if (GetInt64FieldValue(Models.Metadata.Display.RotateKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.RotateKey, GetInt64FieldValue(Models.Metadata.Display.RotateKey).ToString());
if (GetStringFieldValue(Models.Metadata.Display.DisplayTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Models.Metadata.Display.DisplayTypeKey).AsEnumValue<DisplayType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Models.Metadata.Display.DisplayTypeKey).AsDisplayType().AsStringValue());
if (GetInt64FieldValue(Models.Metadata.Display.VBEndKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.VBEndKey, GetInt64FieldValue(Models.Metadata.Display.VBEndKey).ToString());
if (GetInt64FieldValue(Models.Metadata.Display.VBStartKey) != null)
@@ -56,7 +56,7 @@ namespace SabreTools.DatItems.Formats
{
SetFieldValue<long?>(Models.Metadata.Video.AspectXKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectXKey)));
SetFieldValue<long?>(Models.Metadata.Video.AspectYKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.AspectYKey)));
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, item.ReadString(Models.Metadata.Video.ScreenKey).AsEnumValue<DisplayType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, item.ReadString(Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
SetFieldValue<long?>(Models.Metadata.Display.HeightKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.HeightKey)));
SetFieldValue<double?>(Models.Metadata.Display.RefreshKey, NumberHelper.ConvertToDouble(item.ReadString(Models.Metadata.Video.RefreshKey)));
SetFieldValue<long?>(Models.Metadata.Display.WidthKey, NumberHelper.ConvertToInt64(item.ReadString(Models.Metadata.Video.WidthKey)));
@@ -81,7 +81,7 @@ namespace SabreTools.DatItems.Formats
if (GetDoubleFieldValue(Models.Metadata.Video.RefreshKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.RefreshKey, GetDoubleFieldValue(Models.Metadata.Video.RefreshKey).ToString());
if (GetStringFieldValue(Models.Metadata.Video.ScreenKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Models.Metadata.Video.ScreenKey).AsEnumValue<DisplayType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Display.DisplayTypeKey, GetStringFieldValue(Models.Metadata.Video.ScreenKey).AsDisplayType().AsStringValue());
if (GetInt64FieldValue(Models.Metadata.Video.WidthKey) != null)
SetFieldValue<string?>(Models.Metadata.Display.WidthKey, GetInt64FieldValue(Models.Metadata.Video.WidthKey).ToString());
}

View File

@@ -25,11 +25,11 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.Driver.CocktailKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.CocktailKey, GetStringFieldValue(Models.Metadata.Driver.CocktailKey).AsEnumValue<SupportStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Driver.CocktailKey, GetStringFieldValue(Models.Metadata.Driver.CocktailKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Driver.ColorKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.ColorKey, GetStringFieldValue(Models.Metadata.Driver.ColorKey).AsEnumValue<SupportStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Driver.ColorKey, GetStringFieldValue(Models.Metadata.Driver.ColorKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Driver.EmulationKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.EmulationKey, GetStringFieldValue(Models.Metadata.Driver.EmulationKey).AsEnumValue<SupportStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Driver.EmulationKey, GetStringFieldValue(Models.Metadata.Driver.EmulationKey).AsSupportStatus().AsStringValue());
if (GetBoolFieldValue(Models.Metadata.Driver.IncompleteKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.IncompleteKey, GetBoolFieldValue(Models.Metadata.Driver.IncompleteKey).FromYesNo());
if (GetBoolFieldValue(Models.Metadata.Driver.NoSoundHardwareKey) != null)
@@ -39,11 +39,11 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Driver.RequiresArtworkKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.RequiresArtworkKey, GetBoolFieldValue(Models.Metadata.Driver.RequiresArtworkKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Driver.SaveStateKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.SaveStateKey, GetStringFieldValue(Models.Metadata.Driver.SaveStateKey).AsEnumValue<Supported>().AsStringValue(useSecond: true));
SetFieldValue<string?>(Models.Metadata.Driver.SaveStateKey, GetStringFieldValue(Models.Metadata.Driver.SaveStateKey).AsSupported().AsStringValue(useSecond: true));
if (GetStringFieldValue(Models.Metadata.Driver.SoundKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.SoundKey, GetStringFieldValue(Models.Metadata.Driver.SoundKey).AsEnumValue<SupportStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Driver.SoundKey, GetStringFieldValue(Models.Metadata.Driver.SoundKey).AsSupportStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Driver.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.StatusKey, GetStringFieldValue(Models.Metadata.Driver.StatusKey).AsEnumValue<SupportStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Driver.StatusKey, GetStringFieldValue(Models.Metadata.Driver.StatusKey).AsSupportStatus().AsStringValue());
if (GetBoolFieldValue(Models.Metadata.Driver.UnofficialKey) != null)
SetFieldValue<string?>(Models.Metadata.Driver.UnofficialKey, GetBoolFieldValue(Models.Metadata.Driver.UnofficialKey).FromYesNo());
}

View File

@@ -25,11 +25,11 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.Feature.OverallKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.OverallKey, GetStringFieldValue(Models.Metadata.Feature.OverallKey).AsEnumValue<FeatureStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.OverallKey, GetStringFieldValue(Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Feature.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.StatusKey, GetStringFieldValue(Models.Metadata.Feature.StatusKey).AsEnumValue<FeatureStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.StatusKey, GetStringFieldValue(Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
}
#endregion

View File

@@ -34,11 +34,11 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.Feature.OverallKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.OverallKey, GetStringFieldValue(Models.Metadata.Feature.OverallKey).AsEnumValue<FeatureStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.OverallKey, GetStringFieldValue(Models.Metadata.Feature.OverallKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Feature.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.StatusKey, GetStringFieldValue(Models.Metadata.Feature.StatusKey).AsEnumValue<FeatureStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.StatusKey, GetStringFieldValue(Models.Metadata.Feature.StatusKey).AsFeatureStatus().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey) != null)
SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsFeatureType().AsStringValue());
}
#endregion

View File

@@ -148,7 +148,7 @@ namespace SabreTools.DatItems.Formats
releaseDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetMachine());
releaseDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
releaseDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
releaseDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
releaseDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return releaseDetails;
}

View File

@@ -35,7 +35,7 @@ namespace SabreTools.DatItems.Formats
{
get
{
var status = GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>();
var status = GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsItemStatus();
return status != ItemStatus.NULL && status != ItemStatus.None;
}
}
@@ -60,7 +60,7 @@ namespace SabreTools.DatItems.Formats
&& (!string.IsNullOrEmpty(dataArea.GetName())
|| dataArea.GetInt64FieldValue(Models.Metadata.DataArea.SizeKey) != null
|| dataArea.GetInt64FieldValue(Models.Metadata.DataArea.WidthKey) != null
|| dataArea.GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey).AsEnumValue<Endianness>() != Endianness.NULL);
|| dataArea.GetStringFieldValue(Models.Metadata.DataArea.EndiannessKey).AsEndianness() != Endianness.NULL);
}
}
@@ -96,9 +96,9 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Rom.InvertedKey) != null)
SetFieldValue<string?>(Models.Metadata.Rom.InvertedKey, GetBoolFieldValue(Models.Metadata.Rom.InvertedKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Rom.LoadFlagKey) != null)
SetFieldValue<string?>(Models.Metadata.Rom.LoadFlagKey, GetStringFieldValue(Models.Metadata.Rom.LoadFlagKey).AsEnumValue<LoadFlag>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Rom.LoadFlagKey, GetStringFieldValue(Models.Metadata.Rom.LoadFlagKey).AsLoadFlag().AsStringValue());
if (GetStringFieldValue(Models.Metadata.Rom.OpenMSXMediaType) != null)
SetFieldValue<string?>(Models.Metadata.Rom.OpenMSXMediaType, GetStringFieldValue(Models.Metadata.Rom.OpenMSXMediaType).AsEnumValue<OpenMSXSubType>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Rom.OpenMSXMediaType, GetStringFieldValue(Models.Metadata.Rom.OpenMSXMediaType).AsOpenMSXSubType().AsStringValue());
if (GetBoolFieldValue(Models.Metadata.Rom.MIAKey) != null)
SetFieldValue<string?>(Models.Metadata.Rom.MIAKey, GetBoolFieldValue(Models.Metadata.Rom.MIAKey).FromYesNo());
if (GetBoolFieldValue(Models.Metadata.Rom.OptionalKey) != null)
@@ -106,7 +106,7 @@ namespace SabreTools.DatItems.Formats
if (GetBoolFieldValue(Models.Metadata.Rom.SoundOnlyKey) != null)
SetFieldValue<string?>(Models.Metadata.Rom.SoundOnlyKey, GetBoolFieldValue(Models.Metadata.Rom.SoundOnlyKey).FromYesNo());
if (GetStringFieldValue(Models.Metadata.Rom.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsEnumValue<ItemStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.Rom.StatusKey, GetStringFieldValue(Models.Metadata.Rom.StatusKey).AsItemStatus().AsStringValue());
// Process hash values
if (GetInt64FieldValue(Models.Metadata.Rom.SizeKey) != null)

View File

@@ -140,7 +140,7 @@ namespace SabreTools.DatItems.Formats
serials.SetFieldValue<Machine>(DatItem.MachineKey, GetMachine());
serials.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
serials.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
serials.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
serials.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return serials;
}

View File

@@ -25,7 +25,7 @@ namespace SabreTools.DatItems.Formats
{
// Process flag values
if (GetStringFieldValue(Models.Metadata.SoftwareList.StatusKey) != null)
SetFieldValue<string?>(Models.Metadata.SoftwareList.StatusKey, GetStringFieldValue(Models.Metadata.SoftwareList.StatusKey).AsEnumValue<SoftwareListStatus>().AsStringValue());
SetFieldValue<string?>(Models.Metadata.SoftwareList.StatusKey, GetStringFieldValue(Models.Metadata.SoftwareList.StatusKey).AsSoftwareListStatus().AsStringValue());
// Handle subitems
// TODO: Handle the Software subitem

View File

@@ -183,7 +183,7 @@ namespace SabreTools.DatItems.Formats
sourceDetails.SetFieldValue<Machine>(DatItem.MachineKey, GetMachine());
sourceDetails.SetFieldValue<bool?>(DatItem.RemoveKey, GetBoolFieldValue(DatItem.RemoveKey));
sourceDetails.SetFieldValue<Source?>(DatItem.SourceKey, GetFieldValue<Source?>(DatItem.SourceKey));
sourceDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue());
sourceDetails.SetFieldValue<string?>(Models.Metadata.DatItem.TypeKey, GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsItemType().AsStringValue());
return sourceDetails;
}