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

[Disk, Rom] Better fix for exclusive hashes

Browse Source
This commit is contained in:
Matt Nadareski
2017-07-17 15:04:08 -07:00
parent 983269c164
commit 684dbe11f8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.Library/Dats/Disk.cs
View File

@@ -128,11 +128,11 @@ namespace SabreTools.Library.Dats
}
// If we can determine that the disks have no non-empty hashes in common, we return false
if (((String.IsNullOrEmpty(_md5) && !String.IsNullOrEmpty(newOther.MD5)) || (!String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5)))
&& ((String.IsNullOrEmpty(_sha1) && !String.IsNullOrEmpty(newOther.SHA1)) || (!String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1)))
&& ((String.IsNullOrEmpty(_sha256) && !String.IsNullOrEmpty(newOther.SHA256)) || (!String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256)))
&& ((String.IsNullOrEmpty(_sha384) && !String.IsNullOrEmpty(newOther.SHA384)) || (!String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384)))
&& ((String.IsNullOrEmpty(_sha512) && !String.IsNullOrEmpty(newOther.SHA512)) || (!String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512))))
if (!(String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5))
|| !(String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1))
|| !(String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256))
|| !(String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384))
|| !(String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512)))
{
dupefound = false;
}

14
SabreTools.Library/Dats/Rom.cs
View File

@@ -159,13 +159,13 @@ namespace SabreTools.Library.Dats
}
// If we can determine that the roms have no non-empty hashes in common, we return false
if (((String.IsNullOrEmpty(_crc) && !String.IsNullOrEmpty(newOther.CRC)) || (!String.IsNullOrEmpty(_crc) && String.IsNullOrEmpty(newOther.CRC)))
&& ((String.IsNullOrEmpty(_md5) && !String.IsNullOrEmpty(newOther.MD5)) || (!String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5)))
&& ((String.IsNullOrEmpty(_sha1) && !String.IsNullOrEmpty(newOther.SHA1)) || (!String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1)))
&& ((String.IsNullOrEmpty(_sha256) && !String.IsNullOrEmpty(newOther.SHA256)) || (!String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256)))
&& ((String.IsNullOrEmpty(_sha384) && !String.IsNullOrEmpty(newOther.SHA384)) || (!String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384)))
&& ((String.IsNullOrEmpty(_sha512) && !String.IsNullOrEmpty(newOther.SHA512)) || (!String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512))))
{
if (!(String.IsNullOrEmpty(_crc) && String.IsNullOrEmpty(newOther.CRC))
|| !(String.IsNullOrEmpty(_md5) && String.IsNullOrEmpty(newOther.MD5))
|| !(String.IsNullOrEmpty(_sha1) && String.IsNullOrEmpty(newOther.SHA1))
|| !(String.IsNullOrEmpty(_sha256) && String.IsNullOrEmpty(newOther.SHA256))
|| !(String.IsNullOrEmpty(_sha384) && String.IsNullOrEmpty(newOther.SHA384))
|| !(String.IsNullOrEmpty(_sha512) && String.IsNullOrEmpty(newOther.SHA512)))
{
dupefound = false;
}
else if ((this.Size == newOther.Size)