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

Prefilter on modes that don't rely on devices or slots

Browse Source
This commit is contained in:
Matt Nadareski
2025-05-14 13:18:34 -04:00
parent 4a5c4d104d
commit 95840a8146
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SabreTools.DatTools/MergeSplit.cs
View File

@@ -4,7 +4,7 @@ using System.IO;
#if NET40_OR_GREATER || NETCOREAPP
using System.Threading.Tasks;
#endif
using SabreTools.Core.Tools;
using SabreTools.Core.Filter;
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO;
@@ -39,9 +39,10 @@ namespace SabreTools.DatTools
/// </summary>
/// <param name="datFile">Current DatFile object to run operations on</param>
/// <param name="useTags">True if DatFile tags override splitting, false otherwise</param>
/// <param name="filterRunner">Optional FilterRunner to filter items on parse</param>
/// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
/// <returns>True if the DatFile was split, false on error</returns>
public bool ApplySplitting(DatFile datFile, bool useTags, bool throwOnError = false)
public bool ApplySplitting(DatFile datFile, bool useTags, FilterRunner? filterRunner = null, bool throwOnError = false)
{
InternalStopwatch watch = new("Applying splitting to DAT");
@@ -59,17 +60,29 @@ namespace SabreTools.DatTools
// No-op
break;
case MergingFlag.Split:
if (filterRunner != null)
datFile.ExecuteFilters(filterRunner);
datFile.ApplySplit();
break;
case MergingFlag.Merged:
if (filterRunner != null)
datFile.ExecuteFilters(filterRunner);
datFile.ApplyMerged();
break;
case MergingFlag.NonMerged:
if (filterRunner != null)
datFile.ExecuteFilters(filterRunner);
datFile.ApplyNonMerged();
break;
// Nonstandard
case MergingFlag.FullMerged:
if (filterRunner != null)
datFile.ExecuteFilters(filterRunner);
datFile.ApplyFullyMerged();
break;
case MergingFlag.DeviceNonMerged:

2
SabreTools/Features/Batch.cs
View File

@@ -577,7 +577,7 @@ Reset the internal state: reset();";
// Apply the merging flag
MergeSplit splitter = new() { SplitType = mergingFlag };
splitter.ApplySplitting(batchState.DatFile, false, false);
splitter.ApplySplitting(batchState.DatFile, useTags: false, throwOnError: false);
}
}

2
SabreTools/Features/DatFromDir.cs
View File

@@ -101,7 +101,7 @@ namespace SabreTools.Features
// Perform additional processing steps
Extras!.ApplyExtras(datdata);
Extras!.ApplyExtrasDB(datdata);
Splitter!.ApplySplitting(datdata, useTags: false);
Splitter!.ApplySplitting(datdata, useTags: false, filterRunner: FilterRunner);
datdata.ExecuteFilters(FilterRunner!);
Cleaner!.ApplyCleaning(datdata);
Remover!.ApplyRemovals(datdata);

2
SabreTools/Features/Update.cs
View File

@@ -537,7 +537,7 @@ namespace SabreTools.Features
{
Extras!.ApplyExtras(datFile);
Extras!.ApplyExtrasDB(datFile);
Splitter!.ApplySplitting(datFile, useTags: false);
Splitter!.ApplySplitting(datFile, useTags: false, filterRunner: FilterRunner);
datFile.ExecuteFilters(FilterRunner!);
Cleaner!.ApplyCleaning(datFile);
Remover!.ApplyRemovals(datFile);

4
SabreTools/Features/Verify.cs
View File

@@ -72,7 +72,7 @@ namespace SabreTools.Features
// Perform additional processing steps
Extras!.ApplyExtras(datdata);
Extras!.ApplyExtrasDB(datdata);
Splitter!.ApplySplitting(datdata, useTags: true);
Splitter!.ApplySplitting(datdata, useTags: true, filterRunner: FilterRunner);
datdata.ExecuteFilters(FilterRunner!);
Cleaner!.ApplyCleaning(datdata);
Remover!.ApplyRemovals(datdata);
@@ -128,7 +128,7 @@ namespace SabreTools.Features
// Perform additional processing steps
Extras!.ApplyExtras(datdata);
Extras!.ApplyExtrasDB(datdata);
Splitter!.ApplySplitting(datdata, useTags: true);
Splitter!.ApplySplitting(datdata, useTags: true, filterRunner: FilterRunner);
datdata.ExecuteFilters(FilterRunner!);
Cleaner!.ApplyCleaning(datdata);
Remover!.ApplyRemovals(datdata);