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

Promote DataArea, DiskArea, and Part

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-04 14:10:35 -07:00
parent a416064bc0
commit 40ca4e39a5
14 changed files with 1011 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
SabreTools.Library/DatItems/Disk.cs
View File

@@ -158,31 +158,17 @@ namespace SabreTools.Library.DatItems
if (mappings.Keys.Contains(Field.DatItem_Optional))
Optional = mappings[Field.DatItem_Optional].AsYesNo();
if (mappings.Keys.Contains(Field.DatItem_AreaName))
{
if (DiskArea == null)
DiskArea = new DiskArea();
// Handle DiskArea-specific fields
if (DiskArea == null)
DiskArea = new DiskArea();
DiskArea.Name = mappings[Field.DatItem_AreaName];
}
DiskArea.SetFields(mappings);
if (mappings.Keys.Contains(Field.DatItem_Part_Name))
{
if (Part == null)
Part = new Part();
// Handle Part-specific fields
if (Part == null)
Part = new Part();
Part.Name = mappings[Field.DatItem_Part_Name];
}
if (mappings.Keys.Contains(Field.DatItem_Part_Interface))
{
if (Part == null)
Part = new Part();
Part.Interface = mappings[Field.DatItem_Part_Interface];
}
// TODO: Handle DatItem_Part_Feature*
Part.SetFields(mappings);
}
#endregion
@@ -474,25 +460,19 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
// Filter on area name
if (filter.DatItem_AreaName.MatchesPositiveSet(DiskArea?.Name) == false)
return false;
if (filter.DatItem_AreaName.MatchesNegativeSet(DiskArea?.Name) == true)
return false;
// Filter on DiskArea
if (DiskArea != null)
{
if (!DiskArea.PassesFilter(filter))
return false;
}
// Filter on part name
if (filter.DatItem_Part_Name.MatchesPositiveSet(Part?.Name) == false)
return false;
if (filter.DatItem_Part_Name.MatchesNegativeSet(Part?.Name) == true)
return false;
// Filter on part interface
if (filter.DatItem_Part_Interface.MatchesPositiveSet(Part?.Interface) == false)
return false;
if (filter.DatItem_Part_Interface.MatchesNegativeSet(Part?.Interface) == true)
return false;
// TODO: Handle DatItem_Part_Feature*
// Filter on Part
if (Part != null)
{
if (!Part.PassesFilter(filter))
return false;
}
#endregion
@@ -543,19 +523,11 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
if (fields.Contains(Field.DatItem_AreaName))
{
if (DiskArea != null)
DiskArea.Name = null;
}
if (DiskArea != null)
DiskArea.RemoveFields(fields);
if (fields.Contains(Field.DatItem_Part_Name) && Part != null)
Part.Name = null;
if (fields.Contains(Field.DatItem_Part_Interface) && Part != null)
Part.Interface = null;
// TODO: Handle DatItem_Part_Feature*
if (Part != null)
Part.RemoveFields(fields);
#endregion
}
@@ -667,31 +639,11 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
if (fields.Contains(Field.DatItem_AreaName))
{
if (DiskArea == null)
DiskArea = new DiskArea();
if (DiskArea != null && newItem.DiskArea != null)
DiskArea.ReplaceFields(newItem.DiskArea, fields);
DiskArea.Name = newItem.DiskArea?.Name;
}
if (fields.Contains(Field.DatItem_Part_Name))
{
if (Part == null)
Part = new Part();
Part.Name = newItem.Part?.Name;
}
if (fields.Contains(Field.DatItem_Part_Interface))
{
if (Part == null)
Part = new Part();
Part.Interface = newItem.Part?.Interface;
}
// TODO: Handle DatItem_Part_Feature*
if (Part != null && newItem.Part != null)
Part.ReplaceFields(newItem.Part, fields);
#endregion
}