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

CHDs not in folders of parent

Browse Source
This commit is contained in:
Matt Nadareski
2020-07-23 21:49:09 -07:00
parent 6a0efdc3a2
commit ca62e5cd71
1 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SabreTools.Library/DatFiles/Filter.cs
View File

@@ -1754,29 +1754,17 @@ namespace SabreTools.Library.DatFiles
continue; continue;
} }
// If the merge tag exists but the parent doesn't contain it, add // If the merge tag exists but the parent doesn't contain it, add to parent
else if (disk.MergeTag != null && !datFile[parent].Select(i => i.Name).Contains(disk.MergeTag)) else if (disk.MergeTag != null && !datFile[parent].Select(i => i.Name).Contains(disk.MergeTag))
{ {
// Rename the child so it's in a subfolder
item.Name = $"{item.MachineName}\\{item.Name}";
// Update the machine to be the new parent
item.CopyMachineInformation(copyFrom); item.CopyMachineInformation(copyFrom);
// Add the rom to the parent set
datFile.Add(parent, item); datFile.Add(parent, item);
} }
// If the parent doesn't already contain this item, add it // If the parent doesn't already contain this item, add to parent
else if (!datFile[parent].Contains(item)) else if (!datFile[parent].Contains(item))
{ {
// Rename the child so it's in a subfolder
item.Name = $"{item.MachineName}\\{item.Name}";
// Update the machine to be the new parent
item.CopyMachineInformation(copyFrom); item.CopyMachineInformation(copyFrom);
// Add the rom to the parent set
datFile.Add(parent, item); datFile.Add(parent, item);
} }
} }
@@ -1792,43 +1780,28 @@ namespace SabreTools.Library.DatFiles
continue; continue;
} }
// If the merge tag exists but the parent doesn't contain it, add // If the merge tag exists but the parent doesn't contain it, add to subfolder of parent
else if (rom.MergeTag != null && !datFile[parent].Select(i => i.Name).Contains(rom.MergeTag)) else if (rom.MergeTag != null && !datFile[parent].Select(i => i.Name).Contains(rom.MergeTag))
{ {
// Rename the child so it's in a subfolder
item.Name = $"{item.MachineName}\\{item.Name}"; item.Name = $"{item.MachineName}\\{item.Name}";
// Update the machine to be the new parent
item.CopyMachineInformation(copyFrom); item.CopyMachineInformation(copyFrom);
// Add the rom to the parent set
datFile.Add(parent, item); datFile.Add(parent, item);
} }
// If the parent doesn't already contain this item, add it // If the parent doesn't already contain this item, add to subfolder of parent
else if (!datFile[parent].Contains(item)) else if (!datFile[parent].Contains(item))
{ {
// Rename the child so it's in a subfolder
item.Name = $"{item.MachineName}\\{item.Name}"; item.Name = $"{item.MachineName}\\{item.Name}";
// Update the machine to be the new parent
item.CopyMachineInformation(copyFrom); item.CopyMachineInformation(copyFrom);
// Add the rom to the parent set
datFile.Add(parent, item); datFile.Add(parent, item);
} }
} }
// All other that would be missing // All other that would be missing to subfolder of parent
else if (!datFile[parent].Contains(item)) else if (!datFile[parent].Contains(item))
{ {
// Rename the child so it's in a subfolder
item.Name = $"{item.MachineName}\\{item.Name}"; item.Name = $"{item.MachineName}\\{item.Name}";
// Update the machine to be the new parent
item.CopyMachineInformation(copyFrom); item.CopyMachineInformation(copyFrom);
// Add the rom to the parent set
datFile.Add(parent, item); datFile.Add(parent, item);
} }
} }