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

Fix SortDB

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-19 10:45:36 -04:00
parent c3c080852c
commit ed14a83eee
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.DatFiles/DatFile.cs
View File

@@ -1178,7 +1178,7 @@ namespace SabreTools.DatFiles
/// <param name="mappings">List of item ID to DatItem mappings representing the items to be sorted</param> /// <param name="mappings">List of item ID to DatItem mappings representing the items to be sorted</param>
/// <param name="norename">True if files are not renamed, false otherwise</param> /// <param name="norename">True if files are not renamed, false otherwise</param>
/// <returns>True if it sorted correctly, false otherwise</returns> /// <returns>True if it sorted correctly, false otherwise</returns>
private static bool SortDB(ref List<KeyValuePair<long, DatItem>> mappings, bool norename) private bool SortDB(ref List<KeyValuePair<long, DatItem>> mappings, bool norename)
{ {
// Create the comparer extenal to the delegate // Create the comparer extenal to the delegate
var nc = new NaturalComparer(); var nc = new NaturalComparer();
@@ -1187,20 +1187,18 @@ namespace SabreTools.DatFiles
{ {
try try
{ {
// TODO: Fix this since DB uses an external map for machines and sources
// Compare on source if renaming // Compare on source if renaming
if (!norename) if (!norename)
{ {
int xSourceIndex = x.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0; int xSourceIndex = ItemsDB.GetSourceForItem(x.Key).Value?.Index ?? 0;
int ySourceIndex = y.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0; int ySourceIndex = ItemsDB.GetSourceForItem(y.Key).Value?.Index ?? 0;
if (xSourceIndex != ySourceIndex) if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex; return xSourceIndex - ySourceIndex;
} }
// If machine names don't match // If machine names don't match
string? xMachineName = x.Value.GetMachine()?.GetName(); string? xMachineName = ItemsDB.GetMachineForItem(x.Key).Value?.GetName();
string? yMachineName = y.Value.GetMachine()?.GetName(); string? yMachineName = ItemsDB.GetMachineForItem(y.Key).Value?.GetName();
if (xMachineName != yMachineName) if (xMachineName != yMachineName)
return nc.Compare(xMachineName, yMachineName); return nc.Compare(xMachineName, yMachineName);