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

Second experimental attempt at improving merges

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

31
SabreHelper/RomManipulation.cs
View File

@@ -568,6 +568,7 @@ namespace SabreTools.Helper
{ {
List<RomData> outroms = new List<RomData>(); List<RomData> outroms = new List<RomData>();
/*
// First sort the roms by size, crc, sysid, srcid, md5, and sha1 (in order), if not sorted already // First sort the roms by size, crc, sysid, srcid, md5, and sha1 (in order), if not sorted already
if (!presorted) if (!presorted)
{ {
@@ -633,6 +634,36 @@ namespace SabreTools.Helper
return (int)(x.Size - y.Size); return (int)(x.Size - y.Size);
}); });
} }
*/
// First sort the roms by size, crc, md5, sha1, sysid, srcid (in order), if not sorted already
if (!presorted)
{
inroms.Sort(delegate (RomData x, RomData y)
{
if (x.Size == y.Size)
{
if (x.CRC == y.CRC)
{
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.MD5, y.MD5);
}
return String.Compare(x.CRC, y.CRC);
}
return (int)(x.Size - y.Size);
});
}
// Then, deduplicate them by checking to see if data matches // Then, deduplicate them by checking to see if data matches
foreach (RomData rom in inroms) foreach (RomData rom in inroms)