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

Create internal filters dictionary instead of rebuilding each time

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-13 20:42:53 -04:00
parent 0c7ba47dde
commit d4b947a2ce
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ namespace SabreTools.Core.Filter
/// <summary> /// <summary>
/// Set of filters to be run against an object /// Set of filters to be run against an object
/// </summary> /// </summary>
public readonly FilterObject[] Filters; public readonly Dictionary<string, List<FilterObject>> Filters = [];
/// <summary> /// <summary>
/// Cached item type names for filter selection /// Cached item type names for filter selection
@@ -33,23 +33,36 @@ namespace SabreTools.Core.Filter
public FilterRunner(FilterObject[] filters) public FilterRunner(FilterObject[] filters)
{ {
Filters = filters; foreach (var filter in filters)
{
// Ensure the key exists
string key = filter.Key.ToString();
if (!Filters.ContainsKey(filter.Key.ToString()))
Filters[key] = [];
// Add the filter to the set
Filters[key].Add(filter);
}
} }
public FilterRunner(string[] filterStrings) public FilterRunner(string[] filterStrings)
{ {
List<FilterObject> filters = [];
foreach (string filterString in filterStrings) foreach (string filterString in filterStrings)
{ {
try try
{ {
var filter = new FilterObject(filterString); var filter = new FilterObject(filterString);
filters.Add(filter);
// Ensure the key exists
string key = filter.Key.ToString();
if (!Filters.ContainsKey(filter.Key.ToString()))
Filters[key] = [];
// Add the filter to the set
Filters[key].Add(filter);
} }
catch { } catch { }
} }
Filters = [.. filters];
} }
/// <summary> /// <summary>
@@ -65,24 +78,9 @@ namespace SabreTools.Core.Filter
_ => null, _ => null,
}; };
// Group filters by key // Null is invalid
var filterDictionary = new Dictionary<string, List<FilterObject>>(); if (itemName == null)
foreach (var filter in Filters) return false;
{
// Skip filters not applicable to the item
if (filter.Key.ItemName == "item" && Array.IndexOf(_datItemTypeNames, itemName) == -1)
continue;
else if (filter.Key.ItemName != "item" && filter.Key.ItemName != itemName)
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);
}
// TODO: REMOVE THIS ENTIRE BLOCK WHEN A PROPER IMPLEMENTATION IS FOUND // TODO: REMOVE THIS ENTIRE BLOCK WHEN A PROPER IMPLEMENTATION IS FOUND
// Handle special keys that work in tandem // Handle special keys that work in tandem
@@ -92,7 +90,7 @@ namespace SabreTools.Core.Filter
bool containsKey = false; bool containsKey = false;
foreach (string key in _machineTypeKeys) foreach (string key in _machineTypeKeys)
{ {
if (filterDictionary.ContainsKey(key)) if (Filters.ContainsKey(key))
containsKey = true; containsKey = true;
} }
@@ -103,10 +101,10 @@ namespace SabreTools.Core.Filter
foreach (string filterKey in _machineTypeKeys) foreach (string filterKey in _machineTypeKeys)
{ {
// Skip missing keys // Skip missing keys
if (!filterDictionary.ContainsKey(filterKey)) if (!Filters.ContainsKey(filterKey))
continue; continue;
foreach (var filter in filterDictionary[filterKey]) foreach (var filter in Filters[filterKey])
{ {
matchAny |= filter.Matches(dictionaryBase); matchAny |= filter.Matches(dictionaryBase);
} }
@@ -115,20 +113,24 @@ namespace SabreTools.Core.Filter
// If we don't get a match, it's a failure // If we don't get a match, it's a failure
if (!matchAny) if (!matchAny)
return false; return false;
// Remove the keys from the dictionary
foreach (string key in _machineTypeKeys)
{
filterDictionary.Remove(key);
}
} }
} }
// Loop through and run each filter in order // Loop through and run each filter in order
foreach (var filterKey in filterDictionary.Keys) foreach (var filterKey in Filters.Keys)
{ {
// Skip filters not applicable to the item
if (filterKey.StartsWith("item.") && Array.IndexOf(_datItemTypeNames, itemName) == -1)
continue;
else if (!filterKey.StartsWith("item.") && !filterKey.StartsWith(itemName))
continue;
// TODO: REMOVE THIS ENTIRE BLOCK WHEN A PROPER IMPLEMENTATION IS FOUND
if (Array.Exists(_machineTypeKeys, key => key == filterKey))
continue;
bool matchOne = false; bool matchOne = false;
foreach (var filter in filterDictionary[filterKey]) foreach (var filter in Filters[filterKey])
{ {
matchOne |= filter.Matches(dictionaryBase); matchOne |= filter.Matches(dictionaryBase);
} }