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

Only get sorting values when needed

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-13 10:45:08 -04:00
parent d7f1f8d762
commit 9de6a1ce2c
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -426,37 +426,34 @@ namespace SabreTools.DatFiles
{ {
var nc = new NaturalComparer(); var nc = new NaturalComparer();
// Get all required values
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.Item2.GetName() ?? string.Empty));
string? xMachineName = _machines[_itemToMachineMapping[x.Item1]].GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.Item2.GetName() ?? string.Empty));
int? xSourceIndex = x.Item2.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
string? xType = x.Item2.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.Item2.GetName() ?? string.Empty));
string? yMachineName = _machines[_itemToMachineMapping[y.Item1]].GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.Item2.GetName() ?? string.Empty));
int? ySourceIndex = y.Item2.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
string? yType = y.Item2.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
// If machine names don't match // If machine names don't match
string? xMachineName = _machines[_itemToMachineMapping[x.Item1]].GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yMachineName = _machines[_itemToMachineMapping[y.Item1]].GetStringFieldValue(Models.Metadata.Machine.NameKey);
if (xMachineName != yMachineName) if (xMachineName != yMachineName)
return nc.Compare(xMachineName, yMachineName); return nc.Compare(xMachineName, yMachineName);
// If types don't match // If types don't match
string? xType = x.Item2.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
string? yType = y.Item2.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
if (xType != yType) if (xType != yType)
return xType.AsEnumValue<ItemType>() - yType.AsEnumValue<ItemType>(); return xType.AsEnumValue<ItemType>() - yType.AsEnumValue<ItemType>();
// If directory names don't match // If directory names don't match
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.Item2.GetName() ?? string.Empty));
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.Item2.GetName() ?? string.Empty));
if (xDirectoryName != yDirectoryName) if (xDirectoryName != yDirectoryName)
return nc.Compare(xDirectoryName, yDirectoryName); return nc.Compare(xDirectoryName, yDirectoryName);
// If item names don't match // If item names don't match
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.Item2.GetName() ?? string.Empty));
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.Item2.GetName() ?? string.Empty));
if (xName != yName) if (xName != yName)
return nc.Compare(xName, yName); return nc.Compare(xName, yName);
// Otherwise, compare on machine or source, depending on the flag // Otherwise, compare on machine or source, depending on the flag
return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0); int? xSourceIndex = x.Item2.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
int? ySourceIndex = y.Item2.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0);
} }
catch catch
{ {

23
SabreTools.DatItems/DatItem.cs
View File

@@ -622,36 +622,33 @@ namespace SabreTools.DatItems
{ {
var nc = new NaturalComparer(); 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 don't match // If machine names don't match
string? xMachineName = x.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? yMachineName = y.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey);
if (xMachineName != yMachineName) if (xMachineName != yMachineName)
return nc.Compare(xMachineName, yMachineName); return nc.Compare(xMachineName, yMachineName);
// If types don't match // If types don't match
string? xType = x.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
string? yType = y.GetStringFieldValue(Models.Metadata.DatItem.TypeKey);
if (xType != yType) if (xType != yType)
return xType.AsEnumValue<ItemType>() - yType.AsEnumValue<ItemType>(); return xType.AsEnumValue<ItemType>() - yType.AsEnumValue<ItemType>();
// If directory names don't match // If directory names don't match
string? xDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? yDirectoryName = Path.GetDirectoryName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
if (xDirectoryName != yDirectoryName) if (xDirectoryName != yDirectoryName)
return nc.Compare(xDirectoryName, yDirectoryName); return nc.Compare(xDirectoryName, yDirectoryName);
// If item names don't match // If item names don't match
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty));
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty));
if (xName != yName) if (xName != yName)
return nc.Compare(xName, yName); return nc.Compare(xName, yName);
// Otherwise, compare on machine or source, depending on the flag // Otherwise, compare on machine or source, depending on the flag
int? xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
int? ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0); return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0);
} }
catch catch