Convert subitems for Configuration and DipSwitch

This commit is contained in:
Matt Nadareski
2026-04-04 00:08:56 -04:00
parent a8c060ff26
commit f7ac1073b0
17 changed files with 215 additions and 220 deletions

View File

@@ -183,7 +183,7 @@ namespace SabreTools.Serialization.CrossModel
var dipswitch = new DipSwitch
{
Name = item.Name,
Entry = item[Data.Models.Metadata.DipSwitch.EntryKey] as string[],
Entry = item.Entry,
Default = item.Default,
};
return dipswitch;

View File

@@ -196,7 +196,7 @@ namespace SabreTools.Serialization.CrossModel
var dipswitch = new Data.Models.Metadata.DipSwitch
{
Name = item.Name,
[Data.Models.Metadata.DipSwitch.EntryKey] = item.Entry,
Entry = item.Entry,
Default = item.Default,
};
return dipswitch;

View File

@@ -232,11 +232,11 @@ namespace SabreTools.Serialization.CrossModel
if (condition is not null)
configuration.Condition = ConvertFromInternalModel(condition);
var confLocations = item.Read<Data.Models.Metadata.ConfLocation[]>(Data.Models.Metadata.Configuration.ConfLocationKey);
var confLocations = item.ConfLocation;
if (confLocations is not null && confLocations.Length > 0)
configuration.ConfLocation = Array.ConvertAll(confLocations, ConvertFromInternalModel);
var confSettings = item.Read<Data.Models.Metadata.ConfSetting[]>(Data.Models.Metadata.Configuration.ConfSettingKey);
var confSettings = item.ConfSetting;
if (confSettings is not null && confSettings.Length > 0)
configuration.ConfSetting = Array.ConvertAll(confSettings, ConvertFromInternalModel);
@@ -366,11 +366,11 @@ namespace SabreTools.Serialization.CrossModel
if (condition is not null)
dipSwitch.Condition = ConvertFromInternalModel(condition);
var dipLocations = item.Read<Data.Models.Metadata.DipLocation[]>(Data.Models.Metadata.DipSwitch.DipLocationKey);
var dipLocations = item.DipLocation;
if (dipLocations is not null && dipLocations.Length > 0)
dipSwitch.DipLocation = Array.ConvertAll(dipLocations, ConvertFromInternalModel);
var dipValues = item.Read<Data.Models.Metadata.DipValue[]>(Data.Models.Metadata.DipSwitch.DipValueKey);
var dipValues = item.DipValue;
if (dipValues is not null && dipValues.Length > 0)
dipSwitch.DipValue = Array.ConvertAll(dipValues, ConvertFromInternalModel);

View File

@@ -265,16 +265,10 @@ namespace SabreTools.Serialization.CrossModel
configuration.Condition = ConvertToInternalModel(item.Condition);
if (item.ConfLocation is not null && item.ConfLocation.Length > 0)
{
configuration[Data.Models.Metadata.Configuration.ConfLocationKey]
= Array.ConvertAll(item.ConfLocation, ConvertToInternalModel);
}
configuration.ConfLocation = Array.ConvertAll(item.ConfLocation, ConvertToInternalModel);
if (item.ConfSetting is not null && item.ConfSetting.Length > 0)
{
configuration[Data.Models.Metadata.Configuration.ConfSettingKey]
= Array.ConvertAll(item.ConfSetting, ConvertToInternalModel);
}
configuration.ConfSetting = Array.ConvertAll(item.ConfSetting, ConvertToInternalModel);
return configuration;
}
@@ -402,16 +396,10 @@ namespace SabreTools.Serialization.CrossModel
dipSwitch.Condition = ConvertToInternalModel(item.Condition);
if (item.DipLocation is not null && item.DipLocation.Length > 0)
{
dipSwitch[Data.Models.Metadata.DipSwitch.DipLocationKey]
= Array.ConvertAll(item.DipLocation, ConvertToInternalModel);
}
dipSwitch.DipLocation = Array.ConvertAll(item.DipLocation, ConvertToInternalModel);
if (item.DipValue is not null && item.DipValue.Length > 0)
{
dipSwitch[Data.Models.Metadata.DipSwitch.DipValueKey]
= Array.ConvertAll(item.DipValue, ConvertToInternalModel);
}
dipSwitch.DipValue = Array.ConvertAll(item.DipValue, ConvertToInternalModel);
return dipSwitch;
}

View File

@@ -98,7 +98,7 @@ namespace SabreTools.Serialization.CrossModel
Mask = item.Mask,
};
var dipValues = item.Read<Data.Models.Metadata.DipValue[]>(Data.Models.Metadata.DipSwitch.DipValueKey);
var dipValues = item.DipValue;
if (dipValues is not null && dipValues.Length > 0)
dipSwitch.DipValue = Array.ConvertAll(dipValues, ConvertFromInternalModel);

View File

@@ -99,7 +99,7 @@ namespace SabreTools.Serialization.CrossModel
};
if (item.DipValue is not null && item.DipValue.Length > 0)
dipSwitch[Data.Models.Metadata.DipSwitch.DipValueKey] = Array.ConvertAll(item.DipValue, ConvertToInternalModel);
dipSwitch.DipValue = Array.ConvertAll(item.DipValue, ConvertToInternalModel);
return dipSwitch;
}