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

Keep on with DB renaming

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-09 03:31:31 -05:00
parent 00e8ca6bcc
commit 450417f0ab
6 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
SabreTools.DatFiles/DatFile.FromMetadata.cs
View File

@@ -405,7 +405,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -431,7 +431,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -462,7 +462,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.BiosSet.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.BiosSet.DefaultKey).FromYesNo()); datItem.SetFieldValue<string?>(Models.Metadata.BiosSet.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.BiosSet.DefaultKey).FromYesNo());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -495,7 +495,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Chip.ChipTypeKey, datItem.GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey).AsEnumValue<ChipType>().AsStringValue()); datItem.SetFieldValue<string?>(Models.Metadata.Chip.ChipTypeKey, datItem.GetStringFieldValue(Models.Metadata.Chip.ChipTypeKey).AsEnumValue<ChipType>().AsStringValue());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -583,7 +583,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -637,7 +637,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -663,7 +663,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -755,7 +755,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -796,7 +796,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(datItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key))); datItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(datItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -851,7 +851,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Display.WidthKey, datItem.GetInt64FieldValue(Models.Metadata.Display.WidthKey).ToString()); datItem.SetFieldValue<string?>(Models.Metadata.Display.WidthKey, datItem.GetInt64FieldValue(Models.Metadata.Display.WidthKey).ToString());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -902,7 +902,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Driver.UnofficialKey, datItem.GetBoolFieldValue(Models.Metadata.Driver.UnofficialKey).FromYesNo()); datItem.SetFieldValue<string?>(Models.Metadata.Driver.UnofficialKey, datItem.GetBoolFieldValue(Models.Metadata.Driver.UnofficialKey).FromYesNo());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -990,7 +990,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key))); datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1025,7 +1025,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, datItem.GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue()); datItem.SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, datItem.GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1051,7 +1051,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1125,7 +1125,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1160,7 +1160,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, TextHelper.NormalizeSHA256(datItem.GetStringFieldValue(Models.Metadata.Media.SHA256Key))); datItem.SetFieldValue<string?>(Models.Metadata.Media.SHA256Key, TextHelper.NormalizeSHA256(datItem.GetStringFieldValue(Models.Metadata.Media.SHA256Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1246,7 +1246,7 @@ namespace SabreTools.DatFiles
romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key))); romItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(romItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(romItem, statsOnly); ParseAddHelper(romItem, statsOnly);
ParseAddHelper(romItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(romItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -1284,7 +1284,7 @@ namespace SabreTools.DatFiles
diskItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(diskItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key))); diskItem.SetFieldValue<string?>(Models.Metadata.Disk.SHA1Key, TextHelper.NormalizeSHA1(diskItem.GetStringFieldValue(Models.Metadata.Disk.SHA1Key)));
ParseAddHelper(diskItem, statsOnly); ParseAddHelper(diskItem, statsOnly);
ParseAddHelper(diskItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(diskItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -1365,7 +1365,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(dipSwitchItem, statsOnly); ParseAddHelper(dipSwitchItem, statsOnly);
ParseAddHelper(dipSwitchItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(dipSwitchItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1388,7 +1388,7 @@ namespace SabreTools.DatFiles
partFeatureItem.SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, partFeatureItem.GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue()); partFeatureItem.SetFieldValue<string?>(Models.Metadata.Feature.FeatureTypeKey, partFeatureItem.GetStringFieldValue(Models.Metadata.Feature.FeatureTypeKey).AsEnumValue<FeatureType>().AsStringValue());
ParseAddHelper(partFeatureItem, statsOnly); ParseAddHelper(partFeatureItem, statsOnly);
ParseAddHelper(partFeatureItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(partFeatureItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -1431,7 +1431,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1462,7 +1462,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.RamOption.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.RamOption.DefaultKey).FromYesNo()); datItem.SetFieldValue<string?>(Models.Metadata.RamOption.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.RamOption.DefaultKey).FromYesNo());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1493,7 +1493,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Release.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.Release.DefaultKey).FromYesNo()); datItem.SetFieldValue<string?>(Models.Metadata.Release.DefaultKey, datItem.GetBoolFieldValue(Models.Metadata.Release.DefaultKey).FromYesNo());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1554,7 +1554,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key))); datItem.SetFieldValue<string?>(Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(datItem.GetStringFieldValue(Models.Metadata.Rom.SHA512Key)));
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1580,7 +1580,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1606,7 +1606,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItems.DatItem.SourceKey, source);
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1652,7 +1652,7 @@ namespace SabreTools.DatFiles
} }
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1683,7 +1683,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.SoftwareList.StatusKey, datItem.GetStringFieldValue(Models.Metadata.SoftwareList.StatusKey).AsEnumValue<SoftwareListStatus>().AsStringValue()); datItem.SetFieldValue<string?>(Models.Metadata.SoftwareList.StatusKey, datItem.GetStringFieldValue(Models.Metadata.SoftwareList.StatusKey).AsEnumValue<SoftwareListStatus>().AsStringValue());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1714,7 +1714,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Sound.ChannelsKey, datItem.GetInt64FieldValue(Models.Metadata.Sound.ChannelsKey).ToString()); datItem.SetFieldValue<string?>(Models.Metadata.Sound.ChannelsKey, datItem.GetInt64FieldValue(Models.Metadata.Sound.ChannelsKey).ToString());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1755,7 +1755,7 @@ namespace SabreTools.DatFiles
datItem.SetFieldValue<string?>(Models.Metadata.Display.WidthKey, datItem.GetInt64FieldValue(Models.Metadata.Video.WidthKey).ToString()); datItem.SetFieldValue<string?>(Models.Metadata.Display.WidthKey, datItem.GetInt64FieldValue(Models.Metadata.Video.WidthKey).ToString());
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }

2
SabreTools.DatFiles/DatFile.ToMetadata.cs
View File

@@ -560,7 +560,7 @@ namespace SabreTools.DatFiles
foreach (var kvp in items) foreach (var kvp in items)
{ {
// Check for a "null" item // Check for a "null" item
var item = ProcessNullifiedItem(kvp); var item = ProcessNullifiedItemDB(kvp);
// Skip if we're ignoring the item // Skip if we're ignoring the item
if (ShouldIgnore(item.Value, ignoreblanks)) if (ShouldIgnore(item.Value, ignoreblanks))

6
SabreTools.DatFiles/DatFile.cs
View File

@@ -172,7 +172,7 @@ namespace SabreTools.DatFiles
/// <param name="sourceIndex">Index of the source to map the DatItem to</param> /// <param name="sourceIndex">Index of the source to map the DatItem to</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param> /// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
/// <returns>The key for the item</returns> /// <returns>The key for the item</returns>
protected long ParseAddHelper(DatItem item, long machineIndex, long sourceIndex, bool statsOnly) protected long ParseAddHelperDB(DatItem item, long machineIndex, long sourceIndex, bool statsOnly)
=> ItemsDB.AddItem(item, machineIndex, sourceIndex, statsOnly); => ItemsDB.AddItem(item, machineIndex, sourceIndex, statsOnly);
#endregion #endregion
@@ -637,7 +637,7 @@ namespace SabreTools.DatFiles
/// </summary> /// </summary>
/// <param name="item">DatItem to check for "null" status</param> /// <param name="item">DatItem to check for "null" status</param>
/// <returns>Cleaned DatItem</returns> /// <returns>Cleaned DatItem</returns>
protected KeyValuePair<long, DatItem> ProcessNullifiedItem(KeyValuePair<long, DatItem> item) protected KeyValuePair<long, DatItem> ProcessNullifiedItemDB(KeyValuePair<long, DatItem> item)
{ {
// If we don't have a Rom, we can ignore it // If we don't have a Rom, we can ignore it
if (item.Value is not Rom rom) if (item.Value is not Rom rom)
@@ -719,7 +719,7 @@ namespace SabreTools.DatFiles
/// <param name="datItems">DatItems to check</param> /// <param name="datItems">DatItems to check</param>
/// <returns>True if the machine contains at least one writable item, false otherwise</returns> /// <returns>True if the machine contains at least one writable item, false otherwise</returns>
/// <remarks>Empty machines are kept with this</remarks> /// <remarks>Empty machines are kept with this</remarks>
protected bool ContainsWritable(Dictionary<long, DatItem>? datItems) protected bool ContainsWritableDB(Dictionary<long, DatItem>? datItems)
{ {
// Empty machines are considered writable // Empty machines are considered writable
if (datItems == null || datItems.Count == 0) if (datItems == null || datItems.Count == 0)

4
SabreTools.DatFiles/Formats/Missfile.cs
View File

@@ -119,7 +119,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritable(itemsDict)) if (itemsDict == null || !ContainsWritableDB(itemsDict))
continue; continue;
// Resolve the names in the block // Resolve the names in the block
@@ -128,7 +128,7 @@ namespace SabreTools.DatFiles.Formats
foreach (var kvp in items) foreach (var kvp in items)
{ {
// Check for a "null" item // Check for a "null" item
var datItem = ProcessNullifiedItem(kvp); var datItem = ProcessNullifiedItemDB(kvp);
// Get the machine for the item // Get the machine for the item
var machine = ItemsDB.GetMachineForItem(datItem.Key); var machine = ItemsDB.GetMachineForItem(datItem.Key);

6
SabreTools.DatFiles/Formats/SabreJSON.cs
View File

@@ -356,7 +356,7 @@ namespace SabreTools.DatFiles.Formats
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
datItem.SetFieldValue<Source?>(DatItem.SourceKey, source); datItem.SetFieldValue<Source?>(DatItem.SourceKey, source);
ParseAddHelper(datItem, statsOnly); ParseAddHelper(datItem, statsOnly);
ParseAddHelper(datItem, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -475,7 +475,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritable(itemsDict)) if (itemsDict == null || !ContainsWritableDB(itemsDict))
continue; continue;
// Resolve the names in the block // Resolve the names in the block
@@ -495,7 +495,7 @@ namespace SabreTools.DatFiles.Formats
WriteStartGame(jtw, kvp.Value); WriteStartGame(jtw, kvp.Value);
// Check for a "null" item // Check for a "null" item
var datItem = ProcessNullifiedItem(kvp); var datItem = ProcessNullifiedItemDB(kvp);
// Write out the item if we're not ignoring // Write out the item if we're not ignoring
if (!ShouldIgnore(datItem.Value, ignoreblanks)) if (!ShouldIgnore(datItem.Value, ignoreblanks))

6
SabreTools.DatFiles/Formats/SabreXML.cs
View File

@@ -178,7 +178,7 @@ namespace SabreTools.DatFiles.Formats
item.CopyMachineInformation(machine); item.CopyMachineInformation(machine);
item.SetFieldValue<Source?>(DatItem.SourceKey, source); item.SetFieldValue<Source?>(DatItem.SourceKey, source);
ParseAddHelper(item, statsOnly); ParseAddHelper(item, statsOnly);
ParseAddHelper(item, machineIndex, sourceIndex, statsOnly); ParseAddHelperDB(item, machineIndex, sourceIndex, statsOnly);
} }
xtr.Skip(); xtr.Skip();
break; break;
@@ -304,7 +304,7 @@ namespace SabreTools.DatFiles.Formats
{ {
// If this machine doesn't contain any writable items, skip // If this machine doesn't contain any writable items, skip
var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true); var itemsDict = ItemsDB.GetItemsForBucket(key, filter: true);
if (itemsDict == null || !ContainsWritable(itemsDict)) if (itemsDict == null || !ContainsWritableDB(itemsDict))
continue; continue;
// Resolve the names in the block // Resolve the names in the block
@@ -324,7 +324,7 @@ namespace SabreTools.DatFiles.Formats
WriteStartGame(xtw, kvp.Value); WriteStartGame(xtw, kvp.Value);
// Check for a "null" item // Check for a "null" item
var datItem = ProcessNullifiedItem(kvp); var datItem = ProcessNullifiedItemDB(kvp);
// Write out the item if we're not ignoring // Write out the item if we're not ignoring
if (!ShouldIgnore(datItem.Value, ignoreblanks)) if (!ShouldIgnore(datItem.Value, ignoreblanks))