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

Fix filtering logic around multiple match cases

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-02 12:15:28 -04:00
parent a63e973c29
commit 6651b8291a
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SabreTools.Core/Filter/FilterRunner.cs
View File

@@ -49,17 +49,36 @@ namespace SabreTools.Core.Filter
_ => null, _ => null,
}; };
// Loop through and run each filter in order // Group filters by key
var filterDictionary = new Dictionary<string, List<FilterObject>>();
foreach (var filter in Filters) foreach (var filter in Filters)
{ {
// If the filter isn't for this object type, skip // Skip filters not applicable to the item
if (filter.Key.ItemName == "item" && Array.IndexOf(TypeHelper.GetDatItemTypeNames(), itemName) == -1) if (filter.Key.ItemName == "item" && Array.IndexOf(TypeHelper.GetDatItemTypeNames(), itemName) == -1)
continue; continue;
else if (filter.Key.ItemName != "item" && filter.Key.ItemName != itemName) else if (filter.Key.ItemName != "item" && filter.Key.ItemName != itemName)
continue; continue;
// Ensure the key exists
string key = filter.Key.ToString();
if (!filterDictionary.ContainsKey(filter.Key.ToString()))
filterDictionary[key] = [];
// Add the filter to the set
filterDictionary[key].Add(filter);
}
// Loop through and run each filter in order
foreach (var filterKey in filterDictionary.Keys)
{
bool matchOne = false;
foreach (var filter in filterDictionary[filterKey])
{
matchOne |= filter.Matches(dictionaryBase);
}
// If we don't get a match, it's a failure // If we don't get a match, it's a failure
if (!filter.Matches(dictionaryBase)) if (!matchOne)
return false; return false;
} }

5
SabreTools.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -66,8 +66,9 @@ namespace SabreTools.DatFiles.Test
DatFile datFile = new Formats.Logiqx(null, useGame: false); DatFile datFile = new Formats.Logiqx(null, useGame: false);
datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false); datFile.ConvertFromMetadata(item, "filename", indexId: 0, keep: true, statsOnly: false);
DatItems.Machine actualMachine = Assert.Single(datFile.ItemsDB.GetMachines()).Value; // TODO: Reenable when ItemsDB is used again
ValidateMachine(actualMachine); // DatItems.Machine actualMachine = Assert.Single(datFile.ItemsDB.GetMachines()).Value;
// ValidateMachine(actualMachine);
// Aggregate for easier validation // Aggregate for easier validation
DatItems.DatItem[] datItems = datFile.Items.SortedKeys DatItems.DatItem[] datItems = datFile.Items.SortedKeys