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

Value is only part of certain items

Browse Source 
This is yet another boilerplate reduction AS WELL AS a reduction for unnecessary field names (mostly due to my misunderstanding of my own implementation)
This commit is contained in:
Matt Nadareski
2020-09-03 11:48:30 -07:00
parent 47c2c1d227
commit 6f72416947
40 changed files with 119 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
SabreTools.Library/DatItems/Rom.cs
View File

@@ -185,6 +185,12 @@ namespace SabreTools.Library.DatItems
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)]
public Part Part { get; set; }
/// <summary>
/// SoftwareList value associated with the item
/// </summary>
[JsonProperty("value", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string Value { get; set; }
#endregion
#endregion // Fields
@@ -210,6 +216,9 @@ namespace SabreTools.Library.DatItems
base.SetFields(mappings);
// Handle Rom-specific fields
#region Common
if (mappings.Keys.Contains(Field.DatItem_Name))
Name = mappings[Field.DatItem_Name];
@@ -266,6 +275,10 @@ namespace SabreTools.Library.DatItems
if (mappings.Keys.Contains(Field.DatItem_Inverted))
Inverted = mappings[Field.DatItem_Optional].AsYesNo();
#endregion
#region SoftwareList
if (mappings.Keys.Contains(Field.DatItem_AreaName))
{
if (DataArea == null)
@@ -298,6 +311,11 @@ namespace SabreTools.Library.DatItems
DataArea.Endianness = mappings[Field.DatItem_AreaEndianness];
}
if (mappings.Keys.Contains(Field.DatItem_Value))
Value = mappings[Field.DatItem_Value];
#endregion
}
#endregion
@@ -380,7 +398,6 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
@@ -408,6 +425,7 @@ namespace SabreTools.Library.DatItems
DataArea = this.DataArea,
Part = this.Part,
Value = this.Value,
};
}
@@ -754,6 +772,12 @@ namespace SabreTools.Library.DatItems
if (filter.DatItem_Part_Interface.MatchesNegativeSet(Part?.Interface) == true)
return false;
// Filter on value
if (filter.DatItem_Value.MatchesPositiveSet(Value) == false)
return false;
if (filter.DatItem_Value.MatchesNegativeSet(Value) == true)
return false;
#endregion
return true;
@@ -862,6 +886,9 @@ namespace SabreTools.Library.DatItems
if (fields.Contains(Field.DatItem_Features) && Part != null)
Part.Features = null;
if (fields.Contains(Field.DatItem_Value))
Value = null;
#endregion
}