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

Split ApplyRemovals for testability

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-10 21:15:50 -05:00
parent a16a5db197
commit b37787be64
3 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SabreTools.DatFiles.Test/DatFileTests.Removal.cs
View File

@@ -2,6 +2,35 @@ namespace SabreTools.DatFiles.Test
{
public partial class DatFileTests
{
#region RemoveHeaderFields
// TODO: Write RemoveHeaderFields tests
// - Null header
// - Empty list
// - Full list
#endregion
#region RemoveItemFields
// TODO: Write RemoveItemFields tests
// - Null item dict
// - Both lists empty
// - Machine only
// - Item only
// - Nested
#endregion
#region RemoveItemFieldsDB
// TODO: Write RemoveItemFieldsDB tests
// - Null item dict
// - Both lists empty
// - Machine only
// - Item only
// - Nested
#endregion
}
}

45
SabreTools.DatFiles/DatFile.Removal.cs
View File

@@ -13,27 +13,29 @@ namespace SabreTools.DatFiles
#region Removal
/// <summary>
/// Remove fields indicated by the three input lists
/// Remove header fields with given values
/// </summary>
public void ApplyRemovals(List<string> headerFieldNames, List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
public void RemoveHeaderFields(List<string> headerFieldNames)
{
// Remove DatHeader fields
if (headerFieldNames.Count > 0)
RemoveHeaderFields(headerFieldNames);
// If we have an invalid input, return
if (Header == null || headerFieldNames.Count == 0)
return;
// Remove DatItem and Machine fields
if (machineFieldNames.Count > 0 || itemFieldNames.Count > 0)
foreach (var fieldName in headerFieldNames)
{
ApplyRemovalsItemDictionary(machineFieldNames, itemFieldNames);
ApplyRemovalsItemDictionaryDB(machineFieldNames, itemFieldNames);
Header.RemoveField(fieldName);
}
}
/// <summary>
/// Apply removals to the item dictionary
/// </summary>
private void ApplyRemovalsItemDictionary(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
public void RemoveItemFields(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
{
// If we have an invalid input, return
if (Items == null || (machineFieldNames.Count == 0 && itemFieldNames.Count == 0))
return;
#if NET452_OR_GREATER || NETCOREAPP
Parallel.ForEach(Items.Keys, Core.Globals.ParallelOptions, key =>
#elif NET40_OR_GREATER
@@ -64,8 +66,12 @@ namespace SabreTools.DatFiles
/// <summary>
/// Apply removals to the item dictionary
/// </summary>
private void ApplyRemovalsItemDictionaryDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
public void RemoveItemFieldsDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
{
// If we have an invalid input, return
if (ItemsDB == null || (machineFieldNames.Count == 0 && itemFieldNames.Count == 0))
return;
#if NET452_OR_GREATER || NETCOREAPP
Parallel.ForEach(ItemsDB.SortedKeys, Core.Globals.ParallelOptions, key =>
#elif NET40_OR_GREATER
@@ -94,22 +100,7 @@ namespace SabreTools.DatFiles
}
/// <summary>
/// Remove fields with given values
/// </summary>
private void RemoveHeaderFields(List<string> headerFieldNames)
{
// If we have an invalid input, return
if (Header == null || headerFieldNames.Count == 0)
return;
foreach (var fieldName in headerFieldNames)
{
Header.RemoveField(fieldName);
}
}
/// <summary>
/// Remove fields with given values
/// Remove machine fields with given values
/// </summary>
private static void RemoveFields(Machine? machine, List<string> machineFieldNames)
{

4
SabreTools.DatTools/Remover.cs
View File

@@ -130,7 +130,9 @@ namespace SabreTools.DatTools
public void ApplyRemovals(DatFile datFile)
{
InternalStopwatch watch = new("Applying removals to DAT");
datFile.ApplyRemovals(HeaderFieldNames, MachineFieldNames, ItemFieldNames);
datFile.RemoveHeaderFields(HeaderFieldNames);
datFile.RemoveItemFields(MachineFieldNames, ItemFieldNames);
datFile.RemoveItemFieldsDB(MachineFieldNames, ItemFieldNames);
watch.Stop();
}