So many fields and TODOs...

This commit is contained in:
Matt Nadareski
2020-08-24 22:25:47 -07:00
parent 3c7d80fa05
commit dab673246e
24 changed files with 1026 additions and 705 deletions

View File

@@ -40,8 +40,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -244,19 +244,19 @@ namespace SabreTools.Library.DatItems
public string HTotal { get; set; } // TODO: Int32? Float?
[JsonProperty("hbend")]
public string HBend { get; set; } // TODO: Int32? Float?
public string HBEnd { get; set; } // TODO: Int32? Float?
[JsonProperty("hstart")]
public string HStart { get; set; } // TODO: Int32? Float?
[JsonProperty("hbstart")]
public string HBStart { get; set; } // TODO: Int32? Float?
[JsonProperty("vtotal")]
public string VTotal { get; set; } // TODO: Int32? Float?
[JsonProperty("vbend")]
public string VBend { get; set; } // TODO: Int32? Float?
public string VBEnd { get; set; } // TODO: Int32? Float?
[JsonProperty("vstart")]
public string VStart { get; set; } // TODO: Int32? Float?
[JsonProperty("vbstart")]
public string VBStart { get; set; } // TODO: Int32? Float?
}
/// <summary>
@@ -360,19 +360,6 @@ namespace SabreTools.Library.DatItems
public string Overall { get; set; } // TODO: (unemulated|imperfect)
}
/// <summary>
/// Represents one ListXML info
/// </summary>
[JsonObject("info")]
public class ListXmlInfo
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("value")]
public string Value { get; set; }
}
/// <summary>
/// Represents one ListXML input
/// </summary>
@@ -507,6 +494,19 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
/// <summary>
/// Represents one SoftwareList info
/// </summary>
[JsonObject("info")]
public class SoftwareListInfo
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("value")]
public string Value { get; set; }
}
/// <summary>
/// Represents one SoftwareList shared feature object
/// </summary>
@@ -541,6 +541,19 @@ namespace SabreTools.Library.DatItems
public string Value { get; set; }
}
/// <summary>
/// Represents one SoftwareList part object
/// </summary>
[JsonObject("part")]
public class SoftwareListPart
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("interface")]
public string Interface { get; set; }
}
#endregion
#endregion //DatItem

View File

@@ -82,8 +82,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -40,8 +40,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -114,14 +114,8 @@ namespace SabreTools.Library.DatItems
/// <summary>
/// Original hardware part associated with the item
/// </summary>
[JsonProperty("partname", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string PartName { get; set; }
/// <summary>
/// Original hardware interface associated with the item
/// </summary>
[JsonProperty("partinterface", DefaultValueHandling = DefaultValueHandling.Ignore)]
public string PartInterface { get; set; }
[JsonProperty("part", DefaultValueHandling = DefaultValueHandling.Ignore)]
public SoftwareListPart Part { get; set; }
/// <summary>
/// Features provided to/by the item
@@ -194,18 +188,18 @@ namespace SabreTools.Library.DatItems
public static readonly List<Field> DatItemFields = new List<Field>()
{
// Common
Field.Name,
Field.DatItem_Name,
// AttractMode
Field.AltName,
Field.AltTitle,
Field.DatItem_AltName,
Field.DatItem_AltTitle,
// OpenMSX
Field.Original,
Field.OpenMSXSubType,
Field.OpenMSXType,
Field.Remark,
Field.Boot,
Field.DatItem_Original,
Field.DatItem_OpenMSXSubType,
Field.DatItem_OpenMSXType,
Field.DatItem_Remark,
Field.DatItem_Boot,
//SoftwareList
Field.PartName,
@@ -256,57 +250,57 @@ namespace SabreTools.Library.DatItems
public static readonly List<Field> MachineFields = new List<Field>()
{
// Common
Field.MachineName,
Field.Comment,
Field.Description,
Field.Year,
Field.Manufacturer,
Field.Publisher,
Field.RomOf,
Field.CloneOf,
Field.SampleOf,
Field.MachineType,
Field.Machine_Name,
Field.Machine_Comment,
Field.Machine_Description,
Field.Machine_Year,
Field.Machine_Manufacturer,
Field.Machine_Publisher,
Field.Machine_RomOf,
Field.Machine_CloneOf,
Field.Machine_SampleOf,
Field.Machine_Type,
// AttractMode
Field.Players,
Field.Rotation,
Field.Control,
Field.SupportStatus,
Field.DisplayCount,
Field.DisplayType,
Field.Buttons,
Field.Machine_Players,
Field.Machine_Rotation,
Field.Machine_Control,
Field.Machine_SupportStatus,
Field.Machine_DisplayCount,
Field.Machine_DisplayType,
Field.Machine_Buttons,
// ListXML
Field.SourceFile,
Field.Runnable,
Field.DeviceReferences,
Field.Slots,
Field.Infos,
Field.Machine_SourceFile,
Field.Machine_Runnable,
Field.Machine_DeviceReference_Name,
Field.Machine_Slots,
Field.Machine_Infos,
// Logiqx
Field.Board,
Field.RebuildTo,
Field.Machine_Board,
Field.Machine_RebuildTo,
// Logiqx EmuArc
Field.TitleID,
Field.Developer,
Field.Genre,
Field.Subgenre,
Field.Ratings,
Field.Score,
Field.Enabled,
Field.HasCrc,
Field.RelatedTo,
Field.Machine_TitleID,
Field.Machine_Developer,
Field.Machine_Genre,
Field.Machine_Subgenre,
Field.Machine_Ratings,
Field.Machine_Score,
Field.Machine_Enabled,
Field.Machine_HasCrc,
Field.Machine_RelatedTo,
// OpenMSX
Field.GenMSXID,
Field.System,
Field.Country,
Field.Machine_GenMSXID,
Field.Machine_System,
Field.Machine_Country,
// SoftwareList
Field.Supported,
Field.SharedFeatures,
Field.DipSwitches,
Field.Machine_Supported,
Field.Machine_SharedFeatures,
Field.Machine_DipSwitches,
};
#endregion
@@ -328,47 +322,57 @@ namespace SabreTools.Library.DatItems
#region Common
if (mappings.Keys.Contains(Field.Name))
Name = mappings[Field.Name];
if (mappings.Keys.Contains(Field.DatItem_Name))
Name = mappings[Field.DatItem_Name];
#endregion
#region AttractMode
if (mappings.Keys.Contains(Field.AltName))
AltName = mappings[Field.AltName];
if (mappings.Keys.Contains(Field.DatItem_AltName))
AltName = mappings[Field.DatItem_AltName];
if (mappings.Keys.Contains(Field.AltTitle))
AltTitle = mappings[Field.AltTitle];
if (mappings.Keys.Contains(Field.DatItem_AltTitle))
AltTitle = mappings[Field.DatItem_AltTitle];
#endregion
#region OpenMSX
if (mappings.Keys.Contains(Field.Original))
Original = new OpenMSXOriginal() { Content = mappings[Field.Original] };
if (mappings.Keys.Contains(Field.DatItem_Original))
Original = new OpenMSXOriginal() { Content = mappings[Field.DatItem_Original] };
if (mappings.Keys.Contains(Field.OpenMSXSubType))
OpenMSXSubType = mappings[Field.OpenMSXSubType].AsOpenMSXSubType();
if (mappings.Keys.Contains(Field.DatItem_OpenMSXSubType))
OpenMSXSubType = mappings[Field.DatItem_OpenMSXSubType].AsOpenMSXSubType();
if (mappings.Keys.Contains(Field.OpenMSXType))
OpenMSXType = mappings[Field.OpenMSXType];
if (mappings.Keys.Contains(Field.DatItem_OpenMSXType))
OpenMSXType = mappings[Field.DatItem_OpenMSXType];
if (mappings.Keys.Contains(Field.Remark))
Remark = mappings[Field.Remark];
if (mappings.Keys.Contains(Field.DatItem_Remark))
Remark = mappings[Field.DatItem_Remark];
if (mappings.Keys.Contains(Field.Boot))
Boot = mappings[Field.Boot];
if (mappings.Keys.Contains(Field.DatItem_Boot))
Boot = mappings[Field.DatItem_Boot];
#endregion
#region SoftwareList
if (mappings.Keys.Contains(Field.PartName))
PartName = mappings[Field.PartName];
{
if (Part == null)
Part = new SoftwareListPart();
Part.Name = mappings[Field.PartName];
}
if (mappings.Keys.Contains(Field.PartInterface))
PartInterface = mappings[Field.PartInterface];
{
if (Part == null)
Part = new SoftwareListPart();
Part.Interface = mappings[Field.PartInterface];
}
if (mappings.Keys.Contains(Field.Features))
{
@@ -668,15 +672,15 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
// Filter on part name
if (filter.PartName.MatchesPositiveSet(PartName) == false)
if (filter.PartName.MatchesPositiveSet(Part?.Name) == false)
return false;
if (filter.PartName.MatchesNegativeSet(PartName) == true)
if (filter.PartName.MatchesNegativeSet(Part?.Name) == true)
return false;
// Filter on part interface
if (filter.PartInterface.MatchesPositiveSet(PartInterface) == false)
if (filter.PartInterface.MatchesPositiveSet(Part?.Interface) == false)
return false;
if (filter.PartInterface.MatchesNegativeSet(PartInterface) == true)
if (filter.PartInterface.MatchesNegativeSet(Part?.Interface) == true)
return false;
// Filter on area name
@@ -733,47 +737,47 @@ namespace SabreTools.Library.DatItems
#region Common
if (fields.Contains(Field.Name))
if (fields.Contains(Field.DatItem_Name))
Name = null;
#endregion
#region AttractMode
if (fields.Contains(Field.AltName))
if (fields.Contains(Field.DatItem_AltName))
AltName = null;
if (fields.Contains(Field.AltTitle))
if (fields.Contains(Field.DatItem_AltTitle))
AltTitle = null;
#endregion
#region OpenMSX
if (fields.Contains(Field.Original))
if (fields.Contains(Field.DatItem_Original))
Original = null;
if (fields.Contains(Field.OpenMSXSubType))
if (fields.Contains(Field.DatItem_OpenMSXSubType))
OpenMSXSubType = OpenMSXSubType.NULL;
if (fields.Contains(Field.OpenMSXType))
if (fields.Contains(Field.DatItem_OpenMSXType))
OpenMSXType = null;
if (fields.Contains(Field.Remark))
if (fields.Contains(Field.DatItem_Remark))
Remark = null;
if (fields.Contains(Field.Boot))
if (fields.Contains(Field.DatItem_Boot))
Boot = null;
#endregion
#region SoftwareList
if (fields.Contains(Field.PartName))
PartName = null;
if (fields.Contains(Field.PartName) && Part != null)
Part.Name = null;
if (fields.Contains(Field.PartInterface))
PartInterface = null;
if (fields.Contains(Field.PartInterface) && Part != null)
Part.Interface = null;
if (fields.Contains(Field.Features))
Features = null;
@@ -823,7 +827,7 @@ namespace SabreTools.Library.DatItems
key = Constants.CRCZero;
break;
case Field.MachineName:
case Field.Machine_Name:
key = (norename ? string.Empty
: Source.Index.ToString().PadLeft(10, '0')
+ "-")
@@ -882,36 +886,36 @@ namespace SabreTools.Library.DatItems
{
#region Common
if (fields.Contains(Field.Name))
if (fields.Contains(Field.DatItem_Name))
Name = item.Name;
#endregion
#region AttractMode
if (fields.Contains(Field.AltName))
if (fields.Contains(Field.DatItem_AltName))
AltName = item.AltName;
if (fields.Contains(Field.AltTitle))
if (fields.Contains(Field.DatItem_AltTitle))
AltTitle = item.AltTitle;
#endregion
#region OpenMSX
if (fields.Contains(Field.Original))
if (fields.Contains(Field.DatItem_Original))
Original = item.Original;
if (fields.Contains(Field.OpenMSXSubType))
if (fields.Contains(Field.DatItem_OpenMSXSubType))
OpenMSXSubType = item.OpenMSXSubType;
if (fields.Contains(Field.OpenMSXType))
if (fields.Contains(Field.DatItem_OpenMSXType))
OpenMSXType = item.OpenMSXType;
if (fields.Contains(Field.Remark))
if (fields.Contains(Field.DatItem_Remark))
Remark = item.Remark;
if (fields.Contains(Field.Boot))
if (fields.Contains(Field.DatItem_Boot))
Boot = item.Boot;
#endregion
@@ -919,10 +923,20 @@ namespace SabreTools.Library.DatItems
#region SoftwareList
if (fields.Contains(Field.PartName))
PartName = item.PartName;
{
if (Part == null)
Part = new SoftwareListPart();
Part.Name = item.Part?.Name;
}
if (fields.Contains(Field.PartInterface))
PartInterface = item.PartInterface;
{
if (Part == null)
Part = new SoftwareListPart();
Part.Interface = item.Part?.Interface;
}
if (fields.Contains(Field.Features))
Features = item.Features;

View File

@@ -239,8 +239,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,
@@ -291,8 +290,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -1,7 +1,5 @@
using System;
using Newtonsoft.Json;
namespace SabreTools.Library.DatItems
{
/// <summary>
@@ -22,90 +20,326 @@ namespace SabreTools.Library.DatItems
/// <summary>
/// List of valid field types within a DatItem/Machine
/// </summary>
/// TODO: Should this be split into MachineField and DatItemField?
/// TODO: Should there also be a DatFileField?
/// TODO: Move this to a more common location
/// TODO: Should this be split into separate enums?
public enum Field : int
{
NULL = 0,
#region Machine
#region DatHeader
#region Common
MachineName,
Comment,
Description,
Year,
Manufacturer,
Publisher,
Category,
RomOf,
CloneOf,
SampleOf,
MachineType,
#endregion
#region AttractMode
Players,
Rotation,
Control,
SupportStatus,
DisplayCount,
DisplayType,
Buttons,
DatHeader_FileName,
DatHeader_Name,
DatHeader_Description,
DatHeader_RootDir,
DatHeader_Category,
DatHeader_Version,
DatHeader_Date,
DatHeader_Author,
DatHeader_Email,
DatHeader_Homepage,
DatHeader_Url,
DatHeader_Comment,
DatHeader_HeaderSkipper,
DatHeader_Type,
DatHeader_ForceMerging,
DatHeader_ForceNodump,
DatHeader_ForcePacking,
#endregion
#region ListXML
SourceFile,
Runnable,
DeviceReferences, // TODO: Double-check DeviceReferences usage
Chips, // TODO: Implement Chips usage
Displays, // TODO: Implement Displays usage
Sounds, // TODO: Implement Sounds usage
Conditions, // TODO: Implement Conditions usage
Slots, // TODO: Fix Slots usage
Infos,
DatHeader_Debug,
DatHeader_MameConfig,
#endregion
#region Logiqx
Board,
RebuildTo,
DatHeader_Build,
DatHeader_RomMode,
DatHeader_BiosMode,
DatHeader_SampleMode,
DatHeader_LockRomMode,
DatHeader_LockBiosMode,
DatHeader_LockSampleMode,
#endregion
#region OfflineList
DatHeader_System,
DatHeader_ScreenshotsWidth,
DatHeader_ScreenshotsHeight,
DatHeader_CanOpen,
DatHeader_RomTitle,
// Infos
DatHeader_Infos,
DatHeader_Info_Name,
DatHeader_Info_Visible,
DatHeader_Info_IsNamingOption,
DatHeader_Info_Default,
#endregion
#region RomCenter
DatHeader_RomCenterVersion,
#endregion
#endregion // DatHeader
#region Machine
#region Common
Machine_Name,
Machine_Comment,
Machine_Description,
Machine_Year,
Machine_Manufacturer,
Machine_Publisher,
Machine_Category,
Machine_RomOf,
Machine_CloneOf,
Machine_SampleOf,
Machine_Type,
#endregion
#region AttractMode
Machine_Players,
Machine_Rotation,
Machine_Control,
Machine_SupportStatus,
Machine_DisplayCount,
Machine_DisplayType,
Machine_Buttons,
#endregion
#region ListXML
Machine_SourceFile,
Machine_Runnable,
// DeviceReferences
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,
Machine_Display_Type,
Machine_Display_Rotate,
Machine_Display_FlipX,
Machine_Display_Width,
Machine_Display_Height,
Machine_Display_Refresh,
Machine_Display_PixClock,
Machine_Display_HTotal,
Machine_Display_HBEnd,
Machine_Display_HBStart,
Machine_Display_VTotal,
Machine_Display_VBEnd,
Machine_Display_VBStart,
// Sounds
Machine_Sounds, // TODO: Implement Sounds usage
Machine_Sound_Channels,
// Conditions
Machine_Conditions, // TODO: Implement Conditions usage
Machine_Condition_Tag,
Machine_Condition_Mask,
Machine_Condition_Relation,
Machine_Condition_Value,
// Inputs
Machine_Inputs, // TODO: Implement Inputs usage
Machine_InputService,
Machine_InputTilt,
Machine_InputPlayers,
Machine_InputCoins,
// Inputs.Controls
Machine_InputControls,
Machine_InputControl_Type,
Machine_InputControl_Player,
Machine_InputControl_Buttons,
Machine_InputControl_RegButtons,
Machine_InputControl_Minimum,
Machine_InputControl_Maximum,
Machine_InputControl_Sensitivity,
Machine_InputControl_KeyDelta,
Machine_InputControl_Reverse,
Machine_InputControl_Ways,
Machine_InputControl_Ways2,
Machine_InputControl_Ways3,
// DipSwitches
Machine_DipSwitches, // TODO: Implement DipSwitches usage
Machine_DipSwitch_Name,
Machine_DipSwitch_Tag,
Machine_DipSwitch_Mask,
// DipSwitches.Locations
Machine_DipSwitch_Locations,
Machine_DipSwitch_Location_Name,
Machine_DipSwitch_Location_Number,
Machine_DipSwitch_Location_Inverted,
// DipSwitches.Values
Machine_DipSwitch_Values,
Machine_DipSwitch_Value_Name,
Machine_DipSwitch_Value_Value,
Machine_DipSwitch_Value_Default,
// Configurations
Machine_Configurations, // TODO: Implement Configurations usage
Machine_Configuration_Name,
Machine_Configuration_Tag,
Machine_Configuration_Mask,
// Configurations.Locations
Machine_Configuration_Locations,
Machine_Configuration_Location_Name,
Machine_Configuration_Location_Number,
Machine_Configuration_Location_Inverted,
// Configurations.Settings
Machine_Configuration_Settings,
Machine_Configuration_Setting_Name,
Machine_Configuration_Setting_Value,
Machine_Configuration_Setting_Default,
// Ports
Machine_Ports, // TODO: Implement Ports usage
Machine_Ports_Tag,
// Ports.Analogs
Machine_Ports_Analogs,
Machine_Ports_Analog_Mask,
// Adjusters
Machine_Adjusters, // TODO: Implement Adjusters usage
Machine_Adjuster_Name,
Machine_Adjuster_Default,
// Adjusters.Conditions
Machine_Adjuster_Conditions,
Machine_Adjuster_Condition_Tag,
Machine_Adjuster_Condition_Mask,
Machine_Adjuster_Condition_Relation,
Machine_Adjuster_Condition_Value,
// Drivers
Machine_Drivers, // TODO: Implement Drivers usage
Machine_Driver_Status,
Machine_Driver_Emulation,
Machine_Driver_Cocktail,
Machine_Driver_SaveState,
// Features
Machine_Features, // TODO: Implement Features usage
Machine_Feature_Type,
Machine_Feature_Status,
Machine_Feature_Overall,
// Devices
Machine_Devices, // TODO: Implement Devices usage
Machine_Device_Type,
Machine_Device_Tag,
Machine_Device_FixedImage,
Machine_Device_Mandatory,
Machine_Device_Interface,
// Devices.Instances
Machine_Device_Instances,
Machine_Device_Instance_Name,
Machine_Device_Instance_BriefName,
// Devices.Extensions
Machine_Device_Extensions,
Machine_Device_Extension_Name,
// Slots
Machine_Slots, // TODO: Fix Slots usage
Machine_Slot_Name,
// Slots.SlotOptions
Machine_Slot_SlotOptions,
Machine_Slot_SlotOption_Name,
Machine_Slot_SlotOption_DeviceName,
Machine_Slot_SlotOption_Default,
// SoftwareLists
Machine_SoftwareLists, // TODO: Implement SoftwareLists usage
Machine_SoftwareList_Name,
Machine_SoftwareList_Status,
Machine_SoftwareList_Filter,
// RamOptions
Machine_RamOptions, // TODO: Implement RamOptions usage
Machine_RamOption_Default,
#endregion
#region Logiqx
Machine_Board,
Machine_RebuildTo,
#endregion
#region Logiqx EmuArc
TitleID,
Developer,
Genre,
Subgenre,
Ratings,
Score,
Enabled,
HasCrc,
RelatedTo,
Machine_TitleID,
Machine_Developer,
Machine_Genre,
Machine_Subgenre,
Machine_Ratings,
Machine_Score,
Machine_Enabled,
Machine_HasCrc,
Machine_RelatedTo,
#endregion
#region OpenMSX
GenMSXID,
System,
Country,
Machine_GenMSXID,
Machine_System,
Machine_Country,
#endregion
#region SoftwareList
Supported,
SharedFeatures,
DipSwitches,
Machine_Supported,
// Infos
Machine_Infos, // TODO: Fix usage of Infos
Machine_Info_Name,
Machine_Info_Value,
// SharedFeatures
Machine_SharedFeatures, // TODO: Fix usage of SharedFeatures
Machine_SharedFeature_Name,
Machine_SharedFeature_Value,
#endregion
@@ -115,28 +349,29 @@ namespace SabreTools.Library.DatItems
#region Common
Name,
ItemType,
DatItem_Name,
DatItem_Type,
#endregion
#region AttractMode
AltName,
AltTitle,
DatItem_AltName,
DatItem_AltTitle,
#endregion
#region OpenMSX
Original,
OpenMSXSubType,
OpenMSXType,
Remark,
Boot,
DatItem_Original,
DatItem_OpenMSXSubType,
DatItem_OpenMSXType,
DatItem_Remark,
DatItem_Boot,
#endregion
// TODO: Left off here on renaming
#region SoftwareList
PartName,

View File

@@ -136,6 +136,7 @@ namespace SabreTools.Library.DatItems
#endregion
// TODO: Ensure read/write for all fields here
#region ListXML Fields
/// <summary>
@@ -202,6 +203,36 @@ namespace SabreTools.Library.DatItems
[JsonProperty("configurations", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlConfiguration> Configurations { get; set; } = null;
/// <summary>
/// List of associated ports
/// </summary>
[JsonProperty("ports", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlPort> Ports { get; set; } = null;
/// <summary>
/// List of associated adjusters
/// </summary>
[JsonProperty("adjusters", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlAdjuster> Adjusters { get; set; } = null;
/// <summary>
/// List of associated drivers
/// </summary>
[JsonProperty("drivers", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlDriver> Drivers { get; set; } = null;
/// <summary>
/// List of associated features
/// </summary>
[JsonProperty("features", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlFeature> Features { get; set; } = null;
/// <summary>
/// List of associated devices
/// </summary>
[JsonProperty("devices", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlDevice> Devices { get; set; } = null;
/// <summary>
/// List of slot options
/// </summary>
@@ -209,11 +240,16 @@ namespace SabreTools.Library.DatItems
public List<ListXmlSlot> Slots { get; set; } = null;
/// <summary>
/// List of info items
/// List of software lists
/// </summary>
/// <remarks>Also in SoftwareList</remarks>
[JsonProperty("infos", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlInfo> Infos { get; set; } = null;
[JsonProperty("softwarelists", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlSoftwareList> SoftwareLists { get; set; } = null;
/// <summary>
/// List of ramoptions
/// </summary>
[JsonProperty("ramoptions", DefaultValueHandling = DefaultValueHandling.Ignore)]
public List<ListXmlRamOption> RamOptions { get; set; } = null;
#endregion
@@ -233,6 +269,7 @@ namespace SabreTools.Library.DatItems
#endregion
// TODO: Should this be a separate object for TruRip?
#region Logiqx EmuArc Fields
/// <summary>
@@ -313,6 +350,7 @@ namespace SabreTools.Library.DatItems
#endregion
// TODO: Ensure read/write for all fields here
#region SoftwareList Fields
/// <summary>
@@ -321,6 +359,13 @@ 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<SoftwareListInfo> Infos { get; set; } = null;
/// <summary>
/// List of shared feature items
/// </summary>
@@ -341,96 +386,96 @@ namespace SabreTools.Library.DatItems
{
#region Common
if (mappings.Keys.Contains(Field.MachineName))
Name = mappings[Field.MachineName];
if (mappings.Keys.Contains(Field.Machine_Name))
Name = mappings[Field.Machine_Name];
if (mappings.Keys.Contains(Field.Comment))
Comment = mappings[Field.Comment];
if (mappings.Keys.Contains(Field.Machine_Comment))
Comment = mappings[Field.Machine_Comment];
if (mappings.Keys.Contains(Field.Description))
Description = mappings[Field.Description];
if (mappings.Keys.Contains(Field.Machine_Description))
Description = mappings[Field.Machine_Description];
if (mappings.Keys.Contains(Field.Year))
Year = mappings[Field.Year];
if (mappings.Keys.Contains(Field.Machine_Year))
Year = mappings[Field.Machine_Year];
if (mappings.Keys.Contains(Field.Manufacturer))
Manufacturer = mappings[Field.Manufacturer];
if (mappings.Keys.Contains(Field.Machine_Manufacturer))
Manufacturer = mappings[Field.Machine_Manufacturer];
if (mappings.Keys.Contains(Field.Publisher))
Publisher = mappings[Field.Publisher];
if (mappings.Keys.Contains(Field.Machine_Publisher))
Publisher = mappings[Field.Machine_Publisher];
if (mappings.Keys.Contains(Field.Category))
Category = mappings[Field.Category];
if (mappings.Keys.Contains(Field.Machine_Category))
Category = mappings[Field.Machine_Category];
if (mappings.Keys.Contains(Field.RomOf))
RomOf = mappings[Field.RomOf];
if (mappings.Keys.Contains(Field.Machine_RomOf))
RomOf = mappings[Field.Machine_RomOf];
if (mappings.Keys.Contains(Field.CloneOf))
CloneOf = mappings[Field.CloneOf];
if (mappings.Keys.Contains(Field.Machine_CloneOf))
CloneOf = mappings[Field.Machine_CloneOf];
if (mappings.Keys.Contains(Field.SampleOf))
SampleOf = mappings[Field.SampleOf];
if (mappings.Keys.Contains(Field.Machine_SampleOf))
SampleOf = mappings[Field.Machine_SampleOf];
if (mappings.Keys.Contains(Field.MachineType))
MachineType = mappings[Field.MachineType].AsMachineType();
if (mappings.Keys.Contains(Field.Machine_Type))
MachineType = mappings[Field.Machine_Type].AsMachineType();
#endregion
#region AttractMode
if (mappings.Keys.Contains(Field.Players))
Players = mappings[Field.Players];
if (mappings.Keys.Contains(Field.Machine_Players))
Players = mappings[Field.Machine_Players];
if (mappings.Keys.Contains(Field.Rotation))
Rotation = mappings[Field.Rotation];
if (mappings.Keys.Contains(Field.Machine_Rotation))
Rotation = mappings[Field.Machine_Rotation];
if (mappings.Keys.Contains(Field.Control))
Control = mappings[Field.Control];
if (mappings.Keys.Contains(Field.Machine_Control))
Control = mappings[Field.Machine_Control];
if (mappings.Keys.Contains(Field.SupportStatus))
Status = mappings[Field.SupportStatus];
if (mappings.Keys.Contains(Field.Machine_SupportStatus))
Status = mappings[Field.Machine_SupportStatus];
if (mappings.Keys.Contains(Field.DisplayCount))
DisplayCount = mappings[Field.DisplayCount];
if (mappings.Keys.Contains(Field.Machine_DisplayCount))
DisplayCount = mappings[Field.Machine_DisplayCount];
if (mappings.Keys.Contains(Field.DisplayType))
DisplayType = mappings[Field.DisplayType];
if (mappings.Keys.Contains(Field.Machine_DisplayType))
DisplayType = mappings[Field.Machine_DisplayType];
if (mappings.Keys.Contains(Field.Buttons))
Buttons = mappings[Field.Buttons];
if (mappings.Keys.Contains(Field.Machine_Buttons))
Buttons = mappings[Field.Machine_Buttons];
#endregion
#region ListXML
if (mappings.Keys.Contains(Field.SourceFile))
SourceFile = mappings[Field.SourceFile];
if (mappings.Keys.Contains(Field.Machine_SourceFile))
SourceFile = mappings[Field.Machine_SourceFile];
if (mappings.Keys.Contains(Field.Runnable))
Runnable = mappings[Field.Runnable].AsRunnable();
if (mappings.Keys.Contains(Field.Machine_Runnable))
Runnable = mappings[Field.Machine_Runnable].AsRunnable();
if (mappings.Keys.Contains(Field.DeviceReferences))
if (mappings.Keys.Contains(Field.Machine_DeviceReference_Name))
{
if (DeviceReferences == null)
DeviceReferences = new List<ListXmlDeviceReference>();
var devices = mappings[Field.DeviceReferences].Split(';').Select(d => new ListXmlDeviceReference() { Name = d, });
var devices = mappings[Field.Machine_DeviceReference_Name].Split(';').Select(d => new ListXmlDeviceReference() { Name = d, });
DeviceReferences.AddRange(devices);
}
// TODO: Add Field.Slot
if (mappings.Keys.Contains(Field.Infos))
if (mappings.Keys.Contains(Field.Machine_Infos))
{
if (Infos == null)
Infos = new List<ListXmlInfo>();
Infos = new List<SoftwareListInfo>();
string[] pairs = mappings[Field.Infos].Split(';');
string[] pairs = mappings[Field.Machine_Infos].Split(';');
foreach (string pair in pairs)
{
string[] split = pair.Split('=');
var infoObj = new ListXmlInfo();
var infoObj = new SoftwareListInfo();
infoObj.Name = split[0];
infoObj.Value = split[1];
@@ -442,69 +487,69 @@ namespace SabreTools.Library.DatItems
#region Logiqx
if (mappings.Keys.Contains(Field.Board))
Board = mappings[Field.Board];
if (mappings.Keys.Contains(Field.Machine_Board))
Board = mappings[Field.Machine_Board];
if (mappings.Keys.Contains(Field.RebuildTo))
RebuildTo = mappings[Field.RebuildTo];
if (mappings.Keys.Contains(Field.Machine_RebuildTo))
RebuildTo = mappings[Field.Machine_RebuildTo];
#endregion
#region Logiqx EmuArc
if (mappings.Keys.Contains(Field.TitleID))
TitleID = mappings[Field.TitleID];
if (mappings.Keys.Contains(Field.Machine_TitleID))
TitleID = mappings[Field.Machine_TitleID];
if (mappings.Keys.Contains(Field.Developer))
Developer = mappings[Field.Developer];
if (mappings.Keys.Contains(Field.Machine_Developer))
Developer = mappings[Field.Machine_Developer];
if (mappings.Keys.Contains(Field.Genre))
Genre = mappings[Field.Genre];
if (mappings.Keys.Contains(Field.Machine_Genre))
Genre = mappings[Field.Machine_Genre];
if (mappings.Keys.Contains(Field.Subgenre))
Subgenre = mappings[Field.Subgenre];
if (mappings.Keys.Contains(Field.Machine_Subgenre))
Subgenre = mappings[Field.Machine_Subgenre];
if (mappings.Keys.Contains(Field.Ratings))
Ratings = mappings[Field.Ratings];
if (mappings.Keys.Contains(Field.Machine_Ratings))
Ratings = mappings[Field.Machine_Ratings];
if (mappings.Keys.Contains(Field.Score))
Score = mappings[Field.Score];
if (mappings.Keys.Contains(Field.Machine_Score))
Score = mappings[Field.Machine_Score];
if (mappings.Keys.Contains(Field.Enabled))
Enabled = mappings[Field.Enabled];
if (mappings.Keys.Contains(Field.Machine_Enabled))
Enabled = mappings[Field.Machine_Enabled];
if (mappings.Keys.Contains(Field.HasCrc))
HasCrc = mappings[Field.HasCrc].AsYesNo();
if (mappings.Keys.Contains(Field.Machine_HasCrc))
HasCrc = mappings[Field.Machine_HasCrc].AsYesNo();
if (mappings.Keys.Contains(Field.RelatedTo))
RelatedTo = mappings[Field.RelatedTo];
if (mappings.Keys.Contains(Field.Machine_RelatedTo))
RelatedTo = mappings[Field.Machine_RelatedTo];
#endregion
#region OpenMSX
if (mappings.Keys.Contains(Field.GenMSXID))
GenMSXID = mappings[Field.GenMSXID];
if (mappings.Keys.Contains(Field.Machine_GenMSXID))
GenMSXID = mappings[Field.Machine_GenMSXID];
if (mappings.Keys.Contains(Field.System))
System = mappings[Field.System];
if (mappings.Keys.Contains(Field.Machine_System))
System = mappings[Field.Machine_System];
if (mappings.Keys.Contains(Field.Country))
Country = mappings[Field.Country];
if (mappings.Keys.Contains(Field.Machine_Country))
Country = mappings[Field.Machine_Country];
#endregion
#region SoftwareList
if (mappings.Keys.Contains(Field.Supported))
Supported = mappings[Field.Supported].AsSupported();
if (mappings.Keys.Contains(Field.Machine_Supported))
Supported = mappings[Field.Machine_Supported].AsSupported();
if (mappings.Keys.Contains(Field.SharedFeatures))
if (mappings.Keys.Contains(Field.Machine_SharedFeatures))
{
if (SharedFeatures == null)
SharedFeatures = new List<SoftwareListSharedFeature>();
string[] pairs = mappings[Field.SharedFeatures].Split(';');
string[] pairs = mappings[Field.Machine_SharedFeatures].Split(';');
foreach (string pair in pairs)
{
string[] split = pair.Split('=');
@@ -517,7 +562,7 @@ namespace SabreTools.Library.DatItems
}
}
if (mappings.Keys.Contains(Field.DipSwitches))
if (mappings.Keys.Contains(Field.Machine_DipSwitches))
{
if (DipSwitches == null)
DipSwitches = new List<ListXmlDipSwitch>();
@@ -927,148 +972,148 @@ namespace SabreTools.Library.DatItems
{
#region Common
if (fields.Contains(Field.MachineName))
if (fields.Contains(Field.Machine_Name))
Name = null;
if (fields.Contains(Field.Comment))
if (fields.Contains(Field.Machine_Comment))
Comment = null;
if (fields.Contains(Field.Description))
if (fields.Contains(Field.Machine_Description))
Description = null;
if (fields.Contains(Field.Year))
if (fields.Contains(Field.Machine_Year))
Year = null;
if (fields.Contains(Field.Manufacturer))
if (fields.Contains(Field.Machine_Manufacturer))
Manufacturer = null;
if (fields.Contains(Field.Publisher))
if (fields.Contains(Field.Machine_Publisher))
Publisher = null;
if (fields.Contains(Field.Category))
if (fields.Contains(Field.Machine_Category))
Category = null;
if (fields.Contains(Field.RomOf))
if (fields.Contains(Field.Machine_RomOf))
RomOf = null;
if (fields.Contains(Field.CloneOf))
if (fields.Contains(Field.Machine_CloneOf))
CloneOf = null;
if (fields.Contains(Field.SampleOf))
if (fields.Contains(Field.Machine_SampleOf))
SampleOf = null;
if (fields.Contains(Field.MachineType))
if (fields.Contains(Field.Machine_Type))
MachineType = MachineType.NULL;
#endregion
#region AttractMode
if (fields.Contains(Field.Players))
if (fields.Contains(Field.Machine_Players))
Players = null;
if (fields.Contains(Field.Rotation))
if (fields.Contains(Field.Machine_Rotation))
Rotation = null;
if (fields.Contains(Field.Control))
if (fields.Contains(Field.Machine_Control))
Control = null;
if (fields.Contains(Field.SupportStatus))
if (fields.Contains(Field.Machine_SupportStatus))
Status = null;
if (fields.Contains(Field.DisplayCount))
if (fields.Contains(Field.Machine_DisplayCount))
DisplayCount = null;
if (fields.Contains(Field.DisplayType))
if (fields.Contains(Field.Machine_DisplayType))
DisplayType = null;
if (fields.Contains(Field.Buttons))
if (fields.Contains(Field.Machine_Buttons))
Buttons = null;
#endregion
#region ListXML
if (fields.Contains(Field.SourceFile))
if (fields.Contains(Field.Machine_SourceFile))
SourceFile = null;
if (fields.Contains(Field.Runnable))
if (fields.Contains(Field.Machine_Runnable))
Runnable = Runnable.NULL;
if (fields.Contains(Field.DeviceReferences))
if (fields.Contains(Field.Machine_DeviceReferences))
DeviceReferences = null;
if (fields.Contains(Field.Slots))
if (fields.Contains(Field.Machine_Slots))
Slots = null;
if (fields.Contains(Field.Infos))
if (fields.Contains(Field.Machine_Infos))
Infos = null;
#endregion
#region Logiqx
if (fields.Contains(Field.Board))
if (fields.Contains(Field.Machine_Board))
Board = null;
if (fields.Contains(Field.RebuildTo))
if (fields.Contains(Field.Machine_RebuildTo))
RebuildTo = null;
#endregion
#region Logiqx EmuArc
if (fields.Contains(Field.TitleID))
if (fields.Contains(Field.Machine_TitleID))
TitleID = null;
if (fields.Contains(Field.Developer))
if (fields.Contains(Field.Machine_Developer))
Developer = null;
if (fields.Contains(Field.Genre))
if (fields.Contains(Field.Machine_Genre))
Genre = null;
if (fields.Contains(Field.Subgenre))
if (fields.Contains(Field.Machine_Subgenre))
Subgenre = null;
if (fields.Contains(Field.Ratings))
if (fields.Contains(Field.Machine_Ratings))
Ratings = null;
if (fields.Contains(Field.Score))
if (fields.Contains(Field.Machine_Score))
Score = null;
if (fields.Contains(Field.Enabled))
if (fields.Contains(Field.Machine_Enabled))
Enabled = null;
if (fields.Contains(Field.HasCrc))
if (fields.Contains(Field.Machine_HasCrc))
HasCrc = null;
if (fields.Contains(Field.RelatedTo))
if (fields.Contains(Field.Machine_RelatedTo))
RelatedTo = null;
#endregion
#region OpenMSX
if (fields.Contains(Field.GenMSXID))
if (fields.Contains(Field.Machine_GenMSXID))
GenMSXID = null;
if (fields.Contains(Field.System))
if (fields.Contains(Field.Machine_System))
System = null;
if (fields.Contains(Field.Country))
if (fields.Contains(Field.Machine_Country))
Country = null;
#endregion
#region SoftwareList
if (fields.Contains(Field.Supported))
if (fields.Contains(Field.Machine_Supported))
Supported = Supported.NULL;
if (fields.Contains(Field.SharedFeatures))
if (fields.Contains(Field.Machine_SharedFeatures))
SharedFeatures = null;
if (fields.Contains(Field.DipSwitches))
if (fields.Contains(Field.Machine_DipSwitches))
DipSwitches = null;
#endregion
@@ -1088,151 +1133,151 @@ namespace SabreTools.Library.DatItems
{
#region Common
if (fields.Contains(Field.MachineName))
if (fields.Contains(Field.Machine_Name))
Name = machine.Name;
if (fields.Contains(Field.Comment))
if (fields.Contains(Field.Machine_Comment))
Comment = machine.Comment;
if (fields.Contains(Field.Description))
if (fields.Contains(Field.Machine_Description))
{
if (!onlySame || (onlySame && Name == Description))
Description = machine.Description;
}
if (fields.Contains(Field.Year))
if (fields.Contains(Field.Machine_Year))
Year = machine.Year;
if (fields.Contains(Field.Manufacturer))
if (fields.Contains(Field.Machine_Manufacturer))
Manufacturer = machine.Manufacturer;
if (fields.Contains(Field.Publisher))
if (fields.Contains(Field.Machine_Publisher))
Publisher = machine.Publisher;
if (fields.Contains(Field.Category))
if (fields.Contains(Field.Machine_Category))
Category = machine.Category;
if (fields.Contains(Field.RomOf))
if (fields.Contains(Field.Machine_RomOf))
RomOf = machine.RomOf;
if (fields.Contains(Field.CloneOf))
if (fields.Contains(Field.Machine_CloneOf))
CloneOf = machine.CloneOf;
if (fields.Contains(Field.SampleOf))
if (fields.Contains(Field.Machine_SampleOf))
SampleOf = machine.SampleOf;
if (fields.Contains(Field.MachineType))
if (fields.Contains(Field.Machine_Type))
MachineType = machine.MachineType;
#endregion
#region AttractMode
if (fields.Contains(Field.Players))
if (fields.Contains(Field.Machine_Players))
Players = machine.Players;
if (fields.Contains(Field.Rotation))
if (fields.Contains(Field.Machine_Rotation))
Rotation = machine.Rotation;
if (fields.Contains(Field.Control))
if (fields.Contains(Field.Machine_Control))
Control = machine.Control;
if (fields.Contains(Field.SupportStatus))
if (fields.Contains(Field.Machine_SupportStatus))
Status = machine.Status;
if (fields.Contains(Field.DisplayCount))
if (fields.Contains(Field.Machine_DisplayCount))
DisplayCount = machine.DisplayCount;
if (fields.Contains(Field.DisplayType))
if (fields.Contains(Field.Machine_DisplayType))
DisplayType = machine.DisplayType;
if (fields.Contains(Field.Buttons))
if (fields.Contains(Field.Machine_Buttons))
Buttons = machine.Buttons;
#endregion
#region ListXML
if (fields.Contains(Field.SourceFile))
if (fields.Contains(Field.Machine_SourceFile))
SourceFile = machine.SourceFile;
if (fields.Contains(Field.Runnable))
if (fields.Contains(Field.Machine_Runnable))
Runnable = machine.Runnable;
if (fields.Contains(Field.DeviceReferences))
if (fields.Contains(Field.Machine_DeviceReferences))
DeviceReferences = machine.DeviceReferences;
if (fields.Contains(Field.Slots))
if (fields.Contains(Field.Machine_Slots))
Slots = machine.Slots;
if (fields.Contains(Field.Infos))
if (fields.Contains(Field.Machine_Infos))
Infos = machine.Infos;
#endregion
#region Logiqx
if (fields.Contains(Field.Board))
if (fields.Contains(Field.Machine_Board))
Board = machine.Board;
if (fields.Contains(Field.RebuildTo))
if (fields.Contains(Field.Machine_RebuildTo))
RebuildTo = machine.RebuildTo;
#endregion
#region Logiqx EmuArc
if (fields.Contains(Field.TitleID))
if (fields.Contains(Field.Machine_TitleID))
TitleID = machine.TitleID;
if (fields.Contains(Field.Developer))
if (fields.Contains(Field.Machine_Developer))
Developer = machine.Developer;
if (fields.Contains(Field.Genre))
if (fields.Contains(Field.Machine_Genre))
Genre = machine.Genre;
if (fields.Contains(Field.Subgenre))
if (fields.Contains(Field.Machine_Subgenre))
Subgenre = machine.Subgenre;
if (fields.Contains(Field.Ratings))
if (fields.Contains(Field.Machine_Ratings))
Ratings = machine.Ratings;
if (fields.Contains(Field.Score))
if (fields.Contains(Field.Machine_Score))
Score = machine.Score;
if (fields.Contains(Field.Enabled))
if (fields.Contains(Field.Machine_Enabled))
Enabled = machine.Enabled;
if (fields.Contains(Field.HasCrc))
if (fields.Contains(Field.Machine_HasCrc))
HasCrc = machine.HasCrc;
if (fields.Contains(Field.RelatedTo))
if (fields.Contains(Field.Machine_RelatedTo))
RelatedTo = machine.RelatedTo;
#endregion
#region OpenMSX
if (fields.Contains(Field.GenMSXID))
if (fields.Contains(Field.Machine_GenMSXID))
GenMSXID = machine.GenMSXID;
if (fields.Contains(Field.System))
if (fields.Contains(Field.Machine_System))
System = machine.System;
if (fields.Contains(Field.Country))
if (fields.Contains(Field.Machine_Country))
Country = machine.Country;
#endregion
#region SoftwareList
if (fields.Contains(Field.Supported))
if (fields.Contains(Field.Machine_Supported))
Supported = machine.Supported;
if (fields.Contains(Field.SharedFeatures))
if (fields.Contains(Field.Machine_SharedFeatures))
SharedFeatures = machine.SharedFeatures;
if (fields.Contains(Field.DipSwitches))
if (fields.Contains(Field.Machine_DipSwitches))
DipSwitches = machine.DipSwitches;
#endregion

View File

@@ -104,8 +104,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -308,8 +308,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,

View File

@@ -40,8 +40,7 @@ namespace SabreTools.Library.DatItems
Remark = this.Remark,
Boot = this.Boot,
PartName = this.PartName,
PartInterface = this.PartInterface,
Part = this.Part,
Features = this.Features,
AreaName = this.AreaName,
AreaSize = this.AreaSize,