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

[ALL] Remove Hash struct

Browse Source 
This is a bit controversial, even for me, but for the time being, we need to tie very specific information to each type of item. That means that a Rom and a Disk, though they both have hashes, they have different hashes. I'm going to see how this plays out for the time being.
This commit is contained in:
Matt Nadareski
2016-09-19 20:36:12 -07:00
parent b549085c34
commit 1db04406c3
12 changed files with 266 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
SabreTools.Helper/Objects/DatObjects/Disk.cs
View File

@@ -1,24 +1,32 @@
namespace SabreTools.Helper
using System;
namespace SabreTools.Helper
{
public class Disk : DatItem
{
#region Private instance variables
// Disk information
private Hash _hashData;
protected string _md5;
protected string _sha1;
// private string _merge;
// private DiskStatus _romStatus;
private bool _nodump;
protected bool _nodump;
#endregion
#region Publicly facing variables
// Disk information
public Hash HashData
public string MD5
{
get { return _hashData; }
set { _hashData = value; }
get { return _md5; }
set { _md5 = value; }
}
public string SHA1
{
get { return _sha1; }
set { _sha1 = value; }
}
public bool Nodump
{
@@ -52,11 +60,8 @@
{
_name = name;
_itemType = ItemType.Disk;
_hashData = new Hash
{
MD5 = md5.ToLowerInvariant(),
SHA1 = sha1.ToLowerInvariant(),
};
_md5 = md5.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant();
_nodump = nodump;
}
@@ -89,11 +94,8 @@
{
_name = name;
_itemType = ItemType.Disk;
_hashData = new Hash
{
MD5 = md5.ToLowerInvariant(),
SHA1 = sha1.ToLowerInvariant(),
};
_md5 = md5.ToLowerInvariant();
_sha1 = sha1.ToLowerInvariant();
_nodump = nodump;
_machineName = machineName;
_comment = comment;
@@ -136,7 +138,11 @@
return dupefound;
}
dupefound = _hashData.Equals(newOther.HashData, false);
if (((String.IsNullOrEmpty(_md5) || String.IsNullOrEmpty(newOther.MD5)) || this.MD5 == newOther.MD5) &&
((String.IsNullOrEmpty(this.SHA1) || String.IsNullOrEmpty(newOther.SHA1)) || this.SHA1 == newOther.SHA1))
{
dupefound = true;
}
return dupefound;
}