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

Treat buckets during merge/split consistently

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-03 23:36:15 -04:00
parent c6b3b9af80
commit 5ad2e5085b
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SabreTools.DatFiles/DatFile.Splitting.cs
View File

@@ -240,7 +240,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void AddItemsFromChildrenImpl(bool subfolder, bool skipDedup) private void AddItemsFromChildrenImpl(bool subfolder, bool skipDedup)
{ {
foreach (string bucket in Items.SortedKeys) string[] buckets = [.. Items.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -499,7 +500,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void AddItemsFromCloneOfParentImpl() private void AddItemsFromCloneOfParentImpl()
{ {
foreach (string bucket in Items.SortedKeys) List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -618,7 +620,9 @@ namespace SabreTools.DatFiles
private bool AddItemsFromDevicesImpl(bool deviceOnly, bool useSlotOptions) private bool AddItemsFromDevicesImpl(bool deviceOnly, bool useSlotOptions)
{ {
bool foundnew = false; bool foundnew = false;
foreach (string bucket in Items.SortedKeys)
List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket doesn't have items // If the bucket doesn't have items
List<DatItem> datItems = GetItemsForBucket(bucket); List<DatItem> datItems = GetItemsForBucket(bucket);
@@ -762,6 +766,7 @@ namespace SabreTools.DatFiles
private bool AddItemsFromDevicesImplDB(bool deviceOnly, bool useSlotOptions) private bool AddItemsFromDevicesImplDB(bool deviceOnly, bool useSlotOptions)
{ {
bool foundnew = false; bool foundnew = false;
List<string> buckets = [.. ItemsDB.SortedKeys]; List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets) foreach (string bucket in buckets)
{ {
@@ -927,7 +932,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void AddItemsFromRomOfParentImpl() private void AddItemsFromRomOfParentImpl()
{ {
foreach (string bucket in Items.SortedKeys) List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -1010,7 +1016,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void RemoveBiosAndDeviceSetsImpl() private void RemoveBiosAndDeviceSetsImpl()
{ {
foreach (string bucket in Items.SortedKeys) List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -1077,7 +1084,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void RemoveItemsFromCloneOfChildImpl() private void RemoveItemsFromCloneOfChildImpl()
{ {
foreach (string bucket in Items.SortedKeys) List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -1187,8 +1195,8 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void RemoveItemsFromRomOfChildImpl() private void RemoveItemsFromRomOfChildImpl()
{ {
// Loop through the romof tags List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in Items.SortedKeys) foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
List<DatItem> items = GetItemsForBucket(bucket); List<DatItem> items = GetItemsForBucket(bucket);
@@ -1235,7 +1243,6 @@ namespace SabreTools.DatFiles
/// </remarks> /// </remarks>
private void RemoveItemsFromRomOfChildImplDB() private void RemoveItemsFromRomOfChildImplDB()
{ {
// Loop through the romof tags
List<string> buckets = [.. ItemsDB.SortedKeys]; List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets) foreach (string bucket in buckets)
{ {
@@ -1273,7 +1280,8 @@ namespace SabreTools.DatFiles
/// <remarks>Applies to <see cref="Items"/></remarks> /// <remarks>Applies to <see cref="Items"/></remarks>
private void RemoveMachineRelationshipTagsImpl() private void RemoveMachineRelationshipTagsImpl()
{ {
foreach (string bucket in Items.SortedKeys) List<string> buckets = [.. ItemsDB.SortedKeys];
foreach (string bucket in buckets)
{ {
// If the bucket has no items in it // If the bucket has no items in it
var items = GetItemsForBucket(bucket); var items = GetItemsForBucket(bucket);