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

Mandatory is technically numeric

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-07 12:34:18 -07:00
parent 712f98fa32
commit 1494e0693f
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.Library/DatItems/Device.cs
View File

@@ -38,7 +38,7 @@ namespace SabreTools.Library.DatItems
/// </summary>
/// <remarks>Only value used seems to be 1. Used like bool, but actually int</remarks>
[JsonProperty("mandatory", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string Mandatory { get; set; } // TODO: long?
public long? Mandatory { get; set; }
/// <summary>
/// Device interface
@@ -82,7 +82,7 @@ namespace SabreTools.Library.DatItems
FixedImage = mappings[Field.DatItem_FixedImage];
if (mappings.Keys.Contains(Field.DatItem_Mandatory))
Mandatory = mappings[Field.DatItem_Mandatory];
Mandatory = Sanitizer.CleanLong(mappings[Field.DatItem_Mandatory]);
if (mappings.Keys.Contains(Field.DatItem_Interface))
Interface = mappings[Field.DatItem_Interface];
@@ -218,9 +218,11 @@ namespace SabreTools.Library.DatItems
return false;
// Filter on mandatory
if (filter.DatItem_Mandatory.MatchesPositiveSet(Mandatory) == false)
if (filter.DatItem_Mandatory.MatchesNeutral(null, Mandatory) == false)
return false;
if (filter.DatItem_Mandatory.MatchesNegativeSet(Mandatory) == true)
else if (filter.DatItem_Mandatory.MatchesPositive(null, Mandatory) == false)
return false;
else if (filter.DatItem_Mandatory.MatchesNegative(null, Mandatory) == false)
return false;
// Filter on interface