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

DatItems don't know about filtering

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-13 21:47:42 -08:00
parent 67bfe0dae9
commit 3fcec263e0
40 changed files with 1325 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
SabreTools.DatItems/Disk.cs
View File

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.FileTypes;
using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
@@ -425,76 +424,6 @@ namespace SabreTools.DatItems
#region Filtering
/// <inheritdoc/>
public override bool PassesFilter(Cleaner cleaner, bool sub = false)
{
// Check common fields first
if (!base.PassesFilter(cleaner, sub))
return false;
#region Common
// Filter on item name
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
return false;
// Filter on MD5
if (!Filter.PassStringFilter(cleaner.DatItemFilter.MD5, MD5))
return false;
// Filter on SHA-1
if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA1, SHA1))
return false;
// Filter on merge tag
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Merge, MergeTag))
return false;
// Filter on region
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Region, Region))
return false;
// Filter on index
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Index, Index))
return false;
// Filter on writable
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Writable, Writable))
return false;
// Filter on status
if (cleaner.DatItemFilter.Status.MatchesPositive(ItemStatus.NULL, ItemStatus) == false)
return false;
if (cleaner.DatItemFilter.Status.MatchesNegative(ItemStatus.NULL, ItemStatus) == true)
return false;
// Filter on optional
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Optional, Optional))
return false;
#endregion
#region SoftwareList
// Filter on DiskArea
if (DiskAreaSpecified)
{
if (!DiskArea.PassesFilter(cleaner, true))
return false;
}
// Filter on Part
if (PartSpecified)
{
if (!Part.PassesFilter(cleaner, true))
return false;
}
#endregion
return true;
}
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,