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

Minor cleanup to avoid runtime exceptions

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-13 00:10:36 -05:00
parent 208f4f64a9
commit 16fa2cbe02
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.DatFiles/ItemDictionary.cs
View File

@@ -1091,13 +1091,22 @@ namespace SabreTools.DatFiles
foreach (DatItem item in items)
{
// Get the current machine
var machine = item.GetFieldValue<Machine>(DatItem.MachineKey);
if (machine == null)
continue;
// Get the values to check against
string? machineName = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? machineDesc = machine.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey);
if (machineName == null || machineDesc == null)
continue;
// If the key mapping doesn't exist, add it
#if NET40_OR_GREATER || NETCOREAPP
mapping.TryAdd(item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)!,
item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey)!.Replace('/', '_').Replace("\"", "''").Replace(":", " -"));
mapping.TryAdd(machineName, machineDesc.Replace('/', '_').Replace("\"", "''").Replace(":", " -"));
#else
mapping[item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.NameKey)!]
= item.GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey)!.Replace('/', '_').Replace("\"", "''").Replace(":", " -");
mapping[machineName] = machineDesc.Replace('/', '_').Replace("\"", "''").Replace(":", " -");
#endif
}
#if NET40_OR_GREATER || NETCOREAPP

37
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -1409,6 +1409,7 @@ namespace SabreTools.DatFiles
foreach (var machine in GetMachines())
#endif
{
// Get the current machine
if (machine.Value == null)
#if NET40_OR_GREATER || NETCOREAPP
return;
@@ -1439,37 +1440,37 @@ namespace SabreTools.DatFiles
Dictionary<string, string> mapping = [];
#endif
#if NET452_OR_GREATER || NETCOREAPP
Parallel.ForEach(SortedKeys, Core.Globals.ParallelOptions, key =>
Parallel.ForEach(GetMachines(), Core.Globals.ParallelOptions, machine =>
#elif NET40_OR_GREATER
Parallel.ForEach(SortedKeys, key =>
Parallel.ForEach(GetMachines(), machine =>
#else
foreach (var key in SortedKeys)
foreach (var machine in GetMachines())
#endif
{
var items = GetItemsForBucket(key);
if (items == null)
// Get the current machine
if (machine.Value == null)
#if NET40_OR_GREATER || NETCOREAPP
return;
#else
continue;
#endif
foreach (var item in items)
{
// Get the current machine
var machine = GetMachineForItem(item.Key);
if (machine.Value == null)
continue;
// If the key mapping doesn't exist, add it
// Get the values to check against
string? machineName = machine.Value.GetStringFieldValue(Models.Metadata.Machine.NameKey);
string? machineDesc = machine.Value.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey);
if (machineName == null || machineDesc == null)
#if NET40_OR_GREATER || NETCOREAPP
mapping.TryAdd(machine.Value.GetStringFieldValue(Models.Metadata.Machine.NameKey)!,
machine.Value.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey)!.Replace('/', '_').Replace("\"", "''").Replace(":", " -"));
return;
#else
mapping[machine.Value.GetStringFieldValue(Models.Metadata.Machine.NameKey)!]
= machine.Value.GetStringFieldValue(Models.Metadata.Machine.DescriptionKey)!.Replace('/', '_').Replace("\"", "''").Replace(":", " -");
continue;
#endif
// If the key mapping doesn't exist, add it
#if NET40_OR_GREATER || NETCOREAPP
mapping.TryAdd(machineName, machineDesc.Replace('/', '_').Replace("\"", "''").Replace(":", " -"));
#else
mapping[machineName] = machineDesc.Replace('/', '_').Replace("\"", "''").Replace(":", " -");
#endif
}
#if NET40_OR_GREATER || NETCOREAPP
});
#else