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

Chip gets a promotion

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-25 22:48:46 -07:00
parent 0fa843a587
commit 143668c56a
13 changed files with 457 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SabreTools.Library/DatItems/Auxiliary.cs
View File

@@ -37,26 +37,6 @@ namespace SabreTools.Library.DatItems
public string Mask { get; set; }
}
/// <summary>
/// Represents one ListXML chip
/// </summary>
/// TODO: Promote this to the same level as Sample
[JsonObject("chip")]
public class ListXmlChip
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("tag")]
public string Tag { get; set; }
[JsonProperty("type")]
public string Type { get; set; } // TODO: (cpu|audio)
[JsonProperty("clock")]
public string Clock { get; set; }
}
/// <summary>
/// Represents one ListXML condition
/// </summary>

223
SabreTools.Library/DatItems/Chip.cs Normal file
View File

@@ -0,0 +1,223 @@
using System.Collections.Generic;
using System.Linq;
using SabreTools.Library.Filtering;
using SabreTools.Library.Tools;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
{
/// <summary>
/// Represents which Chip(s) is associated with a set
/// </summary>
[JsonObject("chip")]
public class Chip : DatItem
{
#region Fields
/// <summary>
/// Internal tag
/// </summary>
[JsonProperty("tag")]
public string Tag { get; set; }
/// <summary>
/// Type of the chip
/// </summary>
[JsonProperty("chiptype")]
public string ChipType { get; set; } // TODO: (cpu|audio)
/// <summary>
/// Clock speed
/// </summary>
[JsonProperty("clock")]
public string Clock { get; set; }
#endregion
#region Accessors
/// <summary>
/// Set fields with given values
/// </summary>
/// <param name="mappings">Mappings dictionary</param>
public override void SetFields(Dictionary<Field, string> mappings)
{
// Set base fields
base.SetFields(mappings);
// Handle Chip-specific fields
if (mappings.Keys.Contains(Field.DatItem_Tag))
Tag = mappings[Field.DatItem_Tag];
if (mappings.Keys.Contains(Field.DatItem_ChipType))
ChipType = mappings[Field.DatItem_ChipType];
if (mappings.Keys.Contains(Field.DatItem_Clock))
Clock = mappings[Field.DatItem_Clock];
}
#endregion
#region Constructors
/// <summary>
/// Create a default, empty Chip object
/// </summary>
public Chip()
{
Name = string.Empty;
ItemType = ItemType.Chip;
}
#endregion
#region Cloning Methods
public override object Clone()
{
return new Chip()
{
Name = this.Name,
ItemType = this.ItemType,
DupeType = this.DupeType,
AltName = this.AltName,
AltTitle = this.AltTitle,
Original = this.Original,
OpenMSXSubType = this.OpenMSXSubType,
OpenMSXType = this.OpenMSXType,
Remark = this.Remark,
Boot = this.Boot,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,
AreaWidth = this.AreaWidth,
AreaEndianness = this.AreaEndianness,
Value = this.Value,
LoadFlag = this.LoadFlag,
Machine = this.Machine.Clone() as Machine,
Source = this.Source.Clone() as Source,
Remove = this.Remove,
Tag = this.Tag,
ChipType = this.ChipType,
Clock = this.Clock,
};
}
#endregion
#region Comparision Methods
public override bool Equals(DatItem other)
{
// If we don't have a chip, return false
if (ItemType != other.ItemType)
return false;
// Otherwise, treat it as a chip
Chip newOther = other as Chip;
// If the chip information matches
return (Name == newOther.Name
&& Tag == newOther.Tag
&& ChipType == newOther.ChipType
&& Clock == newOther.Clock);
}
#endregion
#region Filtering
/// <summary>
/// Check to see if a DatItem passes the filter
/// </summary>
/// <param name="filter">Filter to check against</param>
/// <returns>True if the item passed the filter, false otherwise</returns>
public override bool PassesFilter(Filter filter)
{
// Check common fields first
if (!base.PassesFilter(filter))
return false;
// DatItem_Tag
if (filter.DatItem_Tag.MatchesPositiveSet(Tag) == false)
return false;
if (filter.DatItem_Tag.MatchesNegativeSet(Tag) == true)
return false;
// DatItem_ChipType
if (filter.DatItem_ChipType.MatchesPositiveSet(ChipType) == false)
return false;
if (filter.DatItem_ChipType.MatchesNegativeSet(ChipType) == true)
return false;
// DatItem_Clock
if (filter.DatItem_Clock.MatchesPositiveSet(Clock) == false)
return false;
if (filter.DatItem_Clock.MatchesNegativeSet(Clock) == true)
return false;
return true;
}
/// <summary>
/// Remove fields from the DatItem
/// </summary>
/// <param name="fields">List of Fields to remove</param>
public override void RemoveFields(List<Field> fields)
{
// Remove common fields first
base.RemoveFields(fields);
// Remove the fields
if (fields.Contains(Field.DatItem_Tag))
Tag = null;
if (fields.Contains(Field.DatItem_ChipType))
ChipType = null;
if (fields.Contains(Field.DatItem_Clock))
Clock = null;
}
#endregion
#region Sorting and Merging
/// <summary>
/// Replace fields from another item
/// </summary>
/// <param name="item">DatItem to pull new information from</param>
/// <param name="fields">List of Fields representing what should be updated</param>
public override void ReplaceFields(DatItem item, List<Field> fields)
{
// Replace common fields first
base.ReplaceFields(item, fields);
// If we don't have a Chip to replace from, ignore specific fields
if (item.ItemType != ItemType.Chip)
return;
// Cast for easier access
Chip newItem = item as Chip;
// Replace the fields
if (fields.Contains(Field.DatItem_Tag))
Tag = newItem.Tag;
if (fields.Contains(Field.DatItem_ChipType))
ChipType = newItem.ChipType;
if (fields.Contains(Field.DatItem_Clock))
Clock = newItem.Clock;
}
#endregion
}
}

47
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -185,27 +185,44 @@ namespace SabreTools.Library.DatItems
/// <summary>
/// Fields unique to a DatItem
/// </summary>
/// TODO: Ensure list
public static readonly List<Field> DatItemFields = new List<Field>()
{
// Common
Field.DatItem_Name,
#region Common
Field.DatItem_Name,
Field.DatItem_Type,
#endregion
#region AttractMode
// AttractMode
Field.DatItem_AltName,
Field.DatItem_AltTitle,
// OpenMSX
#endregion
#region OpenMSX
Field.DatItem_Original,
Field.DatItem_OpenMSXSubType,
Field.DatItem_OpenMSXType,
Field.DatItem_Remark,
Field.DatItem_Boot,
//SoftwareList
#endregion
#region SoftwareList
// Part
Field.DatItem_Part,
Field.DatItem_Part_Name,
Field.DatItem_Part_Interface,
// Feature
Field.DatItem_Features,
Field.DatItem_Feature_Name,
Field.DatItem_Feature_Value,
Field.DatItem_AreaName,
Field.DatItem_AreaSize,
Field.DatItem_AreaWidth,
@@ -213,9 +230,18 @@ namespace SabreTools.Library.DatItems
Field.DatItem_Value,
Field.DatItem_LoadFlag,
#endregion
#region Item-Specific
// BiosSet
Field.DatItem_Description,
Field.DatItem_Default,
Field.DatItem_Description,
// Chip
Field.DatItem_Tag,
Field.DatItem_ChipType,
Field.DatItem_Clock,
// Disk
Field.DatItem_MD5,
@@ -230,8 +256,8 @@ namespace SabreTools.Library.DatItems
Field.DatItem_Region,
Field.DatItem_Index,
Field.DatItem_Writable,
Field.DatItem_Optional,
Field.DatItem_Status,
Field.DatItem_Optional,
// Release
Field.DatItem_Language,
@@ -243,6 +269,8 @@ namespace SabreTools.Library.DatItems
Field.DatItem_CRC,
Field.DatItem_Offset,
Field.DatItem_Inverted,
#endregion
};
/// <summary>
@@ -414,6 +442,9 @@ namespace SabreTools.Library.DatItems
case ItemType.Blank:
return new Blank();
case ItemType.Chip:
return new Chip();
case ItemType.Disk:
return new Disk();

13
SabreTools.Library/DatItems/Enums.cs
View File

@@ -133,13 +133,6 @@ namespace SabreTools.Library.DatItems
Machine_DeviceReferences, // TODO: Double-check DeviceReferences usage
Machine_DeviceReference_Name,
// Chips
Machine_Chips, // TODO: Implement Chips usage
Machine_Chip_Name,
Machine_Chip_Tag,
Machine_Chip_Type,
Machine_Chip_Clock,
// Displays
Machine_Displays, // TODO: Implement Displays usage
Machine_Display_Tag,
@@ -398,6 +391,11 @@ namespace SabreTools.Library.DatItems
DatItem_Default,
DatItem_Description,
// Chip
DatItem_Tag,
DatItem_ChipType,
DatItem_Clock,
// Disk
DatItem_MD5,
#if NET_FRAMEWORK
@@ -459,6 +457,7 @@ namespace SabreTools.Library.DatItems
Release = 3,
BiosSet = 4,
Archive = 5,
Chip = 6,
Blank = 99, // This is not a real type, only used internally
}

95
SabreTools.Library/DatItems/Machine.cs
View File

@@ -158,12 +158,6 @@ namespace SabreTools.Library.DatItems
[JsonProperty("devicereferences", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlDeviceReference> DeviceReferences { get; set; } = null;
/// <summary>
/// List of associated chips
/// </summary>
[JsonProperty("chips", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlChip> Chips { get; set; } = null;
/// <summary>
/// List of associated displays
/// </summary>
@@ -603,7 +597,6 @@ namespace SabreTools.Library.DatItems
SourceFile = this.SourceFile,
Runnable = this.Runnable,
DeviceReferences = this.DeviceReferences,
Chips = this.Chips,
Displays = this.Displays,
Sounds = this.Sounds,
Conditions = this.Conditions,
@@ -842,94 +835,6 @@ namespace SabreTools.Library.DatItems
#endregion
#region Chips
// Machine_DeviceReferences
if (filter.Machine_Chips.MatchesNeutral(null, Chips?.Any() ?? null) == false)
return false;
// Machine_Chip_Name
if (Chips?.Any() == true)
{
bool anyPositive = false;
bool anyNegative = false;
foreach (var chip in Chips)
{
if (filter.Machine_Chip_Name.MatchesPositiveSet(chip?.Name) != false)
anyPositive = true;
if (filter.Machine_Chip_Name.MatchesNegativeSet(chip?.Name) == true)
anyNegative = true;
}
if (!anyPositive)
return false;
if (anyNegative)
return false;
}
// Machine_Chip_Tag
if (Chips?.Any() == true)
{
bool anyPositive = false;
bool anyNegative = false;
foreach (var chip in Chips)
{
if (filter.Machine_Chip_Tag.MatchesPositiveSet(chip?.Tag) != false)
anyPositive = true;
if (filter.Machine_Chip_Tag.MatchesNegativeSet(chip?.Tag) == true)
anyNegative = true;
}
if (!anyPositive)
return false;
if (anyNegative)
return false;
}
// Machine_Chip_Type
if (Chips?.Any() == true)
{
bool anyPositive = false;
bool anyNegative = false;
foreach (var chip in Chips)
{
if (filter.Machine_Chip_Type.MatchesPositiveSet(chip?.Type) != false)
anyPositive = true;
if (filter.Machine_Chip_Type.MatchesNegativeSet(chip?.Type) == true)
anyNegative = true;
}
if (!anyPositive)
return false;
if (anyNegative)
return false;
}
// Machine_Chip_Clock
if (Chips?.Any() == true)
{
bool anyPositive = false;
bool anyNegative = false;
foreach (var chip in Chips)
{
if (filter.Machine_Chip_Clock.MatchesPositiveSet(chip?.Clock) != false)
anyPositive = true;
if (filter.Machine_Chip_Clock.MatchesNegativeSet(chip?.Clock) == true)
anyNegative = true;
}
if (!anyPositive)
return false;
if (anyNegative)
return false;
}
#endregion
#region Displays
// Machine_Displays