SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Remove unnecessary RemapDatItemToMachine method

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-16 13:00:13 -04:00
parent 096f9d4b96
commit b8966f5e37
4 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -508,35 +508,6 @@ namespace SabreTools.Metadata.DatFiles.Test
#endregion
#region RemapDatItemToMachine
[Fact]
public void RemapDatItemToMachineTest()
{
Source source = new Source(0, source: null);
Machine origMachine = new Machine { Name = "original" };
Machine newMachine = new Machine { Name = "new" };
DatItem datItem = new Rom();
var dict = new ItemDatabase();
long sourceIndex = dict.AddSource(source);
long origMachineIndex = dict.AddMachine(origMachine);
long newMachineIndex = dict.AddMachine(newMachine);
long itemIndex = dict.AddItem(datItem, origMachineIndex, sourceIndex, statsOnly: false);
dict.RemapDatItemToMachine(itemIndex, newMachineIndex);
var actual = dict.GetMachineForItem(itemIndex);
Assert.Equal(1, actual.Key);
Assert.NotNull(actual.Value);
Assert.Equal("new", actual.Value.Name);
}
#endregion
#region RemoveBucket
[Fact]

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

@@ -600,7 +600,7 @@ namespace SabreTools.Metadata.DatFiles
return;
// Reassign the item to the new machine
ItemsDB.RemapDatItemToMachine(datItem.Key, newMachineIndex);
datItem.Value.MachineIndex = newMachineIndex;
// Remove extensions from File and Rom items
if (datItem.Value is DatItems.Formats.File || datItem.Value is Rom)

10
SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
View File

@@ -450,7 +450,7 @@ namespace SabreTools.Metadata.DatFiles
.Select(i => (i as Disk)!.Name)
.Contains(mergeTag))
{
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
item.Value.MachineIndex = cloneOfMachine.Key;
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
}
@@ -460,7 +460,7 @@ namespace SabreTools.Metadata.DatFiles
.Select(i => (i as Disk)!.Name)
.Contains(disk.Name))
{
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
item.Value.MachineIndex = cloneOfMachine.Key;
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
}
}
@@ -488,7 +488,7 @@ namespace SabreTools.Metadata.DatFiles
if (subfolder)
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key);
item.Value.MachineIndex = cloneOfMachine.Key;
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
}
@@ -498,7 +498,7 @@ namespace SabreTools.Metadata.DatFiles
if (subfolder)
rom.Name = $"{machineName}\\{rom.Name}";
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
item.Value.MachineIndex = cloneOfMachine.Key;
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
}
}
@@ -509,7 +509,7 @@ namespace SabreTools.Metadata.DatFiles
if (subfolder)
item.Value.SetName($"{machineName}\\{item.Value.GetName()}");
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
item.Value.MachineIndex = cloneOfMachine.Key;
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
}

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

@@ -447,17 +447,6 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
public IDictionary<long, Source> GetSources() => _sources;
/// <summary>
/// Remap an item to a new machine index without validation
/// </summary>
/// <param name="itemIndex">Current item index</param>
/// <param name="machineIndex">New machine index</param>
public void RemapDatItemToMachine(long itemIndex, long machineIndex)
{
if (_items.TryGetValue(itemIndex, out var item))
item.MachineIndex = machineIndex;
}
/// <summary>
/// Remove a key from the file dictionary if it exists
/// </summary>