SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Metadata code cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2026-03-26 20:40:49 -04:00
parent 3a3b20df11
commit 29620c0c4f
22 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SabreTools.Metadata.DatFiles/DatFile.Filtering.cs
View File

@@ -738,20 +738,20 @@ namespace SabreTools.Metadata.DatFiles
string? sampleOf = machine.ReadString(Data.Models.Metadata.Machine.SampleOfKey);
// Update machine name
if (machineName is not null && mapping.ContainsKey(machineName))
machine.SetName(mapping[machineName]);
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.SetName(mappedMachineName);
// Update cloneof
if (cloneOf is not null && mapping.ContainsKey(cloneOf))
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))
machine.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mappedCloneOf);
// Update romof
if (romOf is not null && mapping.ContainsKey(romOf))
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
if (romOf is not null && mapping.TryGetValue(romOf, out string? mappedRomOf))
machine.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mappedRomOf);
// Update sampleof
if (sampleOf is not null && mapping.ContainsKey(sampleOf))
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
if (sampleOf is not null && mapping.TryGetValue(sampleOf, out string? mappedSampleOf))
machine.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mappedSampleOf);
}
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
});
@@ -779,20 +779,20 @@ namespace SabreTools.Metadata.DatFiles
string? sampleOf = machine.Value.ReadString(Data.Models.Metadata.Machine.SampleOfKey);
// Update machine name
if (machineName is not null && mapping.ContainsKey(machineName))
machine.Value.SetName(mapping[machineName]);
if (machineName is not null && mapping.TryGetValue(machineName, out string? mappedMachineName))
machine.Value.SetName(mappedMachineName);
// Update cloneof
if (cloneOf is not null && mapping.ContainsKey(cloneOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mapping[cloneOf]);
if (cloneOf is not null && mapping.TryGetValue(cloneOf, out string? mappedCloneOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.CloneOfKey, mappedCloneOf);
// Update romof
if (romOf is not null && mapping.ContainsKey(romOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mapping[romOf]);
if (romOf is not null && mapping.TryGetValue(romOf, out string? mappedRomOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.RomOfKey, mappedRomOf);
// Update sampleof
if (sampleOf is not null && mapping.ContainsKey(sampleOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mapping[sampleOf]);
if (sampleOf is not null && mapping.TryGetValue(sampleOf, out string? mappedSampleOf))
machine.Value.Write<string?>(Data.Models.Metadata.Machine.SampleOfKey, mappedSampleOf);
}
}

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

@@ -494,7 +494,7 @@ namespace SabreTools.Metadata.DatFiles
}
// If the parent doesn't already contain this item, add to subfolder of parent
else if (!GetItemsForBucketDB(cloneOf).Values.Contains(item.Value) || skipDedup)
else if (!GetItemsForBucketDB(cloneOf).ContainsValue(item.Value) || skipDedup)
{
if (subfolder)
rom.SetName($"{machineName}\\{rom.GetName()}");
@@ -505,7 +505,7 @@ namespace SabreTools.Metadata.DatFiles
}
// All other that would be missing to subfolder of parent
else if (!GetItemsForBucketDB(cloneOf).Values.Contains(item.Value))
else if (!GetItemsForBucketDB(cloneOf).ContainsValue(item.Value))
{
if (subfolder)
item.Value.SetName($"{machineName}\\{item.Value.GetName()}");

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

@@ -30,7 +30,11 @@ namespace SabreTools.Metadata.DatFiles
/// <summary>
/// Lock for statistics calculation
/// </summary>
#if NET9_0_OR_GREATER
private readonly System.Threading.Lock statsLock = new();
#else
private readonly object statsLock = new();
#endif
#endregion

32
SabreTools.Metadata.DatFiles/Extensions.cs
View File

@@ -63,8 +63,8 @@ namespace SabreTools.Metadata.DatFiles
return default;
// Try to get the value from the mappings
if (_toMergingFlagMap.ContainsKey(value))
return _toMergingFlagMap[value];
if (_toMergingFlagMap.TryGetValue(value, out MergingFlag mergingFlag))
return mergingFlag;
// Otherwise, return the default value for the enum
return default;
@@ -83,8 +83,8 @@ namespace SabreTools.Metadata.DatFiles
return default;
// Try to get the value from the mappings
if (_toNodumpFlagMap.ContainsKey(value))
return _toNodumpFlagMap[value];
if (_toNodumpFlagMap.TryGetValue(value, out NodumpFlag nodumpFlag))
return nodumpFlag;
// Otherwise, return the default value for the enum
return default;
@@ -103,8 +103,8 @@ namespace SabreTools.Metadata.DatFiles
return default;
// Try to get the value from the mappings
if (_toPackingFlagMap.ContainsKey(value))
return _toPackingFlagMap[value];
if (_toPackingFlagMap.TryGetValue(value, out PackingFlag packingFlag))
return packingFlag;
// Otherwise, return the default value for the enum
return default;
@@ -123,10 +123,10 @@ namespace SabreTools.Metadata.DatFiles
public static string? AsStringValue(this MergingFlag value, bool useSecond = false)
{
// Try to get the value from the mappings
if (!useSecond && _fromMergingFlagMap.ContainsKey(value))
return _fromMergingFlagMap[value];
else if (useSecond && _fromMergingFlagSecondaryMap.ContainsKey(value))
return _fromMergingFlagSecondaryMap[value];
if (!useSecond && _fromMergingFlagMap.TryGetValue(value, out string? mergingFlag))
return mergingFlag;
else if (useSecond && _fromMergingFlagSecondaryMap.TryGetValue(value, out string? mergingFlagSecondary))
return mergingFlagSecondary;
// Otherwise, return null
return null;
@@ -141,8 +141,8 @@ namespace SabreTools.Metadata.DatFiles
public static string? AsStringValue(this NodumpFlag value)
{
// Try to get the value from the mappings
if (_fromNodumpFlagMap.ContainsKey(value))
return _fromNodumpFlagMap[value];
if (_fromNodumpFlagMap.TryGetValue(value, out string? nodumpFlag))
return nodumpFlag;
// Otherwise, return null
return null;
@@ -157,10 +157,10 @@ namespace SabreTools.Metadata.DatFiles
public static string? AsStringValue(this PackingFlag value, bool useSecond = false)
{
// Try to get the value from the mappings
if (!useSecond && _fromPackingFlagMap.ContainsKey(value))
return _fromPackingFlagMap[value];
else if (useSecond && _fromPackingFlagSecondaryMap.ContainsKey(value))
return _fromPackingFlagSecondaryMap[value];
if (!useSecond && _fromPackingFlagMap.TryGetValue(value, out string? packingFlag))
return packingFlag;
else if (useSecond && _fromPackingFlagSecondaryMap.TryGetValue(value, out string? packingFlagSecondary))
return packingFlagSecondary;
// Otherwise, return null
return null;

1
SabreTools.Metadata.DatFiles/Formats/CommaSeparatedValue.cs
View File

@@ -1,4 +1,3 @@
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Md2File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Md4File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Md5File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

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

@@ -19,7 +19,11 @@ namespace SabreTools.Metadata.DatFiles.Formats
{
/// <inheritdoc/>
public override ItemType[] SupportedTypes
#if NET5_0_OR_GREATER
=> Enum.GetValues<ItemType>();
#else
=> Enum.GetValues(typeof(ItemType)) as ItemType[] ?? [];
#endif
/// <summary>
/// Constructor designed for casting a base DatFile

1
SabreTools.Metadata.DatFiles/Formats/SemicolonSeparatedValue.cs
View File

@@ -1,4 +1,3 @@
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
View File

@@ -3,7 +3,6 @@ using SabreTools.Hashing;
using SabreTools.Metadata.DatItems;
using SabreTools.Metadata.DatItems.Formats;
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

1
SabreTools.Metadata.DatFiles/Formats/TabSeparatedValue.cs
View File

@@ -1,4 +1,3 @@
#pragma warning disable IDE0290 // Use primary constructor
namespace SabreTools.Metadata.DatFiles.Formats
{
/// <summary>

10
SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
View File

@@ -451,10 +451,10 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
public Source? GetSource(long index)
{
if (!_sources.ContainsKey(index))
return null;
if (!_sources.TryGetValue(index, out var source))
return source;
return _sources[index];
return null;
}
/// <summary>
@@ -1250,7 +1250,11 @@ namespace SabreTools.Metadata.DatFiles
DatStatistics.ResetStatistics();
// If there are no items
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (_items is null || _items.IsEmpty)
#else
if (_items is null || _items.Count == 0)
#endif
return;
// Loop through and add

1
SabreTools.Metadata.DatItems/Formats/Configuration.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{

1
SabreTools.Metadata.DatItems/Formats/Port.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Xml.Serialization;
using Newtonsoft.Json;
using SabreTools.Data.Extensions;
namespace SabreTools.Metadata.DatItems.Formats
{