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

Remove merge tags on clone add

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-12 09:16:28 -04:00
parent 563ca1cac7
commit 7aec205314
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.DatFiles/DatFile.Splitting.cs
View File

@@ -298,6 +298,7 @@ namespace SabreTools.DatFiles
.ConvertAll(i => (i as Disk)!.GetName()) .ConvertAll(i => (i as Disk)!.GetName())
.Contains(mergeTag)) .Contains(mergeTag))
{ {
item.RemoveField(Models.Metadata.Disk.MergeKey);
disk.CopyMachineInformation(copyFrom); disk.CopyMachineInformation(copyFrom);
AddItem(disk, statsOnly: false); AddItem(disk, statsOnly: false);
} }
@@ -305,6 +306,7 @@ namespace SabreTools.DatFiles
// If there is no merge tag, add to parent // If there is no merge tag, add to parent
else if (mergeTag == null && !GetItemsForBucket(cloneOf).Contains(item)) else if (mergeTag == null && !GetItemsForBucket(cloneOf).Contains(item))
{ {
item.RemoveField(Models.Metadata.Disk.MergeKey);
disk.CopyMachineInformation(copyFrom); disk.CopyMachineInformation(copyFrom);
AddItem(disk, statsOnly: false); AddItem(disk, statsOnly: false);
} }
@@ -333,6 +335,7 @@ namespace SabreTools.DatFiles
if (subfolder) if (subfolder)
rom.SetName($"{rom.GetMachine()!.GetName()}\\{rom.GetName()}"); rom.SetName($"{rom.GetMachine()!.GetName()}\\{rom.GetName()}");
item.RemoveField(Models.Metadata.Rom.MergeKey);
rom.CopyMachineInformation(copyFrom); rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false); AddItem(rom, statsOnly: false);
} }
@@ -343,6 +346,7 @@ namespace SabreTools.DatFiles
if (subfolder) if (subfolder)
rom.SetName($"{item.GetMachine()!.GetName()}\\{rom.GetName()}"); rom.SetName($"{item.GetMachine()!.GetName()}\\{rom.GetName()}");
item.RemoveField(Models.Metadata.Rom.MergeKey);
rom.CopyMachineInformation(copyFrom); rom.CopyMachineInformation(copyFrom);
AddItem(rom, statsOnly: false); AddItem(rom, statsOnly: false);
} }
@@ -431,6 +435,7 @@ namespace SabreTools.DatFiles
.Select(i => (i as Disk)!.GetName()) .Select(i => (i as Disk)!.GetName())
.Contains(mergeTag)) .Contains(mergeTag))
{ {
item.Value.RemoveField(Models.Metadata.Disk.MergeKey);
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key); ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key); ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
} }
@@ -438,6 +443,7 @@ namespace SabreTools.DatFiles
// If there is no merge tag, add to parent // If there is no merge tag, add to parent
else if (mergeTag == null && !GetItemsForBucketDB(cloneOf).Values.Contains(item.Value)) else if (mergeTag == null && !GetItemsForBucketDB(cloneOf).Values.Contains(item.Value))
{ {
item.Value.RemoveField(Models.Metadata.Disk.MergeKey);
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key); ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key); ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
} }
@@ -466,6 +472,7 @@ namespace SabreTools.DatFiles
if (subfolder) if (subfolder)
rom.SetName($"{machineName}\\{rom.GetName()}"); rom.SetName($"{machineName}\\{rom.GetName()}");
item.Value.RemoveField(Models.Metadata.Rom.MergeKey);
ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key); ItemsDB.RemapDatItemToMachine(item.Key, machineIndex: cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key); ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
} }
@@ -476,6 +483,7 @@ namespace SabreTools.DatFiles
if (subfolder) if (subfolder)
rom.SetName($"{machineName}\\{rom.GetName()}"); rom.SetName($"{machineName}\\{rom.GetName()}");
item.Value.RemoveField(Models.Metadata.Rom.MergeKey);
ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key); ItemsDB.RemapDatItemToMachine(item.Key, cloneOfMachine.Key);
ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key); ItemsDB.AddItem(item.Value, cloneOfMachine.Key, source.Key);
} }