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

More granular skipping for filters

Browse Source
This commit is contained in:
Matt Nadareski
2021-02-03 09:16:48 -08:00
parent 61dc45a1c7
commit f412d1373d
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SabreTools.Filtering/DatItemFilter.cs
View File

@@ -193,6 +193,11 @@ namespace SabreTools.Filtering
#endregion
#endregion // Item-Specific
/// <summary>
/// Determines if any filters have been set
/// </summary>
public bool HasFilters { get; set; } = false;
#endregion // Fields

17
SabreTools.Filtering/Filter.cs
View File

@@ -56,11 +56,6 @@ namespace SabreTools.Filtering
/// Filter for Machine fields
/// </summary>
public MachineFilter MachineFilter { get; set; }
/// <summary>
/// Determines if any filters have been set
/// </summary>
public bool HasFilters { get; private set; } = false;
#endregion
@@ -116,7 +111,7 @@ namespace SabreTools.Filtering
if (machineField != MachineField.NULL)
{
MachineFilter.SetFilter(machineField, value, negate);
HasFilters = true;
MachineFilter.HasFilters = true;
continue;
}
@@ -125,7 +120,7 @@ namespace SabreTools.Filtering
if (datItemField != DatItemField.NULL)
{
DatItemFilter.SetFilter(datItemField, value, negate);
HasFilters = true;
DatItemFilter.HasFilters = true;
continue;
}
@@ -384,7 +379,7 @@ namespace SabreTools.Filtering
return false;
// If no filters were set, return true
if (HasFilters)
if (!MachineFilter.HasFilters && !DatItemFilter.HasFilters)
return true;
InternalStopwatch watch = new InternalStopwatch("Applying filters to DAT");
@@ -464,9 +459,13 @@ namespace SabreTools.Filtering
return false;
// Filter on Machine fields
if (!MachineFilter.PassesFilters(datItem.Machine))
if (MachineFilter.HasFilters && !MachineFilter.PassesFilters(datItem.Machine))
return false;
// If we have no DatItemFilters set, just return true
if (!DatItemFilter.HasFilters)
return true;
// Filter on DatItem fields
return DatItemFilter.PassesFilters(datItem);
}

5
SabreTools.Filtering/MachineFilter.cs
View File

@@ -95,6 +95,11 @@ namespace SabreTools.Filtering
/// Include romof and cloneof when filtering machine names
/// </summary>
public bool IncludeOfInGame { get; set; }
/// <summary>
/// Determines if any filters have been set
/// </summary>
public bool HasFilters { get; set; } = false;
#endregion