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

Disable some experimental code

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-02 00:28:22 -04:00
parent 53977b247d
commit b51d6ce2c5
4 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ namespace SabreTools.DatFiles
// Create an internal source and add to the dictionary // Create an internal source and add to the dictionary
var source = new Source(indexId, filename); var source = new Source(indexId, filename);
long sourceIndex = AddSourceDB(source); // long sourceIndex = AddSourceDB(source);
// Get the header from the metadata // Get the header from the metadata
var header = item.Read<Models.Metadata.Header>(Models.Metadata.MetadataFile.HeaderKey); var header = item.Read<Models.Metadata.Header>(Models.Metadata.MetadataFile.HeaderKey);
@@ -35,7 +35,7 @@ namespace SabreTools.DatFiles
// Get the machines from the metadata // Get the machines from the metadata
var machines = item.ReadItemArray<Models.Metadata.Machine>(Models.Metadata.MetadataFile.MachineKey); var machines = item.ReadItemArray<Models.Metadata.Machine>(Models.Metadata.MetadataFile.MachineKey);
if (machines != null) if (machines != null)
ConvertMachines(machines, source, sourceIndex, statsOnly); ConvertMachines(machines, source, sourceIndex: 0, statsOnly);
} }
/// <summary> /// <summary>
@@ -203,144 +203,144 @@ namespace SabreTools.DatFiles
// Create an internal machine and add to the dictionary // Create an internal machine and add to the dictionary
var machine = new Machine(item); var machine = new Machine(item);
long machineIndex = AddMachineDB(machine); // long machineIndex = AddMachineDB(machine);
// Convert items in the machine // Convert items in the machine
if (item.ContainsKey(Models.Metadata.Machine.AdjusterKey)) if (item.ContainsKey(Models.Metadata.Machine.AdjusterKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Adjuster>(Models.Metadata.Machine.AdjusterKey); var items = item.ReadItemArray<Models.Metadata.Adjuster>(Models.Metadata.Machine.AdjusterKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.ArchiveKey)) if (item.ContainsKey(Models.Metadata.Machine.ArchiveKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Archive>(Models.Metadata.Machine.ArchiveKey); var items = item.ReadItemArray<Models.Metadata.Archive>(Models.Metadata.Machine.ArchiveKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.BiosSetKey)) if (item.ContainsKey(Models.Metadata.Machine.BiosSetKey))
{ {
var items = item.ReadItemArray<Models.Metadata.BiosSet>(Models.Metadata.Machine.BiosSetKey); var items = item.ReadItemArray<Models.Metadata.BiosSet>(Models.Metadata.Machine.BiosSetKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.ChipKey)) if (item.ContainsKey(Models.Metadata.Machine.ChipKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Chip>(Models.Metadata.Machine.ChipKey); var items = item.ReadItemArray<Models.Metadata.Chip>(Models.Metadata.Machine.ChipKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.ConfigurationKey)) if (item.ContainsKey(Models.Metadata.Machine.ConfigurationKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Configuration>(Models.Metadata.Machine.ConfigurationKey); var items = item.ReadItemArray<Models.Metadata.Configuration>(Models.Metadata.Machine.ConfigurationKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DeviceKey)) if (item.ContainsKey(Models.Metadata.Machine.DeviceKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Device>(Models.Metadata.Machine.DeviceKey); var items = item.ReadItemArray<Models.Metadata.Device>(Models.Metadata.Machine.DeviceKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DeviceRefKey)) if (item.ContainsKey(Models.Metadata.Machine.DeviceRefKey))
{ {
var items = item.ReadItemArray<Models.Metadata.DeviceRef>(Models.Metadata.Machine.DeviceRefKey); var items = item.ReadItemArray<Models.Metadata.DeviceRef>(Models.Metadata.Machine.DeviceRefKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DipSwitchKey)) if (item.ContainsKey(Models.Metadata.Machine.DipSwitchKey))
{ {
var items = item.ReadItemArray<Models.Metadata.DipSwitch>(Models.Metadata.Machine.DipSwitchKey); var items = item.ReadItemArray<Models.Metadata.DipSwitch>(Models.Metadata.Machine.DipSwitchKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DiskKey)) if (item.ContainsKey(Models.Metadata.Machine.DiskKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Disk>(Models.Metadata.Machine.DiskKey); var items = item.ReadItemArray<Models.Metadata.Disk>(Models.Metadata.Machine.DiskKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DisplayKey)) if (item.ContainsKey(Models.Metadata.Machine.DisplayKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Display>(Models.Metadata.Machine.DisplayKey); var items = item.ReadItemArray<Models.Metadata.Display>(Models.Metadata.Machine.DisplayKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DriverKey)) if (item.ContainsKey(Models.Metadata.Machine.DriverKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Driver>(Models.Metadata.Machine.DriverKey); var items = item.ReadItemArray<Models.Metadata.Driver>(Models.Metadata.Machine.DriverKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.DumpKey)) if (item.ContainsKey(Models.Metadata.Machine.DumpKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Dump>(Models.Metadata.Machine.DumpKey); var items = item.ReadItemArray<Models.Metadata.Dump>(Models.Metadata.Machine.DumpKey);
string? machineName = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey); string? machineName = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly, machineName); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly, machineName);
} }
if (item.ContainsKey(Models.Metadata.Machine.FeatureKey)) if (item.ContainsKey(Models.Metadata.Machine.FeatureKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Feature>(Models.Metadata.Machine.FeatureKey); var items = item.ReadItemArray<Models.Metadata.Feature>(Models.Metadata.Machine.FeatureKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.InfoKey)) if (item.ContainsKey(Models.Metadata.Machine.InfoKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Info>(Models.Metadata.Machine.InfoKey); var items = item.ReadItemArray<Models.Metadata.Info>(Models.Metadata.Machine.InfoKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.InputKey)) if (item.ContainsKey(Models.Metadata.Machine.InputKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Input>(Models.Metadata.Machine.InputKey); var items = item.ReadItemArray<Models.Metadata.Input>(Models.Metadata.Machine.InputKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.MediaKey)) if (item.ContainsKey(Models.Metadata.Machine.MediaKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Media>(Models.Metadata.Machine.MediaKey); var items = item.ReadItemArray<Models.Metadata.Media>(Models.Metadata.Machine.MediaKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.PartKey)) if (item.ContainsKey(Models.Metadata.Machine.PartKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Part>(Models.Metadata.Machine.PartKey); var items = item.ReadItemArray<Models.Metadata.Part>(Models.Metadata.Machine.PartKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.PortKey)) if (item.ContainsKey(Models.Metadata.Machine.PortKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Port>(Models.Metadata.Machine.PortKey); var items = item.ReadItemArray<Models.Metadata.Port>(Models.Metadata.Machine.PortKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.RamOptionKey)) if (item.ContainsKey(Models.Metadata.Machine.RamOptionKey))
{ {
var items = item.ReadItemArray<Models.Metadata.RamOption>(Models.Metadata.Machine.RamOptionKey); var items = item.ReadItemArray<Models.Metadata.RamOption>(Models.Metadata.Machine.RamOptionKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.ReleaseKey)) if (item.ContainsKey(Models.Metadata.Machine.ReleaseKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Release>(Models.Metadata.Machine.ReleaseKey); var items = item.ReadItemArray<Models.Metadata.Release>(Models.Metadata.Machine.ReleaseKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.RomKey)) if (item.ContainsKey(Models.Metadata.Machine.RomKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Rom>(Models.Metadata.Machine.RomKey); var items = item.ReadItemArray<Models.Metadata.Rom>(Models.Metadata.Machine.RomKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.SampleKey)) if (item.ContainsKey(Models.Metadata.Machine.SampleKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Sample>(Models.Metadata.Machine.SampleKey); var items = item.ReadItemArray<Models.Metadata.Sample>(Models.Metadata.Machine.SampleKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.SharedFeatKey)) if (item.ContainsKey(Models.Metadata.Machine.SharedFeatKey))
{ {
var items = item.ReadItemArray<Models.Metadata.SharedFeat>(Models.Metadata.Machine.SharedFeatKey); var items = item.ReadItemArray<Models.Metadata.SharedFeat>(Models.Metadata.Machine.SharedFeatKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.SlotKey)) if (item.ContainsKey(Models.Metadata.Machine.SlotKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Slot>(Models.Metadata.Machine.SlotKey); var items = item.ReadItemArray<Models.Metadata.Slot>(Models.Metadata.Machine.SlotKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.SoftwareListKey)) if (item.ContainsKey(Models.Metadata.Machine.SoftwareListKey))
{ {
var items = item.ReadItemArray<Models.Metadata.SoftwareList>(Models.Metadata.Machine.SoftwareListKey); var items = item.ReadItemArray<Models.Metadata.SoftwareList>(Models.Metadata.Machine.SoftwareListKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.SoundKey)) if (item.ContainsKey(Models.Metadata.Machine.SoundKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Sound>(Models.Metadata.Machine.SoundKey); var items = item.ReadItemArray<Models.Metadata.Sound>(Models.Metadata.Machine.SoundKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
if (item.ContainsKey(Models.Metadata.Machine.VideoKey)) if (item.ContainsKey(Models.Metadata.Machine.VideoKey))
{ {
var items = item.ReadItemArray<Models.Metadata.Video>(Models.Metadata.Machine.VideoKey); var items = item.ReadItemArray<Models.Metadata.Video>(Models.Metadata.Machine.VideoKey);
ProcessItems(items, machine, machineIndex, source, sourceIndex, statsOnly); ProcessItems(items, machine, machineIndex: 0, source, sourceIndex, statsOnly);
} }
} }
@@ -367,7 +367,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); //AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -394,7 +394,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -421,7 +421,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -448,7 +448,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -475,7 +475,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -502,7 +502,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -529,7 +529,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -556,7 +556,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -583,7 +583,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -610,7 +610,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -637,7 +637,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -730,7 +730,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)));
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -757,7 +757,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -784,7 +784,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -811,7 +811,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -838,7 +838,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -882,7 +882,7 @@ namespace SabreTools.DatFiles
romItem.CopyMachineInformation(machine); romItem.CopyMachineInformation(machine);
AddItem(romItem, statsOnly); AddItem(romItem, statsOnly);
AddItemDB(romItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(romItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -906,7 +906,7 @@ namespace SabreTools.DatFiles
diskItem.CopyMachineInformation(machine); diskItem.CopyMachineInformation(machine);
AddItem(diskItem, statsOnly); AddItem(diskItem, statsOnly);
AddItemDB(diskItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(diskItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -922,7 +922,7 @@ namespace SabreTools.DatFiles
dipSwitchItem.CopyMachineInformation(machine); dipSwitchItem.CopyMachineInformation(machine);
AddItem(dipSwitchItem, statsOnly); AddItem(dipSwitchItem, statsOnly);
AddItemDB(dipSwitchItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(dipSwitchItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -937,7 +937,7 @@ namespace SabreTools.DatFiles
partFeatureItem.CopyMachineInformation(machine); partFeatureItem.CopyMachineInformation(machine);
AddItem(partFeatureItem, statsOnly); AddItem(partFeatureItem, statsOnly);
AddItemDB(partFeatureItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(partFeatureItem, machineIndex, sourceIndex, statsOnly);
} }
} }
} }
@@ -966,7 +966,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -993,7 +993,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1020,7 +1020,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1047,7 +1047,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1074,7 +1074,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1101,7 +1101,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1128,7 +1128,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1155,7 +1155,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1182,7 +1182,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }
@@ -1209,7 +1209,7 @@ namespace SabreTools.DatFiles
datItem.CopyMachineInformation(machine); datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly); AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly); // AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
} }
} }

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

@@ -39,7 +39,7 @@ namespace SabreTools.DatFiles.Formats
var sr = new StreamReader(fs, new UTF8Encoding(false)); var sr = new StreamReader(fs, new UTF8Encoding(false));
var jtr = new JsonTextReader(sr); var jtr = new JsonTextReader(sr);
var source = new Source(indexId, filename); var source = new Source(indexId, filename);
long sourceIndex = AddSourceDB(source); // long sourceIndex = AddSourceDB(source);
// If we got a null reader, just return // If we got a null reader, just return
if (jtr == null) if (jtr == null)
@@ -68,7 +68,7 @@ namespace SabreTools.DatFiles.Formats
// Machine array // Machine array
case "machines": case "machines":
ReadMachines(jtr, statsOnly, source, sourceIndex); ReadMachines(jtr, statsOnly, source, sourceIndex: 0);
jtr.Read(); jtr.Read();
break; break;
@@ -149,13 +149,13 @@ namespace SabreTools.DatFiles.Formats
machine = machineObj["machine"]?.ToObject<Machine>(); machine = machineObj["machine"]?.ToObject<Machine>();
// Add the machine to the dictionary // Add the machine to the dictionary
long machineIndex = -1; // long machineIndex = -1;
if (machine != null) // if (machine != null)
machineIndex = AddMachineDB(machine); // machineIndex = AddMachineDB(machine);
// Read items, if possible // Read items, if possible
if (machineObj.ContainsKey("items")) if (machineObj.ContainsKey("items"))
ReadItems(machineObj["items"] as JArray, statsOnly, source, sourceIndex, machine, machineIndex); ReadItems(machineObj["items"] as JArray, statsOnly, source, sourceIndex, machine, machineIndex: 0);
} }
/// <summary> /// <summary>

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

@@ -184,7 +184,7 @@ namespace SabreTools.DatFiles.Formats
item.CopyMachineInformation(machine); item.CopyMachineInformation(machine);
item.SetFieldValue<Source?>(DatItem.SourceKey, source); item.SetFieldValue<Source?>(DatItem.SourceKey, source);
AddItem(item, statsOnly); AddItem(item, statsOnly);
AddItemDB(item, machineIndex, sourceIndex, statsOnly); // AddItemDB(item, machineIndex, sourceIndex, statsOnly);
} }
xtr.Skip(); xtr.Skip();
break; break;

4
SabreTools.DatTools.Test/ParserTests.cs
View File

@@ -188,7 +188,7 @@ namespace SabreTools.DatTools.Test
Parser.ParseInto(datFile, filename, throwOnError: true); Parser.ParseInto(datFile, filename, throwOnError: true);
Assert.Equal(datFormat, datFile.Header.GetFieldValue<DatFormat>(DatHeader.DatFormatKey)); Assert.Equal(datFormat, datFile.Header.GetFieldValue<DatFormat>(DatHeader.DatFormatKey));
Assert.Equal(totalCount, datFile.Items.DatStatistics.TotalCount); Assert.Equal(totalCount, datFile.Items.DatStatistics.TotalCount);
Assert.Equal(totalCount, datFile.ItemsDB.DatStatistics.TotalCount); //Assert.Equal(totalCount, datFile.ItemsDB.DatStatistics.TotalCount);
} }
[Theory] [Theory]
@@ -230,7 +230,7 @@ namespace SabreTools.DatTools.Test
var datFile = Parser.ParseStatistics(filename, throwOnError: true); var datFile = Parser.ParseStatistics(filename, throwOnError: true);
Assert.Equal(datFormat, datFile.Header.GetFieldValue<DatFormat>(DatHeader.DatFormatKey)); Assert.Equal(datFormat, datFile.Header.GetFieldValue<DatFormat>(DatHeader.DatFormatKey));
Assert.Equal(totalCount, datFile.Items.DatStatistics.TotalCount); Assert.Equal(totalCount, datFile.Items.DatStatistics.TotalCount);
Assert.Equal(totalCount, datFile.ItemsDB.DatStatistics.TotalCount); //Assert.Equal(totalCount, datFile.ItemsDB.DatStatistics.TotalCount);
} }
[Theory] [Theory]