mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Promote Info
This commit is contained in:
@@ -259,13 +259,6 @@ namespace SabreTools.Library.DatItems
|
||||
[JsonProperty("supported", DefaultValueHandling = DefaultValueHandling.Ignore)]
|
||||
public Supported Supported { get; set; } = Supported.NULL;
|
||||
|
||||
/// <summary>
|
||||
/// List of info items
|
||||
/// </summary>
|
||||
/// <remarks>Also in SoftwareList</remarks>
|
||||
[JsonProperty("infos", DefaultValueHandling = DefaultValueHandling.Ignore)]
|
||||
public List<Info> Infos { get; set; } = null;
|
||||
|
||||
/// <summary>
|
||||
/// List of shared feature items
|
||||
/// </summary>
|
||||
@@ -522,7 +515,6 @@ namespace SabreTools.Library.DatItems
|
||||
#region SoftwareList
|
||||
|
||||
Supported = this.Supported,
|
||||
Infos = this.Infos,
|
||||
SharedFeatures = this.SharedFeatures,
|
||||
|
||||
#endregion
|
||||
@@ -790,54 +782,6 @@ namespace SabreTools.Library.DatItems
|
||||
if (filter.Machine_Supported.MatchesNegative(Supported.NULL, Supported) == true)
|
||||
return false;
|
||||
|
||||
#region Infos
|
||||
|
||||
// Machine_Infos
|
||||
if (filter.Machine_Infos.MatchesNeutral(null, Infos?.Any() ?? null) == false)
|
||||
return false;
|
||||
|
||||
// Machine_Info_Name
|
||||
if (Infos?.Any() == true)
|
||||
{
|
||||
bool anyPositive = false;
|
||||
bool anyNegative = false;
|
||||
|
||||
foreach (var info in Infos)
|
||||
{
|
||||
if (filter.Machine_Info_Name.MatchesPositiveSet(info?.Name) != false)
|
||||
anyPositive = true;
|
||||
if (filter.Machine_Info_Name.MatchesNegativeSet(info?.Name) == true)
|
||||
anyNegative = true;
|
||||
}
|
||||
|
||||
if (!anyPositive)
|
||||
return false;
|
||||
if (anyNegative)
|
||||
return false;
|
||||
}
|
||||
|
||||
// Machine_Info_Value
|
||||
if (Infos?.Any() == true)
|
||||
{
|
||||
bool anyPositive = false;
|
||||
bool anyNegative = false;
|
||||
|
||||
foreach (var info in Infos)
|
||||
{
|
||||
if (filter.Machine_Info_Value.MatchesPositiveSet(info?.Value) != false)
|
||||
anyPositive = true;
|
||||
if (filter.Machine_Info_Value.MatchesNegativeSet(info?.Value) == true)
|
||||
anyNegative = true;
|
||||
}
|
||||
|
||||
if (!anyPositive)
|
||||
return false;
|
||||
if (anyNegative)
|
||||
return false;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region SharedFeatures
|
||||
|
||||
// Machine_SharedFeatures
|
||||
@@ -968,9 +912,6 @@ namespace SabreTools.Library.DatItems
|
||||
if (fields.Contains(Field.Machine_Runnable))
|
||||
Runnable = Runnable.NULL;
|
||||
|
||||
if (fields.Contains(Field.Machine_Infos))
|
||||
Infos = null;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Logiqx
|
||||
@@ -1124,9 +1065,6 @@ namespace SabreTools.Library.DatItems
|
||||
if (fields.Contains(Field.Machine_Runnable))
|
||||
Runnable = machine.Runnable;
|
||||
|
||||
if (fields.Contains(Field.Machine_Infos))
|
||||
Infos = machine.Infos;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Logiqx
|
||||
|
||||
Reference in New Issue
Block a user