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

Backport improvements to sorting code

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-13 10:40:30 -04:00
parent bff92b1c30
commit d7092e9147
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
SabreTools.DatItems/DatItem.cs
View File

@@ -620,26 +620,33 @@ namespace SabreTools.DatItems
{ {
try try
{ {
NaturalComparer nc = new(); var nc = new NaturalComparer();
// Get all required values
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? xMachineName = x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
int? xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
string? xType = x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
string? yMachineName = y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
int? ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
string? yType = y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
// If machine names match, more refinement is needed // If machine names match, more refinement is needed
if (x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey) == y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)) if (xMachineName == yMachineName)
{ {
// If item types match, more refinement is needed // If item types match, more refinement is needed
if (x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey) == y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey)) if (xType == yType)
{ {
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
// If item directory names match, more refinement is needed // If item directory names match, more refinement is needed
if (xDirectoryName == yDirectoryName) if (xDirectoryName == yDirectoryName)
{ {
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
// If item names match, then compare on machine or source, depending on the flag // If item names match, then compare on machine or source, depending on the flag
if (xName == yName) if (xName == yName)
return (norename ? nc.Compare(x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey), y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)) : (x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index - y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index) ?? 0); return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0);
// Otherwise, just sort based on item names // Otherwise, just sort based on item names
return nc.Compare(xName, yName); return nc.Compare(xName, yName);
@@ -650,11 +657,11 @@ namespace SabreTools.DatItems
} }
// Otherwise, just sort based on item type // Otherwise, just sort based on item type
return x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>() - y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>(); return xType.AsEnumValue<ItemType>() - yType.AsEnumValue<ItemType>();
} }
// Otherwise, just sort based on machine name // Otherwise, just sort based on machine name
return nc.Compare(x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey), y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)); return nc.Compare(xMachineName, yMachineName);
} }
catch catch
{ {