SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-08 18:06:41 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Remove unnecessary framework gating

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-16 13:03:34 -04:00
parent b8966f5e37
commit 334ab130da
1 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
SabreTools.Metadata.DatFiles/ItemDatabase.cs
View File

@@ -332,31 +332,15 @@ namespace SabreTools.Metadata.DatFiles
if (bucketName is null)
return [];
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (!_buckets.TryGetValue(bucketName, out var itemIds))
return [];
#else
if (!_buckets.ContainsKey(bucketName))
return [];
var itemIds = _buckets[bucketName];
#endif
var datItems = new Dictionary<long, DatItem>();
foreach (long itemId in itemIds)
{
// Ignore missing IDs
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (!_items.TryGetValue(itemId, out var datItem) || datItem is null)
continue;
#else
if (!_items.ContainsKey(itemId))
continue;
var datItem = _items[itemId];
if (datItem is null)
continue;
#endif
if (!filter || !datItem.RemoveFlag)
datItems[itemId] = datItem;
@@ -370,17 +354,10 @@ namespace SabreTools.Metadata.DatFiles
/// </summary>
public Machine? GetMachine(long index)
{
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (!_machines.TryGetValue(index, out var machine))
return null;
return machine;
#else
if (!_machines.ContainsKey(index))
return null;
return _machines[index];
#endif
}
/// <summary>
@@ -468,15 +445,8 @@ namespace SabreTools.Metadata.DatFiles
foreach (var index in list)
{
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (!_items.TryGetValue(index, out var datItem) || datItem is null)
continue;
#else
if (!_items.ContainsKey(index))
continue;
var datItem = _items[index];
#endif
RemoveItem(index);
}
@@ -870,20 +840,6 @@ namespace SabreTools.Metadata.DatFiles
return output;
}
/// <summary>
/// Ensure the key exists in the items dictionary
/// </summary>
private void EnsureBucketingKey(string key)
{
// If the key is missing from the dictionary, add it
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
_buckets.GetOrAdd(key, []);
#else
if (!_buckets.ContainsKey(key))
_buckets[key] = [];
#endif
}
/// <summary>
/// Get the highest-order Field value that represents the statistics
/// </summary>
@@ -1018,7 +974,13 @@ namespace SabreTools.Metadata.DatFiles
string? bucketKey = GetBucketKey(itemIndex, bucketBy, lower, norename);
lock (bucketKey)
{
EnsureBucketingKey(bucketKey);
// If the key is missing from the dictionary, add it
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
_buckets.GetOrAdd(bucketKey, []);
#else
if (!_buckets.ContainsKey(bucketKey))
_buckets[bucketKey] = [];
#endif
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
if (!_buckets.TryGetValue(bucketKey, out var bucket) || bucket is null)