claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 11:14:23 +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

36
SabreTools.DatFiles/DatFile.cs
View File

@@ -1130,6 +1130,15 @@ namespace SabreTools.DatFiles
{
try
{
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
// If machine names don't match
string? xMachineName = x.GetMachine()?.GetName();
string? yMachineName = y.GetMachine()?.GetName();
@@ -1151,13 +1160,7 @@ namespace SabreTools.DatFiles
// 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)
return nc.Compare(xName, yName);
// 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 nc.Compare(xName, yName);
}
catch
{
@@ -1184,7 +1187,16 @@ namespace SabreTools.DatFiles
{
try
{
// TODO: Fix this since DB uses an external map for machines
// TODO: Fix this since DB uses an external map for machines and sources
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
// If machine names don't match
string? xMachineName = x.Value.GetMachine()?.GetName();
@@ -1207,13 +1219,7 @@ namespace SabreTools.DatFiles
// If item names don't match
string? xName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(x.Value.GetName() ?? string.Empty));
string? yName = Path.GetFileName(TextHelper.RemovePathUnsafeCharacters(y.Value.GetName() ?? string.Empty));
if (xName != yName)
return nc.Compare(xName, yName);
// Otherwise, compare on machine or source, depending on the flag
int? xSourceIndex = x.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
int? ySourceIndex = y.Value.GetFieldValue<Source?>(DatItem.SourceKey)?.Index;
return (norename ? nc.Compare(xMachineName, yMachineName) : (xSourceIndex - ySourceIndex) ?? 0);
return nc.Compare(xName, yName);
}
catch
{

26
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -378,7 +378,7 @@ namespace SabreTools.DatFiles
// Sort the dictionary to be consistent
_logger.User($"Sorting roms by {bucketBy}");
PerformSorting();
PerformSorting(norename);
}
/// <summary>
@@ -398,7 +398,7 @@ namespace SabreTools.DatFiles
List<DatItem> sortedList = GetItemsForBucket(key);
// Sort and merge the list
Sort(ref sortedList);
Sort(ref sortedList, norename: false);
sortedList = Merge(sortedList);
// Add the list back to the dictionary
@@ -784,7 +784,7 @@ namespace SabreTools.DatFiles
/// <summary>
/// Perform inplace sorting of the dictionary
/// </summary>
private void PerformSorting()
private void PerformSorting(bool norename)
{
#if NET452_OR_GREATER || NETCOREAPP
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
@@ -798,7 +798,7 @@ namespace SabreTools.DatFiles
List<DatItem> sortedList = GetItemsForBucket(key);
// Sort the list of items to be consistent
Sort(ref sortedList);
Sort(ref sortedList, norename);
// Add the list back to the dictionary
RemoveBucket(key);
@@ -814,22 +814,26 @@ namespace SabreTools.DatFiles
/// Sort a list of DatItem objects by SourceID, Game, and Name (in order)
/// </summary>
/// <param name="items">List of DatItem objects representing the items to be sorted</param>
/// <param name="norename">True if files are not renamed, false otherwise</param>
/// <returns>True if it sorted correctly, false otherwise</returns>
private bool Sort(ref List<DatItem> items)
private bool Sort(ref List<DatItem> items, bool norename)
{
// Create the comparer extenal to the delegate
var nc = new NaturalComparer();
// Sort by machine, type, item name, and source
items.Sort(delegate (DatItem x, DatItem y)
{
try
{
// Compare on source
int xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.GetFieldValue<Source?>(DatItem.SourceKey)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}
// Get the machines
Machine? xMachine = x.GetMachine();

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
{