diff --git a/SabreTools.DatFiles/DatFile.Filtering.cs b/SabreTools.DatFiles/DatFile.Filtering.cs index ff32919b..44f2908f 100644 --- a/SabreTools.DatFiles/DatFile.Filtering.cs +++ b/SabreTools.DatFiles/DatFile.Filtering.cs @@ -3,14 +3,15 @@ using System.Collections.Generic; #if NET40_OR_GREATER || NETCOREAPP using System.Collections.Concurrent; #endif +using System.IO; +using System.Text.RegularExpressions; #if NET40_OR_GREATER || NETCOREAPP using System.Threading.Tasks; #endif using SabreTools.Core; +using SabreTools.Core.Filter; using SabreTools.DatItems; using SabreTools.DatItems.Formats; -using System.IO; -using System.Text.RegularExpressions; namespace SabreTools.DatFiles { @@ -27,6 +28,16 @@ namespace SabreTools.DatFiles #region Filtering + /// + /// Execute all filters in a filter runner on the items in the dictionary + /// + /// Preconfigured filter runner to use + public void ExecuteFilters(FilterRunner filterRunner) + { + Items.ExecuteFilters(filterRunner); + ItemsDB.ExecuteFilters(filterRunner); + } + /// /// Use game descriptions as names, updating cloneof/romof/sampleof /// diff --git a/SabreTools.DatFiles/DatFile.cs b/SabreTools.DatFiles/DatFile.cs index 5a6f09d4..4d446b4a 100644 --- a/SabreTools.DatFiles/DatFile.cs +++ b/SabreTools.DatFiles/DatFile.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Xml.Serialization; using Newtonsoft.Json; -using SabreTools.Core.Filter; using SabreTools.Core.Tools; using SabreTools.DatItems; using SabreTools.DatItems.Formats; @@ -321,20 +320,6 @@ namespace SabreTools.DatFiles #endregion - #region Item Dictionary Passthrough - Filtering - - /// - /// Execute all filters in a filter runner on the items in the dictionary - /// - /// Preconfigured filter runner to use - public void ExecuteFilters(FilterRunner filterRunner) - { - Items.ExecuteFilters(filterRunner); - ItemsDB.ExecuteFilters(filterRunner); - } - - #endregion - #region Parsing ///