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

Make sort methods easier to follow

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-14 19:38:21 -05:00
parent 3e5d9da3da
commit 651802a776
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -724,9 +724,13 @@ namespace SabreTools.DatFiles
{ {
var nc = new NaturalComparer(); var nc = new NaturalComparer();
// Get the machines
Machine? xMachine = x.GetFieldValue<Machine>(DatItem.MachineKey);
Machine? yMachine = y.GetFieldValue<Machine>(DatItem.MachineKey);
// If machine names don't match // If machine names don't match
string? xMachineName = x.GetFieldValue<Machine>(DatItem.MachineKey)?.GetStringFieldValue(Models.Metadata.Machine.NameKey); string? xMachineName = xMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yMachineName = y.GetFieldValue<Machine>(DatItem.MachineKey)?.GetStringFieldValue(Models.Metadata.Machine.NameKey); string? yMachineName = yMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
if (xMachineName != yMachineName) if (xMachineName != yMachineName)
return nc.Compare(xMachineName, yMachineName); return nc.Compare(xMachineName, yMachineName);

8
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -1155,9 +1155,13 @@ namespace SabreTools.DatFiles
{ {
var nc = new NaturalComparer(); var nc = new NaturalComparer();
// Get the machines
Machine? xMachine = _machines[_itemToMachineMapping[x.Key]];
Machine? yMachine = _machines[_itemToMachineMapping[y.Key]];
// If machine names don't match // If machine names don't match
string? xMachineName = _machines[_itemToMachineMapping[x.Key]].GetStringFieldValue(Models.Metadata.Machine.NameKey); string? xMachineName = xMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yMachineName = _machines[_itemToMachineMapping[y.Key]].GetStringFieldValue(Models.Metadata.Machine.NameKey); string? yMachineName = yMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
if (xMachineName != yMachineName) if (xMachineName != yMachineName)
return nc.Compare(xMachineName, yMachineName); return nc.Compare(xMachineName, yMachineName);