claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle back-assignment of dataarea and diskarea values

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-12 15:03:31 -04:00
parent 4f3f7b6fb7
commit defba49372
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SabreTools.DatFiles/DatFile.ToMetadata.cs
View File

@@ -466,10 +466,6 @@ namespace SabreTools.DatFiles
string? dataAreaName = dataArea.ReadString(Models.Metadata.DataArea.NameKey); string? dataAreaName = dataArea.ReadString(Models.Metadata.DataArea.NameKey);
if (dataAreaName != null) if (dataAreaName != null)
{ {
// Create the data area array, if needed
if (partItems[partName].Read<Models.Metadata.DataArea[]>(Models.Metadata.Part.DataAreaKey) == null)
partItems[partName][Models.Metadata.Part.DataAreaKey] = new Models.Metadata.DataArea[0];
// Get existing data areas as a list // Get existing data areas as a list
var dataAreas = partItems[partName].Read<Models.Metadata.DataArea[]>(Models.Metadata.Part.DataAreaKey)?.ToList() ?? []; var dataAreas = partItems[partName].Read<Models.Metadata.DataArea[]>(Models.Metadata.Part.DataAreaKey)?.ToList() ?? [];
@@ -481,7 +477,23 @@ namespace SabreTools.DatFiles
else else
aggregateDataArea = []; aggregateDataArea = [];
// Add the disk to the data area // Get existing roms as a list
var roms = aggregateDataArea.Read<Models.Metadata.Rom[]>(Models.Metadata.DataArea.RomKey)?.ToList() ?? [];
// Add the rom to the data area
roms.Add(romItem);
// Assign back the roms
aggregateDataArea[Models.Metadata.DataArea.RomKey] = roms.ToArray();
// Assign back the data area
if (dataAreaIndex > -1)
dataAreas[dataAreaIndex] = aggregateDataArea;
else
dataAreas.Add(aggregateDataArea);
// Assign back the data areas array
partItems[partName][Models.Metadata.Part.DataAreaKey] = dataAreas.ToArray();
} }
} }
@@ -495,10 +507,6 @@ namespace SabreTools.DatFiles
string? diskAreaName = diskArea.ReadString(Models.Metadata.DiskArea.NameKey); string? diskAreaName = diskArea.ReadString(Models.Metadata.DiskArea.NameKey);
if (diskAreaName != null) if (diskAreaName != null)
{ {
// Create the dosk area array, if needed
if (partItems[partName].Read<Models.Metadata.DiskArea[]>(Models.Metadata.Part.DiskAreaKey) == null)
partItems[partName][Models.Metadata.Part.DiskAreaKey] = new Models.Metadata.DiskArea[0];
// Get existing data areas as a list // Get existing data areas as a list
var diskAreas = partItems[partName].Read<Models.Metadata.DiskArea[]>(Models.Metadata.Part.DiskAreaKey)?.ToList() ?? []; var diskAreas = partItems[partName].Read<Models.Metadata.DiskArea[]>(Models.Metadata.Part.DiskAreaKey)?.ToList() ?? [];
@@ -510,7 +518,23 @@ namespace SabreTools.DatFiles
else else
aggregateDiskArea = []; aggregateDiskArea = [];
// Add the disk to the disk area // Get existing disks as a list
var roms = aggregateDiskArea.Read<Models.Metadata.Disk[]>(Models.Metadata.DiskArea.DiskKey)?.ToList() ?? [];
// Add the disk to the data area
roms.Add(diskItem);
// Assign back the disks
aggregateDiskArea[Models.Metadata.DiskArea.DiskKey] = roms.ToArray();
// Assign back the disk area
if (diskAreaIndex > -1)
diskAreas[diskAreaIndex] = aggregateDiskArea;
else
diskAreas.Add(aggregateDiskArea);
// Assign back the disk areas array
partItems[partName][Models.Metadata.Part.DiskAreaKey] = diskAreas.ToArray();
} }
} }