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

Make exclusion list population similar to filter

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-16 11:03:59 -08:00
parent e59c9fa0e4
commit 3d93f6efed
2 changed files with 102 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
SabreTools.Filtering/Cleaner.cs
View File

@@ -125,6 +125,104 @@ namespace SabreTools.Filtering
/// </summary>
private Logger logger = new Logger();
#endregion
#region Population
/// <summary>
/// Populate the exclusion objects using a set of field names
/// </summary>
/// <param name="fields">List of field names</param>
public void PopulateExclusionsFromList(List<string> fields)
{
// Instantiate the lists, if necessary
ExcludeDatHeaderFields ??= new List<DatHeaderField>();
ExcludeMachineFields ??= new List<MachineField>();
ExcludeDatItemFields ??= new List<DatItemField>();
foreach (string field in fields)
{
// If we don't even have a possible field name
if (field == null)
continue;
// DatHeader fields
DatHeaderField datHeaderField = field.AsDatHeaderField();
if (datHeaderField != DatHeaderField.NULL)
{
ExcludeDatHeaderFields.Add(datHeaderField);
continue;
}
// Machine fields
MachineField machineField = field.AsMachineField();
if (machineField != MachineField.NULL)
{
ExcludeMachineFields.Add(machineField);
continue;
}
// DatItem fields
DatItemField datItemField = field.AsDatItemField();
if (datItemField != DatItemField.NULL)
{
ExcludeDatItemFields.Add(datItemField);
continue;
}
// If we didn't match anything, log an error
logger.Warning($"The value {field} did not match any known field names. Please check the wiki for more details on supported field names.");
}
}
/// <summary>
/// Populate the filters objects using a set of key:value filters
/// </summary>
/// <param name="filters">List of key:value where ~key/!key is negated</param>
public void PopulateFiltersFromList(List<string> filters)
{
// Instantiate the filters, if necessary
DatHeaderFilter ??= new DatHeaderFilter();
MachineFilter ??= new MachineFilter();
DatItemFilter ??= new DatItemFilter();
foreach (string filterPair in filters)
{
(string field, string value, bool negate) = ProcessFilterPair(filterPair);
// If we don't even have a possible filter pair
if (field == null && value == null)
continue;
// DatHeader fields
DatHeaderField datHeaderField = field.AsDatHeaderField();
if (datHeaderField != DatHeaderField.NULL)
{
DatHeaderFilter.SetFilter(datHeaderField, value, negate);
continue;
}
// Machine fields
MachineField machineField = field.AsMachineField();
if (machineField != MachineField.NULL)
{
MachineFilter.SetFilter(machineField, value, negate);
continue;
}
// DatItem fields
DatItemField datItemField = field.AsDatItemField();
if (datItemField != DatItemField.NULL)
{
DatItemFilter.SetFilter(datItemField, value, negate);
continue;
}
// If we didn't match anything, log an error
logger.Warning($"The value {field} did not match any known field names. Please check the wiki for more details on supported field names.");
}
}
#endregion
#region Cleaning
@@ -342,54 +440,6 @@ namespace SabreTools.Filtering
#region Filtering
/// <summary>
/// Populate the filters objects using a set of key:value filters
/// </summary>
/// <param name="filters">List of key:value where ~key/!key is negated</param>
public void PopulateFromList(List<string> filters)
{
// Instantiate the filters, if necessary
DatHeaderFilter ??= new DatHeaderFilter();
MachineFilter ??= new MachineFilter();
DatItemFilter ??= new DatItemFilter();
foreach (string filterPair in filters)
{
(string field, string value, bool negate) = ProcessFilterPair(filterPair);
// If we don't even have a possible filter pair
if (field == null && value == null)
continue;
// DatHeader fields
DatHeaderField datHeaderField = field.AsDatHeaderField();
if (datHeaderField != DatHeaderField.NULL)
{
DatHeaderFilter.SetFilter(datHeaderField, value, negate);
continue;
}
// Machine fields
MachineField machineField = field.AsMachineField();
if (machineField != MachineField.NULL)
{
MachineFilter.SetFilter(machineField, value, negate);
continue;
}
// DatItem fields
DatItemField datItemField = field.AsDatItemField();
if (datItemField != DatItemField.NULL)
{
DatItemFilter.SetFilter(datItemField, value, negate);
continue;
}
// If we didn't match anything, log an error
logger.Warning($"The value {field} did not match any known field names. Please check the wiki for more details on supported field names.");
}
}
/// <summary>
/// Split the parts of a filter statement
/// </summary>

12
SabreTools/Features/BaseFeature.cs
View File

@@ -2688,17 +2688,13 @@ Some special strings that can be used:
Trim = GetBoolean(features, TrimValue),
};
// Add field exclusions
foreach (string fieldName in GetList(features, ExcludeFieldListValue))
{
cleaner.ExcludeDatHeaderFields.Add(fieldName.AsDatHeaderField());
cleaner.ExcludeMachineFields.Add(fieldName.AsMachineField());
cleaner.ExcludeDatItemFields.Add(fieldName.AsDatItemField());
}
// Populate field exclusions
List<string> exclusionFields = GetList(features, ExcludeFieldListValue);
cleaner.PopulateExclusionsFromList(exclusionFields);
// Populate filters
List<string> filterPairs = GetList(features, FilterListValue);
cleaner.PopulateFromList(filterPairs);
cleaner.PopulateFiltersFromList(filterPairs);
// Include 'of" in game filters
cleaner.MachineFilter.IncludeOfInGame = GetBoolean(features, MatchOfTagsValue);