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

Make DB version consistent

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-07 15:55:53 -05:00
parent f832b4c9a6
commit dc28242d6c
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
SabreTools.DatItems/DatItem.cs
View File

@@ -234,11 +234,11 @@ namespace SabreTools.DatItems
/// <summary> /// <summary>
/// Return the duplicate status of two items /// Return the duplicate status of two items
/// </summary> /// </summary>
/// <param name="source">Source associated with this item</param> /// <param name="selfSource">Source associated with this item</param>
/// <param name="lastItem">DatItem to check against</param> /// <param name="lastItem">DatItem to check against</param>
/// <param name="lastSource">Source associated with the last item</param> /// <param name="lastSource">Source associated with the last item</param>
/// <returns>The DupeType corresponding to the relationship between the two</returns> /// <returns>The DupeType corresponding to the relationship between the two</returns>
public DupeType GetDuplicateStatus(Source? source, DatItem? lastItem, Source? lastSource) public DupeType GetDuplicateStatusDB(Source? selfSource, DatItem? lastItem, Source? lastSource)
{ {
DupeType output = 0x00; DupeType output = 0x00;
@@ -246,33 +246,36 @@ namespace SabreTools.DatItems
if (!Equals(lastItem)) if (!Equals(lastItem))
return output; return output;
// If the duplicate is external already or should be, set it // TODO: Fix this since machines are determined in a different way
// Get the machines for comparison
var selfMachine = GetFieldValue<Machine>(DatItem.MachineKey);
string? selfMachineName = selfMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
var lastMachine = lastItem.GetFieldValue<Machine>(DatItem.MachineKey);
string? lastMachineName = lastMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey);
// If the duplicate is external already
#if NET20 || NET35 #if NET20 || NET35
if ((lastItem.GetFieldValue<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0 if ((lastItem.GetFieldValue<DupeType>(DatItem.DupeTypeKey) & DupeType.External) != 0)
|| lastSource?.Index != source?.Index)
#else #else
if (lastItem.GetFieldValue<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External) if (lastItem.GetFieldValue<DupeType>(DatItem.DupeTypeKey).HasFlag(DupeType.External))
|| lastSource?.Index != source?.Index)
#endif #endif
{ output |= DupeType.External;
var currentMachine = GetFieldValue<Machine>(DatItem.MachineKey);
var lastMachine = lastItem?.GetFieldValue<Machine>(DatItem.MachineKey); // If the duplicate should be external
if (lastMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) == currentMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) && lastItem?.GetName() == GetName()) else if (lastSource?.Index != selfSource?.Index)
output = DupeType.External | DupeType.All; output |= DupeType.External;
else
output = DupeType.External | DupeType.Hash;
}
// Otherwise, it's considered an internal dupe // Otherwise, it's considered an internal dupe
else else
{ output |= DupeType.Internal;
var currentMachine = GetFieldValue<Machine>(DatItem.MachineKey);
var lastMachine = lastItem?.GetFieldValue<Machine>(DatItem.MachineKey); // If the item and machine names match
if (lastMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) == currentMachine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) && lastItem?.GetName() == GetName()) if (lastMachineName == selfMachineName && lastItem.GetName() == GetName())
output = DupeType.Internal | DupeType.All; output = DupeType.Internal | DupeType.All;
// Otherwise, hash match is assumed
else else
output = DupeType.Internal | DupeType.Hash; output = DupeType.Internal | DupeType.Hash;
}
return output; return output;
} }