SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 06:45:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Make Source inherent to DatItem instead of passing through

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-02 17:06:01 -04:00
parent 61ea4b2668
commit d3f5dccf5b
58 changed files with 468 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs
View File

@@ -480,7 +480,7 @@ namespace SabreTools.Metadata.DatFiles
Array.ForEach(filtered, item =>
{
var datItem = new Rom(item, machine, source);
datItem.Write<Source?>(DatItem.SourceKey, source);
datItem.Source = source;
datItem.CopyMachineInformation(machine);
AddItem(datItem, statsOnly);
@@ -692,7 +692,7 @@ namespace SabreTools.Metadata.DatFiles
var partFeatureItem = new PartFeature(partFeature);
partFeatureItem.Write<Part?>(DipSwitch.PartKey, partItem);
partFeatureItem.Write<Source?>(DatItem.SourceKey, source);
partFeatureItem.Source = source;
partFeatureItem.CopyMachineInformation(machine);
AddItem(partFeatureItem, statsOnly);

4
SabreTools.Metadata.DatFiles/DatFile.cs
View File

@@ -1169,8 +1169,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int xSourceIndex = x.Source?.Index ?? 0;
int ySourceIndex = y.Source?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}

2
SabreTools.Metadata.DatFiles/Formats/SabreJSON.cs
View File

@@ -406,7 +406,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
return;
datItem.CopyMachineInformation(machine);
datItem.Write<Source?>(DatItem.SourceKey, source);
datItem.Source = source;
AddItem(datItem, statsOnly);
AddItemDB(datItem, machineIndex, sourceIndex, statsOnly);
}

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

@@ -223,7 +223,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
}
item.CopyMachineInformation(machine);
item.Write<Source?>(DatItem.SourceKey, source);
item.Source = source;
AddItem(item, statsOnly);
// AddItemDB(item, machineIndex, sourceIndex, statsOnly);
}

18
SabreTools.Metadata.DatFiles/ItemDictionary.cs
View File

@@ -433,8 +433,8 @@ namespace SabreTools.Metadata.DatFiles
return output;
// Get the sources for comparison
var selfSource = self.Read<Source?>(DatItem.SourceKey);
var lastSource = last.Read<Source?>(DatItem.SourceKey);
var selfSource = self.Source;
var lastSource = last.Source;
// Get the machines for comparison
var selfMachine = self.Machine;
@@ -542,8 +542,8 @@ namespace SabreTools.Metadata.DatFiles
savedItem.Write(DatItem.DupeTypeKey, dupetype);
// Get the sources associated with the items
var savedSource = savedItem.Read<Source?>(DatItem.SourceKey);
var itemSource = datItem.Read<Source?>(DatItem.SourceKey);
var savedSource = savedItem.Source;
var itemSource = datItem.Source;
// Get the machines associated with the items
var savedMachine = savedItem.Machine;
@@ -552,7 +552,7 @@ namespace SabreTools.Metadata.DatFiles
// If the current source has a lower ID than the saved, use the saved source
if (itemSource?.Index < savedSource?.Index)
{
datItem.Write<Source?>(DatItem.SourceKey, savedSource.Clone() as Source);
datItem.Source = savedSource.Clone() as Source;
savedItem.CopyMachineInformation(datItem);
savedItem.SetName(datItem.GetName());
}
@@ -733,7 +733,7 @@ namespace SabreTools.Metadata.DatFiles
// Get the machine and source
var machine = datItem.Machine;
var source = datItem.Read<Source?>(DatItem.SourceKey);
var source = datItem.Source;
// Get the bucket key
return datItem.GetKey(bucketBy, machine, source, lower, norename);
@@ -772,7 +772,7 @@ namespace SabreTools.Metadata.DatFiles
// Get the machine and source
var machine = item.Machine;
var source = item.Read<Source?>(DatItem.SourceKey);
var source = item.Source;
// We want to get the key most appropriate for the given sorting type
string newkey = item.GetKey(bucketBy, machine, source, lower, norename);
@@ -845,8 +845,8 @@ namespace SabreTools.Metadata.DatFiles
// Compare on source if renaming
if (!norename)
{
int xSourceIndex = x.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int ySourceIndex = y.Read<Source?>(DatItem.SourceKey)?.Index ?? 0;
int xSourceIndex = x.Source?.Index ?? 0;
int ySourceIndex = y.Source?.Index ?? 0;
if (xSourceIndex != ySourceIndex)
return xSourceIndex - ySourceIndex;
}