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

Move SabreTools.Filter to SabreTools.Core.Filter

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-12 22:52:36 -04:00
parent 7007cdb5ac
commit c3fe04df2d
22 changed files with 34 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SabreTools/Features/BaseFeature.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using Microsoft.Data.Sqlite;
using SabreTools.Core;
using SabreTools.Core.Filter;
using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
@@ -1783,7 +1784,7 @@ Some special strings that can be used:
/// <summary>
/// Preonfigured FilterRunner
/// </summary>
protected Filter.FilterRunner? FilterRunner { get; set; }
protected FilterRunner? FilterRunner { get; set; }
/// <summary>
/// Pre-configured DatHeader
@@ -2046,7 +2047,7 @@ Some special strings that can be used:
List<string> updateFields = [];
foreach (string fieldName in GetList(features, UpdateFieldListValue))
{
(string? itemType, string? key) = SabreTools.Filter.FilterParser.ParseFilterId(fieldName);
(string? itemType, string? key) = FilterParser.ParseFilterId(fieldName);
if (itemType == Models.Metadata.MetadataFile.MachineKey && key != null)
updateFields.Add(key);
}
@@ -2062,7 +2063,7 @@ Some special strings that can be used:
Dictionary<string, List<string>> updateFields = [];
foreach (string fieldName in GetList(features, UpdateFieldListValue))
{
(string? itemType, string? key) = SabreTools.Filter.FilterParser.ParseFilterId(fieldName);
(string? itemType, string? key) = FilterParser.ParseFilterId(fieldName);
if (itemType != null && itemType != Models.Metadata.MetadataFile.HeaderKey && itemType != Models.Metadata.MetadataFile.MachineKey && key != null)
{
if (!updateFields.ContainsKey(itemType))
@@ -2233,7 +2234,7 @@ Some special strings that can be used:
/// <summary>
/// Get FilterRunner from feature list
/// </summary>
private static Filter.FilterRunner GetFilterRunner(Dictionary<string, Feature?> features)
private static FilterRunner GetFilterRunner(Dictionary<string, Feature?> features)
{
// Populate filters
List<string> filterPairs = GetList(features, FilterListValue);
@@ -2245,7 +2246,7 @@ Some special strings that can be used:
// TODO: Support this use case somehow
}
var filterRunner = new Filter.FilterRunner(filterPairs.ToArray());
var filterRunner = new FilterRunner(filterPairs.ToArray());
return filterRunner;
}

4
SabreTools/Features/Batch.cs
View File

@@ -4,10 +4,10 @@ using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using SabreTools.Core;
using SabreTools.Core.Filter;
using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
using SabreTools.Filter;
using SabreTools.Filtering;
using SabreTools.Hashing;
using SabreTools.Help;
@@ -423,7 +423,7 @@ Reset the internal state: reset();";
string filterString = $"{filterField}{(filterRemove == true ? "!" : string.Empty)}:{filterValue}";
// Create filter to run filters from
var filter = new Filter.FilterRunner([filterString]);
var filter = new FilterRunner([filterString]);
// Apply the filters blindly
batchState.DatFile.ExecuteFilters(filter);