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] Make ArchiveScanLevel and DupeType flags

Browse Source
This commit is contained in:
Matt Nadareski
2016-10-05 20:33:02 -07:00
parent 9d42cdf805
commit 9f9b54cb89
8 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Helper/Objects/Dat/DatItem.cs
View File

@@ -248,7 +248,7 @@ namespace SabreTools.Helper
/// <returns>The DupeType corresponding to the relationship between the two</returns>
public DupeType GetDuplicateStatus(DatItem lastItem, Logger logger)
{
DupeType output = DupeType.None;
DupeType output = 0x00;
// If we don't have a duplicate at all, return none
if (!this.IsDuplicate(lastItem, logger))
@@ -257,15 +257,15 @@ namespace SabreTools.Helper
}
// If the duplicate is external already or should be, set it
if (lastItem.Dupe >= DupeType.ExternalHash || lastItem.SystemID != this.SystemID || lastItem.SourceID != this.SourceID)
if ((lastItem.Dupe & DupeType.External) != 0 || lastItem.SystemID != this.SystemID || lastItem.SourceID != this.SourceID)
{
if (lastItem.MachineName == this.MachineName && lastItem.Name == this.Name)
{
output = DupeType.ExternalAll;
output = DupeType.External | DupeType.All;
}
else
{
output = DupeType.ExternalHash;
output = DupeType.External | DupeType.Hash;
}
}
@@ -274,11 +274,11 @@ namespace SabreTools.Helper
{
if (lastItem.MachineName == this.MachineName && lastItem.Name == this.Name)
{
output = DupeType.InternalAll;
output = DupeType.Internal | DupeType.All;
}
else
{
output = DupeType.InternalHash;
output = DupeType.Internal | DupeType.Hash;
}
}
@@ -696,7 +696,7 @@ namespace SabreTools.Helper
if (outfiles.Count != 0)
{
// Check if the rom is a duplicate
DupeType dupetype = DupeType.None;
DupeType dupetype = 0x00;
DatItem saveditem = new Rom();
int pos = -1;
for (int i = 0; i < outfiles.Count; i++)
@@ -707,7 +707,7 @@ namespace SabreTools.Helper
dupetype = file.GetDuplicateStatus(lastrom, logger);
// If it's a duplicate, skip adding it to the output but add any missing information
if (dupetype != DupeType.None)
if (dupetype != 0x00)
{
// If we don't have a rom or disk, then just skip adding
if (file.Type != ItemType.Rom && file.Type != ItemType.Disk)
@@ -767,7 +767,7 @@ namespace SabreTools.Helper
}
// If no duplicate is found, add it to the list
if (dupetype == DupeType.None)
if (dupetype == 0x00)
{
outfiles.Add(file);
}