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

DictionaryBase is no more, bon voyage

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-04 23:13:36 -04:00
parent e31be83832
commit bf852ef038
69 changed files with 167 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
View File

@@ -270,25 +270,19 @@ namespace SabreTools.Metadata.DatFiles
// Create the part in the dictionary, if needed
if (!partItems.ContainsKey(partName))
partItems[partName] = [];
partItems[partName] = new();
// Copy over string values
partItems[partName].Name = partName;
if (partItems[partName].Interface == null)
partItems[partName].Interface = partItem.Interface;
// Clear any empty fields
ClearEmptyKeys(partItems[partName]);
// If the item has a DataArea mapping
if (dataAreaMappings.TryGetValue(partItem, out (Data.Models.Metadata.DataArea, Data.Models.Metadata.Rom) dataAreaMap))
{
// Get the mapped items
var (dataArea, romItem) = dataAreaMap;
// Clear any empty fields
ClearEmptyKeys(romItem);
// Get the data area name and skip if there's none
string? dataAreaName = dataArea.Name;
if (dataAreaName is not null)
@@ -306,16 +300,15 @@ namespace SabreTools.Metadata.DatFiles
}
else
{
aggregateDataArea = [];
aggregateDataArea.Endianness = dataArea.Endianness;
aggregateDataArea.Name = dataArea.Name;
aggregateDataArea.Size = dataArea.Size;
aggregateDataArea.Width = dataArea.Width;
aggregateDataArea = new()
{
Endianness = dataArea.Endianness,
Name = dataArea.Name,
Size = dataArea.Size,
Width = dataArea.Width,
};
}
// Clear any empty fields
ClearEmptyKeys(aggregateDataArea);
// Get existing roms as a list
var romsArr = aggregateDataArea.Rom ?? [];
List<Data.Models.Metadata.Rom> roms = [.. romsArr];
@@ -343,9 +336,6 @@ namespace SabreTools.Metadata.DatFiles
// Get the mapped items
var (diskArea, diskItem) = diskAreaMap;
// Clear any empty fields
ClearEmptyKeys(diskItem);
// Get the disk area name and skip if there's none
string? diskAreaName = diskArea.Name;
if (diskAreaName is not null)
@@ -363,13 +353,10 @@ namespace SabreTools.Metadata.DatFiles
}
else
{
aggregateDiskArea = [];
aggregateDiskArea = new();
aggregateDiskArea.Name = diskArea.Name;
}
// Clear any empty fields
ClearEmptyKeys(aggregateDiskArea);
// Get existing disks as a list
var disksArr = aggregateDiskArea.Disk ?? [];
List<Data.Models.Metadata.Disk> disks = [.. disksArr];
@@ -398,9 +385,6 @@ namespace SabreTools.Metadata.DatFiles
var dipSwitchesArr = partItems[partName].DipSwitch ?? [];
List<Data.Models.Metadata.DipSwitch> dipSwitches = [.. dipSwitchesArr];
// Clear any empty fields
ClearEmptyKeys(dipSwitchItem);
// Add the dipswitch
dipSwitches.Add(dipSwitchItem);
@@ -415,9 +399,6 @@ namespace SabreTools.Metadata.DatFiles
var featuresArr = partItems[partName].Feature ?? [];
List<Data.Models.Metadata.Feature> features = [.. featuresArr];
// Clear any empty fields
ClearEmptyKeys(featureItem);
// Add the feature
features.Add(featureItem);
@@ -646,25 +627,19 @@ namespace SabreTools.Metadata.DatFiles
// Create the part in the dictionary, if needed
if (!partItems.ContainsKey(partName))
partItems[partName] = [];
partItems[partName] = new();
// Copy over string values
partItems[partName].Name = partName;
if (partItems[partName].Interface == null)
partItems[partName].Interface = partItem.Interface;
// Clear any empty fields
ClearEmptyKeys(partItems[partName]);
// If the item has a DataArea mapping
if (dataAreaMappings.TryGetValue(partItem, out (Data.Models.Metadata.DataArea, Data.Models.Metadata.Rom) dataAreaMap))
{
// Get the mapped items
var (dataArea, romItem) = dataAreaMap;
// Clear any empty fields
ClearEmptyKeys(romItem);
// Get the data area name and skip if there's none
string? dataAreaName = dataArea.Name;
if (dataAreaName is not null)
@@ -682,16 +657,13 @@ namespace SabreTools.Metadata.DatFiles
}
else
{
aggregateDataArea = [];
aggregateDataArea = new();
aggregateDataArea.Endianness = dataArea.Endianness;
aggregateDataArea.Name = dataArea.Name;
aggregateDataArea.Size = dataArea.Size;
aggregateDataArea.Width = dataArea.Width;
}
// Clear any empty fields
ClearEmptyKeys(aggregateDataArea);
// Get existing roms as a list
var romsArr = aggregateDataArea.Rom ?? [];
List<Data.Models.Metadata.Rom> roms = [.. romsArr];
@@ -719,9 +691,6 @@ namespace SabreTools.Metadata.DatFiles
// Get the mapped items
var (diskArea, diskItem) = diskAreaMap;
// Clear any empty fields
ClearEmptyKeys(diskItem);
// Get the disk area name and skip if there's none
string? diskAreaName = diskArea.Name;
if (diskAreaName is not null)
@@ -739,13 +708,10 @@ namespace SabreTools.Metadata.DatFiles
}
else
{
aggregateDiskArea = [];
aggregateDiskArea = new();
aggregateDiskArea.Name = diskArea.Name;
}
// Clear any empty fields
ClearEmptyKeys(aggregateDiskArea);
// Get existing disks as a list
var disksArr = aggregateDiskArea.Disk ?? [];
List<Data.Models.Metadata.Disk> disks = [.. disksArr];
@@ -774,9 +740,6 @@ namespace SabreTools.Metadata.DatFiles
var dipSwitchesArr = partItems[partName].DipSwitch ?? [];
List<Data.Models.Metadata.DipSwitch> dipSwitches = [.. dipSwitchesArr];
// Clear any empty fields
ClearEmptyKeys(dipSwitchItem);
// Add the dipswitch
dipSwitches.Add(dipSwitchItem);
@@ -791,9 +754,6 @@ namespace SabreTools.Metadata.DatFiles
var featuresArr = partItems[partName].Feature ?? [];
List<Data.Models.Metadata.Feature> features = [.. featuresArr];
// Clear any empty fields
ClearEmptyKeys(featureItem);
// Add the feature
features.Add(featureItem);
@@ -953,19 +913,6 @@ namespace SabreTools.Metadata.DatFiles
return romItem;
}
/// <summary>
/// Clear empty keys from a DictionaryBase object
/// </summary>
private static void ClearEmptyKeys(Data.Models.Metadata.DictionaryBase obj)
{
string[] fieldNames = [.. obj.Keys];
foreach (string fieldName in fieldNames)
{
if (obj[fieldName] is null)
obj.Remove(fieldName);
}
}
#endregion
}
}