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

Use consistent sorting in all places

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-19 10:39:32 -04:00
parent 935d991464
commit c3c080852c
3 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -1155,11 +1155,20 @@ namespace SabreTools.DatFiles
{
// Create the comparer extenal to the delegate
var nc = new NaturalComparer();
itemMappings.Sort(delegate (KeyValuePair<long, DatItem> x, KeyValuePair<long, DatItem> y)
{
try
{
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = GetSourceForItem(x.Key).Value?.Index ?? 0;
int ySourceIndex = GetSourceForItem(y.Key).Value?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
// Get the machines
Machine? xMachine = _machines[_itemToMachineMapping[x.Key]];
Machine? yMachine = _machines[_itemToMachineMapping[y.Key]];
@@ -1185,13 +1194,7 @@ namespace SabreTools.DatFiles
// If item names don't match
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.Value.GetName()));
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.Value.GetName()));
if (xName != yName)
return nc.Compare(xName, yName);
// Otherwise, compare on machine or source, depending on the flag
int? xSourceIndex = GetSourceForItem(x.Key).Value?.Index;
int? ySourceIndex = GetSourceForItem(y.Key).Value?.Index;
return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0);
return nc.Compare(xName, yName);
}
catch
{