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

Get methods should return all info

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-16 15:55:12 -04:00
parent 2a2a2a46f9
commit ff69b83e05
4 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.Metadata.DatFiles.Test/ItemDatabaseTests.cs
View File

@@ -519,7 +519,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(0, machineIndex);
var actual = dict.GetMachine(machineIndex);
Assert.NotNull(actual);
Assert.NotNull(actual.Value);
}
#endregion

2
SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
View File

@@ -595,7 +595,7 @@ namespace SabreTools.Metadata.DatFiles
// Clone current machine to avoid conflict
long newMachineIndex = AddMachineDB((Machine)machine.Value.Clone());
machine = new KeyValuePair<long, Machine?>(newMachineIndex, ItemsDB.GetMachine(newMachineIndex));
machine = GetMachineDB(newMachineIndex);
if (machine.Value is null)
return;

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

@@ -265,6 +265,12 @@ namespace SabreTools.Metadata.DatFiles
public Dictionary<long, DatItem> GetItemsForBucketDB(string? bucketName, bool filter = false)
=> ItemsDB.GetItemsForBucket(bucketName, filter);
/// <summary>
/// Get the index and machine associated with a machine index
/// </summary>
public KeyValuePair<long, Machine?> GetMachineDB(long machineIndex)
=> ItemsDB.GetMachine(machineIndex);
/// <summary>
/// Get all machines and their indicies
/// </summary>
@@ -277,6 +283,12 @@ namespace SabreTools.Metadata.DatFiles
public KeyValuePair<long, Machine?> GetMachineForItemDB(long itemIndex)
=> ItemsDB.GetMachineForItem(itemIndex);
/// <summary>
/// Get the index and source associated with a source index
/// </summary>
public KeyValuePair<long, Source?> GetSourceDB(long sourceIndex)
=> ItemsDB.GetSource(sourceIndex);
/// <summary>
/// Remove a key from the file dictionary if it exists
/// </summary>
@@ -881,9 +893,9 @@ namespace SabreTools.Metadata.DatFiles
// If the current item exactly matches the last item, then we don't add it
#if NET20 || NET35
if ((ItemsDB.GetDuplicateStatus(datItem, datItemSource, lastItem, lastItemSource) & DupeType.All) != 0)
if ((ItemsDB.GetDuplicateStatus(datItem, datItemSource.Value, lastItem, lastItemSource.Value) & DupeType.All) != 0)
#else
if (ItemsDB.GetDuplicateStatus(datItem, datItemSource, lastItem, lastItemSource).HasFlag(DupeType.All))
if (ItemsDB.GetDuplicateStatus(datItem, datItemSource.Value, lastItem, lastItemSource.Value).HasFlag(DupeType.All))
#endif
{
_logger.Verbose($"Exact duplicate found for '{datItemName}'");
@@ -1196,8 +1208,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = ItemsDB.GetSource(x.Value.SourceIndex)?.Index ?? 0;
int ySourceIndex = ItemsDB.GetSource(y.Value.SourceIndex)?.Index ?? 0;
int xSourceIndex = ItemsDB.GetSource(x.Value.SourceIndex).Value?.Index ?? 0;
int ySourceIndex = ItemsDB.GetSource(y.Value.SourceIndex).Value?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}

30
SabreTools.Metadata.DatFiles/ItemDatabase.cs
View File

@@ -361,12 +361,12 @@ namespace SabreTools.Metadata.DatFiles
/// <summary>
/// Get a machine based on the index
/// </summary>
public Machine? GetMachine(long index)
public KeyValuePair<long, Machine?> GetMachine(long index)
{
if (!_machines.TryGetValue(index, out var machine))
return null;
return new KeyValuePair<long, Machine?>(-1, null);
return machine;
return new KeyValuePair<long, Machine?>(index, machine);
}
/// <summary>
@@ -405,12 +405,12 @@ namespace SabreTools.Metadata.DatFiles
/// <summary>
/// Get a source based on the index
/// </summary>
public Source? GetSource(long index)
public KeyValuePair<long, Source?> GetSource(long index)
{
if (_sources.TryGetValue(index, out var source))
return source;
if (!_sources.TryGetValue(index, out var source))
return new KeyValuePair<long, Source?>(-1, null);
return null;
return new KeyValuePair<long, Source?>(index, source);
}
/// <summary>
@@ -657,7 +657,7 @@ namespace SabreTools.Metadata.DatFiles
_ = SortAndGetKey(datItem, sorted);
var machine = GetMachineForItem(datItem.Key);
var source = GetSource(datItem.Value.SourceIndex);
string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source);
string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source.Value);
// If the key doesn't exist, return the empty list
var items = GetItemsForBucket(key);
@@ -700,7 +700,7 @@ namespace SabreTools.Metadata.DatFiles
_ = SortAndGetKey(datItem, sorted);
var machine = GetMachineForItem(datItem.Key);
var source = GetSource(datItem.Value.SourceIndex);
string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source);
string key = datItem.Value.GetKey(_bucketedBy, machine.Value, source.Value);
// If the key doesn't exist
var roms = GetItemsForBucket(key);
@@ -761,7 +761,7 @@ namespace SabreTools.Metadata.DatFiles
int pos = output.FindIndex(lastItem =>
{
var lastItemSource = GetSource(lastItem.Value.SourceIndex);
return GetDuplicateStatus(kvp, datItemSource, lastItem, lastItemSource) != 0x00;
return GetDuplicateStatus(kvp, datItemSource.Value, lastItem, lastItemSource.Value) != 0x00;
});
if (pos < 0)
{
@@ -773,7 +773,7 @@ namespace SabreTools.Metadata.DatFiles
long savedIndex = output[pos].Key;
DatItem savedItem = output[pos].Value;
var savedItemSource = GetSource(savedItem.SourceIndex);
DupeType dupetype = GetDuplicateStatus(kvp, datItemSource, output[pos], savedItemSource);
DupeType dupetype = GetDuplicateStatus(kvp, datItemSource.Value, output[pos], savedItemSource.Value);
// Disks, Media, and Roms have more information to fill
if (datItem is Disk diskItem && savedItem is Disk savedDisk)
@@ -796,7 +796,7 @@ namespace SabreTools.Metadata.DatFiles
var itemMachine = GetMachineForItem(itemIndex);
// If the current source has a lower ID than the saved, use the saved source
if (itemSource?.Index < savedSource?.Index)
if (itemSource.Value?.Index < savedSource.Value?.Index)
{
datItem.SourceIndex = savedItem.SourceIndex;
_machines[savedMachine.Key] = (itemMachine.Value!.Clone() as Machine)!;
@@ -897,7 +897,7 @@ namespace SabreTools.Metadata.DatFiles
bucketBy = ItemKey.Machine;
// Get the bucket key
return datItem.Value.GetKey(bucketBy, machine, source, lower, norename);
return datItem.Value.GetKey(bucketBy, machine.Value, source.Value, lower, norename);
}
/// <summary>
@@ -1031,8 +1031,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = GetSource(x.Value.SourceIndex)?.Index ?? 0;
int ySourceIndex = GetSource(y.Value.SourceIndex)?.Index ?? 0;
int xSourceIndex = GetSource(x.Value.SourceIndex).Value?.Index ?? 0;
int ySourceIndex = GetSource(y.Value.SourceIndex).Value?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}