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

Fix ordering issue by source

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-19 10:33:57 -04:00
parent 6b5b0cf385
commit 935d991464
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SabreTools.DatTools/Diffing.cs
View File

@@ -256,7 +256,8 @@ namespace SabreTools.DatTools
List<DatFile> outDats = [];
// Ensure the current DatFile is sorted optimally
datFile.BucketBy(ItemKey.CRC);
datFile.BucketBy(ItemKey.CRC, norename: false);
datFile.Deduplicate();
// Loop through each of the inputs and get or create a new DatData object
InternalStopwatch watch = new("Initializing and filling all output DATs");
@@ -306,7 +307,7 @@ namespace SabreTools.DatTools
foreach (var key in datFile.Items.SortedKeys)
#endif
{
List<DatItem> items = ItemDictionary.Merge(datFile.GetItemsForBucket(key));
List<DatItem> items = datFile.GetItemsForBucket(key);
// If the rom list is empty or null, just skip it
if (items == null || items.Count == 0)

2
SabreTools.DatTools/Splitter.cs
View File

@@ -552,7 +552,7 @@ namespace SabreTools.DatTools
/// <returns>-1 for a coming before b, 0 for a == b, 1 for a coming after b</returns>
private static int SplitByLevelSort(string a, string b)
{
NaturalComparer nc = new();
var nc = new NaturalComparer();
int adeep = a.Count(c => c == '/' || c == '\\');
int bdeep = b.Count(c => c == '/' || c == '\\');