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

[RomTools] Refactor intermediate duplicate finding step

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-16 10:34:37 -07:00
parent 6a36af49ab
commit 9552482af0
1 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
SabreTools.Helper/Tools/RomTools.cs
View File

@@ -187,7 +187,7 @@ namespace SabreTools.Helper
if (outroms.Count != 0) if (outroms.Count != 0)
{ {
// Check if the rom is a duplicate // Check if the rom is a duplicate
bool dupefound = false; DupeType dupetype = DupeType.None;
RomData savedrom = new RomData(); RomData savedrom = new RomData();
int pos = -1; int pos = -1;
for (int i = 0; i < outroms.Count; i++) for (int i = 0; i < outroms.Count; i++)
@@ -195,10 +195,10 @@ namespace SabreTools.Helper
RomData lastrom = outroms[i]; RomData lastrom = outroms[i];
// Get the duplicate status // Get the duplicate status
dupefound = IsDuplicate(rom, lastrom); dupetype = GetDuplicateStatus(rom, lastrom);
// If it's a duplicate, skip adding it to the output but add any missing information // If it's a duplicate, skip adding it to the output but add any missing information
if (dupefound) if (dupetype != DupeType.None)
{ {
savedrom = lastrom; savedrom = lastrom;
pos = i; pos = i;
@@ -206,32 +206,7 @@ namespace SabreTools.Helper
savedrom.CRC = (String.IsNullOrEmpty(savedrom.CRC) && !String.IsNullOrEmpty(rom.CRC) ? rom.CRC : savedrom.CRC); savedrom.CRC = (String.IsNullOrEmpty(savedrom.CRC) && !String.IsNullOrEmpty(rom.CRC) ? rom.CRC : savedrom.CRC);
savedrom.MD5 = (String.IsNullOrEmpty(savedrom.MD5) && !String.IsNullOrEmpty(rom.MD5) ? rom.MD5 : savedrom.MD5); savedrom.MD5 = (String.IsNullOrEmpty(savedrom.MD5) && !String.IsNullOrEmpty(rom.MD5) ? rom.MD5 : savedrom.MD5);
savedrom.SHA1 = (String.IsNullOrEmpty(savedrom.SHA1) && !String.IsNullOrEmpty(rom.SHA1) ? rom.SHA1 : savedrom.SHA1); savedrom.SHA1 = (String.IsNullOrEmpty(savedrom.SHA1) && !String.IsNullOrEmpty(rom.SHA1) ? rom.SHA1 : savedrom.SHA1);
savedrom.Dupe = dupetype;
// If the duplicate is external already or should be, set it
if (savedrom.Dupe >= DupeType.ExternalHash || savedrom.SystemID != rom.SystemID || savedrom.SourceID != rom.SourceID)
{
if (savedrom.Game == rom.Game && savedrom.Name == rom.Name)
{
savedrom.Dupe = DupeType.ExternalAll;
}
else
{
savedrom.Dupe = DupeType.ExternalHash;
}
}
// Otherwise, it's considered an internal dupe
else
{
if (savedrom.Game == rom.Game && savedrom.Name == rom.Name)
{
savedrom.Dupe = DupeType.InternalAll;
}
else
{
savedrom.Dupe = DupeType.InternalHash;
}
}
// If the current system has a lower ID than the previous, set the system accordingly // If the current system has a lower ID than the previous, set the system accordingly
if (rom.SystemID < savedrom.SystemID) if (rom.SystemID < savedrom.SystemID)
@@ -256,7 +231,7 @@ namespace SabreTools.Helper
} }
// If no duplicate is found, add it to the list // If no duplicate is found, add it to the list
if (!dupefound) if (dupetype == DupeType.None)
{ {
outroms.Add(rom); outroms.Add(rom);
} }
@@ -342,6 +317,51 @@ namespace SabreTools.Helper
return dupefound; return dupefound;
} }
/// <summary>
/// Return the duplicate status of two roms
/// </summary>
/// <param name="rom">Current rom to check</param>
/// <param name="lastrom">Last rom to check against</param>
/// <returns>The DupeType corresponding to the relationship between the two</returns>
public static DupeType GetDuplicateStatus(RomData rom, RomData lastrom)
{
DupeType output = DupeType.None;
// If we don't have a duplicate at all, return none
if (!IsDuplicate(rom, lastrom))
{
return output;
}
// If the duplicate is external already or should be, set it
if (lastrom.Dupe >= DupeType.ExternalHash || lastrom.SystemID != rom.SystemID || lastrom.SourceID != rom.SourceID)
{
if (lastrom.Game == rom.Game && lastrom.Name == rom.Name)
{
output = DupeType.ExternalAll;
}
else
{
output = DupeType.ExternalHash;
}
}
// Otherwise, it's considered an internal dupe
else
{
if (lastrom.Game == rom.Game && lastrom.Name == rom.Name)
{
output = DupeType.InternalAll;
}
else
{
output = DupeType.InternalHash;
}
}
return output;
}
/// <summary> /// <summary>
/// Sort a list of RomData objects by SystemID, SourceID, Game, and Name (in order) /// Sort a list of RomData objects by SystemID, SourceID, Game, and Name (in order)
/// </summary> /// </summary>