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

[DatFile] Fix subdevice parsing

Browse Source
This commit is contained in:
Matt Nadareski
2018-01-16 23:40:21 -08:00
parent 3fdd1ce6b7
commit 896bdb9ec9
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -2678,7 +2678,7 @@ namespace SabreTools.Library.DatFiles
BucketBy(SortedBy.Game, mergeroms, norename: true); BucketBy(SortedBy.Game, mergeroms, norename: true);
// Now we want to loop through all of the games and set the correct information // Now we want to loop through all of the games and set the correct information
AddRomsFromDevices(true); while (AddRomsFromDevices(true));
AddRomsFromDevices(false); AddRomsFromDevices(false);
// Then, remove the romof and cloneof tags so it's not picked up by the manager // Then, remove the romof and cloneof tags so it's not picked up by the manager
@@ -2700,7 +2700,7 @@ namespace SabreTools.Library.DatFiles
BucketBy(SortedBy.Game, mergeroms, norename: true); BucketBy(SortedBy.Game, mergeroms, norename: true);
// Now we want to loop through all of the games and set the correct information // Now we want to loop through all of the games and set the correct information
AddRomsFromDevices(true); while (AddRomsFromDevices(true));
AddRomsFromDevices(false); AddRomsFromDevices(false);
AddRomsFromParent(); AddRomsFromParent();
@@ -2832,8 +2832,9 @@ namespace SabreTools.Library.DatFiles
/// Use device_ref and slotoption tags to add roms to the children /// Use device_ref and slotoption tags to add roms to the children
/// </summary> /// </summary>
/// <param name="dev">True if only child device sets are touched, false for non-device sets (default)</param> /// <param name="dev">True if only child device sets are touched, false for non-device sets (default)</param>
private void AddRomsFromDevices(bool dev = false) private bool AddRomsFromDevices(bool dev = false)
{ {
bool foundnew = false;
List<string> games = Keys; List<string> games = Keys;
foreach (string game in games) foreach (string game in games)
{ {
@@ -2857,6 +2858,7 @@ namespace SabreTools.Library.DatFiles
// Determine if the game has any devices or not // Determine if the game has any devices or not
List<string> devices = this[game][0].Devices; List<string> devices = this[game][0].Devices;
List<string> newdevs = new List<string>();
foreach (string device in devices) foreach (string device in devices)
{ {
// If the device doesn't exist then we continue // If the device doesn't exist then we continue
@@ -2871,14 +2873,27 @@ namespace SabreTools.Library.DatFiles
foreach (DatItem item in devItems) foreach (DatItem item in devItems)
{ {
DatItem datItem = (DatItem)item.Clone(); DatItem datItem = (DatItem)item.Clone();
newdevs.AddRange(datItem.Devices ?? new List<string>());
datItem.CopyMachineInformation(copyFrom); datItem.CopyMachineInformation(copyFrom);
if (this[game].Where(i => i.Name == datItem.Name).Count() == 0 && !this[game].Contains(datItem)) if (this[game].Where(i => i.Name == datItem.Name).Count() == 0 && !this[game].Contains(datItem))
{ {
foundnew = true;
Add(game, datItem); Add(game, datItem);
} }
} }
} }
// Now that every device is accounted for, add the new list of devices, if they don't already exist
foreach (string device in newdevs)
{
if (!this[game][0].Devices.Contains(device))
{
this[game][0].Devices.Add(device);
}
}
} }
return foundnew;
} }
/// <summary> /// <summary>

1
SabreTools.Library/DatFiles/OfflineList.cs
View File

@@ -59,7 +59,6 @@ namespace SabreTools.Library.DatFiles
bool remUnicode) bool remUnicode)
{ {
// All XML-derived DATs share a lot in common so it just calls one implementation // All XML-derived DATs share a lot in common so it just calls one implementation
// TODO: Use the following implementation instead of passing to Logiqx
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode); new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
return; return;

2
SabreTools.Library/DatFiles/SabreDat.cs
View File

@@ -25,6 +25,7 @@ namespace SabreTools.Library.DatFiles
/// <summary> /// <summary>
/// Represents parsing and writing of an SabreDat XML DAT /// Represents parsing and writing of an SabreDat XML DAT
/// </summary> /// </summary>
/// TODO: Verify that all read/write for this DatFile type is correct
internal class SabreDat : DatFile internal class SabreDat : DatFile
{ {
/// <summary> /// <summary>
@@ -57,7 +58,6 @@ namespace SabreTools.Library.DatFiles
bool remUnicode) bool remUnicode)
{ {
// All XML-derived DATs share a lot in common so it just calls one implementation // All XML-derived DATs share a lot in common so it just calls one implementation
// TODO: Use the following implementation instead of passing to Logiqx
new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode); new Logiqx(this, false).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
return; return;