SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-04-19 04:33:17 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Remove need for GetSourceForItem

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-16 15:37:41 -04:00
parent cb8d2885aa
commit 2a2a2a46f9
4 changed files with 65 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Metadata.DatFiles/DatFile.cs
View File

@@ -277,12 +277,6 @@ namespace SabreTools.Metadata.DatFiles
public KeyValuePair<long, Machine?> GetMachineForItemDB(long itemIndex)
=> ItemsDB.GetMachineForItem(itemIndex);
/// <summary>
/// Get the index and source associated with an item index
/// </summary>
public KeyValuePair<long, Source?> GetSourceForItemDB(long itemIndex)
=> ItemsDB.GetSourceForItem(itemIndex);
/// <summary>
/// Remove a key from the file dictionary if it exists
/// </summary>
@@ -882,14 +876,14 @@ namespace SabreTools.Metadata.DatFiles
?? string.Empty;
// Get sources for both items
var datItemSource = ItemsDB.GetSourceForItem(datItem.Key);
var lastItemSource = ItemsDB.GetSourceForItem(lastItem.Value.Key);
var datItemSource = ItemsDB.GetSource(datItem.Value.SourceIndex);
var lastItemSource = ItemsDB.GetSource(lastItem.Value.Value.SourceIndex);
// If the current item exactly matches the last item, then we don't add it
#if NET20 || NET35
if ((ItemsDB.GetDuplicateStatus(datItem, datItemSource.Value, lastItem, lastItemSource.Value) & DupeType.All) != 0)
if ((ItemsDB.GetDuplicateStatus(datItem, datItemSource, lastItem, lastItemSource) & DupeType.All) != 0)
#else
if (ItemsDB.GetDuplicateStatus(datItem, datItemSource.Value, lastItem, lastItemSource.Value).HasFlag(DupeType.All))
if (ItemsDB.GetDuplicateStatus(datItem, datItemSource, lastItem, lastItemSource).HasFlag(DupeType.All))
#endif
{
_logger.Verbose($"Exact duplicate found for '{datItemName}'");
@@ -1202,8 +1196,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = ItemsDB.GetSourceForItem(x.Key).Value?.Index ?? 0;
int ySourceIndex = ItemsDB.GetSourceForItem(y.Key).Value?.Index ?? 0;
int xSourceIndex = ItemsDB.GetSource(x.Value.SourceIndex)?.Index ?? 0;
int ySourceIndex = ItemsDB.GetSource(y.Value.SourceIndex)?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}