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 SoftwareList

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-31 23:26:07 -07:00
parent 3e9b4e510c
commit 6bc91732e6
14 changed files with 288 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,23 +418,6 @@ namespace SabreTools.Library.DatItems
public bool? Default { get; set; }
}
/// <summary>
/// Represents one ListXML softwarelist
/// </summary>
/// TODO: Promote this to the same level as Sample?
[JsonObject("softwarelist")]
public class ListXmlSoftwareList
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("status")]
public SoftwareListStatus Status { get; set; }
[JsonProperty("filter")]
public string Filter { get; set; }
}
/// <summary>
/// Represents one ListXML sound
/// </summary>

8
SabreTools.Library/DatItems/BiosSet.cs
View File

@@ -53,7 +53,7 @@ namespace SabreTools.Library.DatItems
#region Constructors
/// <summary>
/// Create a default, empty Sample object
/// Create a default, empty BiosSet object
/// </summary>
public BiosSet()
{
@@ -106,14 +106,14 @@ namespace SabreTools.Library.DatItems
public override bool Equals(DatItem other)
{
// If we don't have a biosset, return false
// If we don't have a BiosSet, return false
if (ItemType != other.ItemType)
return false;
// Otherwise, treat it as a biosset
// Otherwise, treat it as a BiosSet
BiosSet newOther = other as BiosSet;
// If the archive information matches
// If the BiosSet information matches
return (Name == newOther.Name && Description == newOther.Description && Default == newOther.Default);
}

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

@@ -470,6 +470,9 @@ namespace SabreTools.Library.DatItems
case ItemType.Sample:
return new Sample();
case ItemType.SoftwareList:
return new SoftwareList();
default:
return new Rom();
}

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

@@ -275,12 +275,6 @@ namespace SabreTools.Library.DatItems
Machine_Slot_SlotOption_DeviceName,
Machine_Slot_SlotOption_Default,
// SoftwareLists
Machine_SoftwareLists,
Machine_SoftwareList_Name,
Machine_SoftwareList_Status,
Machine_SoftwareList_Filter,
// RamOptions
Machine_RamOptions,
Machine_RamOption_Default,
@@ -425,6 +419,10 @@ namespace SabreTools.Library.DatItems
// Release
DatItem_Language,
// Software List
DatItem_SoftwareListStatus,
DatItem_Filter,
#endregion
#endregion // Item-Specific
@@ -467,6 +465,7 @@ namespace SabreTools.Library.DatItems
DeviceReference,
Release,
Sample,
SoftwareList,
Blank = 99, // This is not a real type, only used internally
}

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

@@ -226,12 +226,6 @@ namespace SabreTools.Library.DatItems
[JsonProperty("slots", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlSlot> Slots { get; set; } = null;
/// <summary>
/// List of software lists
/// </summary>
[JsonProperty("softwarelists", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlSoftwareList> SoftwareLists { get; set; } = null;
/// <summary>
/// List of ramoptions
/// </summary>
@@ -602,7 +596,6 @@ namespace SabreTools.Library.DatItems
Features = this.Features,
Devices = this.Devices,
Slots = this.Slots,
SoftwareLists = this.SoftwareLists,
RamOptions = this.RamOptions,
#endregion

194
SabreTools.Library/DatItems/SoftwareList.cs Normal file
View File

@@ -0,0 +1,194 @@
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 SoftwareList(s) is associated with a set
/// </summary>
[JsonObject("softwarelist")]
public class SoftwareList : DatItem
{
#region Fields
[JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)]
public SoftwareListStatus Status { get; set; }
[JsonProperty("filter", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string Filter { 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 SoftwareList-specific fields
if (mappings.Keys.Contains(Field.DatItem_SoftwareListStatus))
Status = mappings[Field.DatItem_Default].AsSoftwareListStatus();
if (mappings.Keys.Contains(Field.DatItem_Filter))
Filter = mappings[Field.DatItem_Filter];
}
#endregion
#region Constructors
/// <summary>
/// Create a default, empty SoftwareList object
/// </summary>
public SoftwareList()
{
Name = string.Empty;
ItemType = ItemType.SoftwareList;
}
#endregion
#region Cloning Methods
public override object Clone()
{
return new SoftwareList()
{
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,
Status = this.Status,
Filter = this.Filter,
};
}
#endregion
#region Comparision Methods
public override bool Equals(DatItem other)
{
// If we don't have a sample, return false
if (ItemType != other.ItemType)
return false;
// Otherwise, treat it as a SoftwareList
SoftwareList newOther = other as SoftwareList;
// If the SoftwareList information matches
return (Name == newOther.Name
&& Status == newOther.Status
&& Filter == newOther.Filter);
}
#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;
// Filter on status
if (filter.DatItem_SoftwareListStatus.MatchesPositive(SoftwareListStatus.NULL, Status) == false)
return false;
if (filter.DatItem_SoftwareListStatus.MatchesNegative(SoftwareListStatus.NULL, Status) == true)
return false;
// Filter on filter
if (filter.DatItem_Filter.MatchesPositiveSet(Filter) == false)
return false;
if (filter.DatItem_Filter.MatchesNegativeSet(Filter) == 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_SoftwareListStatus))
Status = SoftwareListStatus.NULL;
if (fields.Contains(Field.DatItem_Filter))
Filter = 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 SoftwareList to replace from, ignore specific fields
if (item.ItemType != ItemType.SoftwareList)
return;
// Cast for easier access
SoftwareList newItem = item as SoftwareList;
// Replace the fields
if (fields.Contains(Field.DatItem_SoftwareListStatus))
Status = newItem.Status;
if (fields.Contains(Field.DatItem_Filter))
Filter = newItem.Filter;
}
#endregion
}
}