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

Aggregate sizes directly

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-13 14:49:18 -04:00
parent e82bbdc879
commit 5887a694e8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreTools.DatFiles/DatFile.FromMetadata.cs
View File

@@ -200,7 +200,7 @@ namespace SabreTools.DatFiles
return; return;
// Loop through the machines and add // Loop through the machines and add
#if NET452_OR_GREATER || NETCOREAPP #if NET452_OR_GREATER || NETCOREAPP
Parallel.ForEach(items, Core.Globals.ParallelOptions, machine => Parallel.ForEach(items, Core.Globals.ParallelOptions, machine =>
#elif NET40_OR_GREATER #elif NET40_OR_GREATER
Parallel.ForEach(items, machine => Parallel.ForEach(items, machine =>
@@ -991,20 +991,27 @@ namespace SabreTools.DatFiles
if (roms == null) if (roms == null)
continue; continue;
// Handle "offset" roms by keeping a list before adding // Handle "offset" roms
List<Rom> addRoms = []; List<Rom> addRoms = [];
long runningSize = 0;
foreach (var rom in roms) foreach (var rom in roms)
{ {
// If the item doesn't pass the filter // If the item doesn't pass the filter
if (filterRunner != null && !filterRunner.Run(rom)) if (filterRunner != null && !filterRunner.Run(rom))
continue; continue;
// Convert the item
var romItem = new Rom(rom);
long? size = romItem.GetInt64FieldValue(Models.Metadata.Rom.SizeKey);
if (size != null)
runningSize += size.Value;
// If the rom is a continue // If the rom is a continue
string? loadFlag = rom.ReadString(Models.Metadata.Rom.LoadFlagKey); string? loadFlag = rom.ReadString(Models.Metadata.Rom.LoadFlagKey);
if (loadFlag != null && loadFlag.Equals("continue", StringComparison.OrdinalIgnoreCase)) if (loadFlag != null && loadFlag.Equals("continue", StringComparison.OrdinalIgnoreCase))
continue; continue;
var romItem = new Rom(rom);
romItem.SetFieldValue<DataArea?>(Rom.DataAreaKey, dataAreaItem); romItem.SetFieldValue<DataArea?>(Rom.DataAreaKey, dataAreaItem);
romItem.SetFieldValue<Part?>(Rom.PartKey, partItem); romItem.SetFieldValue<Part?>(Rom.PartKey, partItem);
romItem.SetFieldValue<Source?>(DatItem.SourceKey, source); romItem.SetFieldValue<Source?>(DatItem.SourceKey, source);
@@ -1015,12 +1022,7 @@ namespace SabreTools.DatFiles
// If there is only one item left, check sizes // If there is only one item left, check sizes
if (roms.Length > 1 && addRoms.Count == 1) if (roms.Length > 1 && addRoms.Count == 1)
{ addRoms[0].SetFieldValue<long?>(Models.Metadata.Rom.SizeKey, runningSize);
long? dataAreaSize = dataAreaItem.GetInt64FieldValue(Models.Metadata.DataArea.SizeKey);
long? romSize = addRoms[0].GetInt64FieldValue(Models.Metadata.Rom.SizeKey);
if (dataAreaSize != null && romSize != dataAreaSize)
addRoms[0].SetFieldValue<long?>(Models.Metadata.Rom.SizeKey, dataAreaSize);
}
// Add all of the adjusted roms // Add all of the adjusted roms
foreach (var romItem in addRoms) foreach (var romItem in addRoms)