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

Maybe fixes the issue with source/system sorting?

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-13 16:50:45 -07:00
parent e5ebc52129
commit a10592ebf3
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SabreHelper/RomManipulation.cs
View File

@@ -647,14 +647,6 @@ namespace SabreTools.Helper
{ {
if (x.MD5 == y.MD5) if (x.MD5 == y.MD5)
{ {
if (x.SHA1 == y.SHA1)
{
if (x.SystemID == y.SystemID)
{
return x.SourceID - y.SourceID;
}
return x.SystemID - y.SystemID;
}
return String.Compare(x.SHA1, y.SHA1); return String.Compare(x.SHA1, y.SHA1);
} }
return String.Compare(x.MD5, y.MD5); return String.Compare(x.MD5, y.MD5);
@@ -697,6 +689,24 @@ namespace SabreTools.Helper
last.MD5 = (last.MD5 == "" && rom.MD5 != "" ? rom.MD5 : last.MD5); last.MD5 = (last.MD5 == "" && rom.MD5 != "" ? rom.MD5 : last.MD5);
last.SHA1 = (last.SHA1 == "" && rom.SHA1 != "" ? rom.SHA1 : last.SHA1); last.SHA1 = (last.SHA1 == "" && rom.SHA1 != "" ? rom.SHA1 : last.SHA1);
// If the current system has a lower ID than the previous, set the system accordingly
if (last.SystemID < rom.SystemID)
{
last.SystemID = rom.SystemID;
last.System = rom.System;
last.Game = rom.Game;
last.Name = rom.Name;
}
// If the current source has a lower ID than the previous, set the source accordingly
if (last.SourceID < rom.SourceID)
{
last.SourceID = rom.SourceID;
last.Source = rom.Source;
last.Game = rom.Game;
last.Name = rom.Name;
}
// If the duplicate is external already or should be, set it // If the duplicate is external already or should be, set it
if (last.Dupe >= DupeType.ExternalHash || last.SystemID != rom.SystemID || last.SourceID != rom.SourceID) if (last.Dupe >= DupeType.ExternalHash || last.SystemID != rom.SystemID || last.SourceID != rom.SourceID)
{ {