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

Rely on bucket key helpers

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-14 15:45:02 -05:00
parent 8b24bb84a8
commit f5b97ab0dc
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -736,7 +736,7 @@ namespace SabreTools.DatFiles
BucketBy(GetBestAvailable(), DedupeType.None); BucketBy(GetBestAvailable(), DedupeType.None);
// Now that we have the sorted type, we get the proper key // Now that we have the sorted type, we get the proper key
return datItem.GetKey(_bucketedBy); return GetBucketKey(datItem, _bucketedBy, lower: true, norename: true);
} }
#endregion #endregion

7
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -943,10 +943,7 @@ namespace SabreTools.DatFiles
#endif #endif
var source = GetSourceForItem(itemIndex); var source = GetSourceForItem(itemIndex);
string sourceKeyPadded = source.Value?.Index.ToString().PadLeft(10, '0') + '-';
var machine = GetMachineForItem(itemIndex); var machine = GetMachineForItem(itemIndex);
string machineName = machine.Value?.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? "Default";
// Treat NULL like machine // Treat NULL like machine
if (bucketBy == ItemKey.NULL) if (bucketBy == ItemKey.NULL)
@@ -1188,9 +1185,7 @@ namespace SabreTools.DatFiles
BucketBy(GetBestAvailable(), DedupeType.None); BucketBy(GetBestAvailable(), DedupeType.None);
// Now that we have the sorted type, we get the proper key // Now that we have the sorted type, we get the proper key
var machine = GetMachineForItem(datItem.Key); return GetBucketKey(datItem.Key, _bucketedBy, lower: true, norename: true);
var source = GetSourceForItem(datItem.Key);
return datItem.Value.GetKeyDB(_bucketedBy, machine.Value, source.Value);
} }
#endregion #endregion