Fix return/continue issues

This commit is contained in:
Matt Nadareski
2024-03-05 02:52:53 -05:00
parent 2b2aa5aff8
commit 05900cf818
10 changed files with 123 additions and 0 deletions

View File

@@ -1786,6 +1786,11 @@ Some special strings that can be used:
/// </summary>
protected Filtering.Filter Filter { get; set; }
/// <summary>
/// Preonfigured FilterRunner
/// </summary>
protected Filter.FilterRunner FilterRunner { get; set; }
/// <summary>
/// Pre-configured DatHeader
/// </summary>
@@ -1894,6 +1899,7 @@ Some special strings that can be used:
Cleaner = GetCleaner(features);
Extras = GetExtras(features);
Filter = GetFilter(features);
FilterRunner = GetFilterRunner(features);
Header = GetDatHeader(features);
LogLevel = GetString(features, LogLevelStringValue).AsLogLevel();
OutputDir = GetString(features, OutputDirStringValue)?.Trim('"');
@@ -2243,6 +2249,22 @@ Some special strings that can be used:
return filter;
}
/// <summary>
/// Get FilterRunner from feature list
/// </summary>
private static Filter.FilterRunner GetFilterRunner(Dictionary<string, Feature> features)
{
// Populate filters
List<string> filterPairs = GetList(features, FilterListValue);
var filterRunner = new Filter.FilterRunner(filterPairs.ToArray());
// TODO: Support this use case somehow
// Include 'of" in game filters
//filter.MachineFilter.IncludeOfInGame = GetBoolean(features, MatchOfTagsValue);
return filterRunner;
}
/// <summary>
/// Get Remover from feature list
/// </summary>

View File

@@ -101,6 +101,7 @@ namespace SabreTools.Features
Extras.ApplyExtras(datdata);
Splitter.ApplySplitting(datdata, useTags: false);
Filter.ApplyFilters(datdata);
//FilterRunner.Run(datdata); // TODO: Create helper method to run over entire DAT
Cleaner.ApplyCleaning(datdata);
Remover.ApplyRemovals(datdata);