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

Add more parity between current and IDDB

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-19 15:31:23 -04:00
parent b494394249
commit 141fb7eef0
5 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -231,6 +231,36 @@ namespace SabreTools.DatFiles
return _machineIndex - 1; return _machineIndex - 1;
} }
/// <summary>
/// Remove any keys that have null or empty values
/// </summary>
public void ClearEmpty()
{
var keys = SortedKeys.Where(k => k != null).ToList();
foreach (string key in keys)
{
// If the key doesn't exist, skip
if (!_buckets.ContainsKey(key))
continue;
// If the value is null, remove
else if (_buckets[key] == null)
#if NET40_OR_GREATER || NETCOREAPP
_buckets.TryRemove(key, out _);
#else
_buckets.Remove(key);
#endif
// If there are no non-blank items, remove
else if (!_buckets[key]!.Any(i => GetItem(i) != null && GetItem(i) is not Blank))
#if NET40_OR_GREATER || NETCOREAPP
_buckets.TryRemove(key, out _);
#else
_buckets.Remove(key);
#endif
}
}
/// <summary> /// <summary>
/// Remove all items marked for removal /// Remove all items marked for removal
/// </summary> /// </summary>

2
SabreTools.DatTools/Verification.cs
View File

@@ -108,6 +108,7 @@ namespace SabreTools.DatTools
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}"); datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}");
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}"); datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}");
datFile.Items.ClearMarked(); datFile.Items.ClearMarked();
datFile.ItemsDB.ClearMarked();
return success; return success;
} }
@@ -157,6 +158,7 @@ namespace SabreTools.DatTools
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}"); datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}");
datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}"); datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}");
datFile.Items.ClearMarked(); datFile.Items.ClearMarked();
datFile.ItemsDB.ClearMarked();
return success; return success;
} }

4
SabreTools.Filtering/Cleaner.cs
View File

@@ -139,10 +139,14 @@ namespace SabreTools.Filtering
// Remove all marked items // Remove all marked items
datFile.Items.ClearMarked(); datFile.Items.ClearMarked();
datFile.ItemsDB.ClearMarked();
// We remove any blanks, if we aren't supposed to have any // We remove any blanks, if we aren't supposed to have any
if (KeepEmptyGames == false) if (KeepEmptyGames == false)
{
datFile.Items.ClearEmpty(); datFile.Items.ClearEmpty();
datFile.ItemsDB.ClearEmpty();
}
} }
catch (Exception ex) when (!throwOnError) catch (Exception ex) when (!throwOnError)
{ {

2
SabreTools/Features/Batch.cs
View File

@@ -431,7 +431,9 @@ Reset the internal state: reset();";
// Cleanup after the filter // Cleanup after the filter
// TODO: We might not want to remove immediately // TODO: We might not want to remove immediately
batchState.DatFile.Items.ClearMarked(); batchState.DatFile.Items.ClearMarked();
batchState.DatFile.ItemsDB.ClearMarked();
batchState.DatFile.Items.ClearEmpty(); batchState.DatFile.Items.ClearEmpty();
batchState.DatFile.ItemsDB.ClearEmpty();
} }
} }

2
SabreTools/Features/Sort.cs
View File

@@ -119,6 +119,7 @@ namespace SabreTools.Features
datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}"); datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}");
datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}"); datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}");
datdata.Items.ClearMarked(); datdata.Items.ClearMarked();
datdata.ItemsDB.ClearMarked();
Writer.Write(datdata, OutputDir); Writer.Write(datdata, OutputDir);
} }
} }
@@ -160,6 +161,7 @@ namespace SabreTools.Features
datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}"); datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.NameKey)}");
datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}"); datdata.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, $"fixDAT_{Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)}");
datdata.Items.ClearMarked(); datdata.Items.ClearMarked();
datdata.ItemsDB.ClearMarked();
Writer.Write(datdata, OutputDir); Writer.Write(datdata, OutputDir);
} }
} }