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

More ListXML objects and cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-22 23:40:00 -07:00
parent 7be2abba8b
commit 90f55078d5
7 changed files with 243 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.Library/DatFiles/Json.cs
View File

@@ -678,7 +678,10 @@ namespace SabreTools.Library.DatFiles
jtr.Read(); // Mask Key jtr.Read(); // Mask Key
string mask = jtr.ReadAsString(); string mask = jtr.ReadAsString();
var dip = new ListXMLDipSwitch(name, tag, mask); var dipSwitch = new ListXMLDipSwitch();
dipSwitch.Name = name;
dipSwitch.Tag = tag;
dipSwitch.Mask = mask;
jtr.Read(); // Start dipvalues object jtr.Read(); // Start dipvalues object
while (!sr.EndOfStream) while (!sr.EndOfStream)
@@ -695,12 +698,17 @@ namespace SabreTools.Library.DatFiles
bool? def = jtr.ReadAsString().AsYesNo(); bool? def = jtr.ReadAsString().AsYesNo();
jtr.Read(); // End object jtr.Read(); // End object
dip.Values.Add(new ListXMLDipValue(valname, value, def)); var dipValue = new ListXMLDipValue();
dipValue.Name = valname;
dipValue.Value = value;
dipValue.Default = def;
dipSwitch.Values.Add(dipValue);
} }
jtr.Read(); // End object jtr.Read(); // End object
machine.DipSwitches.Add(dip); machine.DipSwitches.Add(dipSwitch);
} }
break; break;
@@ -840,7 +848,7 @@ namespace SabreTools.Library.DatFiles
datItem.AltName = altName; datItem.AltName = altName;
datItem.AltTitle = altTitle; datItem.AltTitle = altTitle;
datItem.Original = new OpenMSXOriginal(original, null); datItem.Original = new OpenMSXOriginal() { Name = original };
datItem.OpenMSXSubType = subType; datItem.OpenMSXSubType = subType;
datItem.OpenMSXType = msxType; datItem.OpenMSXType = msxType;
datItem.Remark = remark; datItem.Remark = remark;
@@ -2216,7 +2224,7 @@ namespace SabreTools.Library.DatFiles
if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.Original, Header.ExcludeFields))) if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.Original, Header.ExcludeFields)))
{ {
jtw.WritePropertyName("original"); jtw.WritePropertyName("original");
jtw.WriteValue(datItem.Original.Original); jtw.WriteValue(datItem.Original.Name);
} }
if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.OpenMSXSubType, Header.ExcludeFields))) if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.OpenMSXSubType, Header.ExcludeFields)))
{ {

173
SabreTools.Library/DatFiles/Listxml.cs
View File

@@ -314,80 +314,79 @@ namespace SabreTools.Library.DatFiles
// TODO: Should any be additional Machine fields? // TODO: Should any be additional Machine fields?
case "chip": case "chip":
// TODO: Make a new object for this // TODO: Use these chips
// string chip_name = reader.GetAttribute("name"); var chip = new ListXMLChip();
// string chip_tag = reader.GetAttribute("tag"); chip.Name = reader.GetAttribute("name");
// string chip_type = reader.GetAttribute("type"); // (cpu|audio) chip.Tag = reader.GetAttribute("tag");
// string chip_clock = reader.GetAttribute("clock"); chip.Type = reader.GetAttribute("type");
chip.Clock = reader.GetAttribute("clock");
reader.Read(); reader.Read();
break; break;
case "display": case "display":
// TODO: Make a new object for this // TODO: Use these displays
// string display_tag = reader.GetAttribute("tag"); var display = new ListXMLDisplay();
// string display_type = reader.GetAttribute("type"); // (raster|vector|lcd|svg|unknown) display.Tag = reader.GetAttribute("tag");
// string display_rotate = reader.GetAttribute("rotate"); // (0|90|180|270) display.Type = reader.GetAttribute("type");
// bool? display_flipx = Utilities.GetYesNo(reader.GetAttribute("flipx")); display.Rotate = reader.GetAttribute("rotate");
// string display_width = reader.GetAttribute("width"); display.FlipX = reader.GetAttribute("flipx").AsYesNo();
// string display_height = reader.GetAttribute("height"); display.Width = reader.GetAttribute("width");
// string display_refresh = reader.GetAttribute("refresh"); display.Height = reader.GetAttribute("height");
// string display_pixclock = reader.GetAttribute("pixclock"); display.Refresh = reader.GetAttribute("refresh");
// string display_htotal = reader.GetAttribute("htotal"); display.PixClock = reader.GetAttribute("pixclock");
// string display_hbend = reader.GetAttribute("hbend"); display.HTotal = reader.GetAttribute("htotal");
// string display_hbstart = reader.GetAttribute("hbstart"); display.HBend = reader.GetAttribute("hbend");
// string display_vtotal = reader.GetAttribute("vtotal"); display.HStart = reader.GetAttribute("hstart");
// string display_vbend = reader.GetAttribute("vbend"); display.VTotal = reader.GetAttribute("vtotal");
// string display_vbstart = reader.GetAttribute("vbstart"); display.VBend = reader.GetAttribute("vbend");
display.VStart = reader.GetAttribute("vstart");
reader.Read(); reader.Read();
break; break;
case "sound": case "sound":
// TODO: Make a new object for this // TODO: Use these sounds
// string sound_channels = reader.GetAttribute("channels"); var sound = new ListXMLSound();
sound.Channels = reader.GetAttribute("channels");
reader.Read(); reader.Read();
break; break;
case "condition": case "condition":
// TODO: Make a new object for this // TODO: Use these conditions
// string condition_tag = reader.GetAttribute("tag"); var condition = new ListXMLCondition();
// string condition_mask = reader.GetAttribute("mask"); condition.Tag = reader.GetAttribute("tag");
// string condition_relation = reader.GetAttribute("relation"); // (eq|ne|gt|le|lt|ge) condition.Mask = reader.GetAttribute("mask");
// string condition_value = reader.GetAttribute("value"); condition.Relation = reader.GetAttribute("relation");
condition.Value = reader.GetAttribute("value");
reader.Read(); reader.Read();
break; break;
case "input": case "input":
// TODO: Make a new object for this // TODO: Use these inputs
// bool? input_service = Utilities.GetYesNo(reader.GetAttribute("service")); var input = new ListXMLInput();
// bool? input_tilt = Utilities.GetYesNo(reader.GetAttribute("tilt")); input.Service = reader.GetAttribute("service").AsYesNo();
// string input_players = reader.GetAttribute("players"); input.Tilt = reader.GetAttribute("tilt").AsYesNo();
// string input_coins = reader.GetAttribute("coins"); input.Players = reader.GetAttribute("players");
input.Coins = reader.GetAttribute("coins");
// // While the subtree contains <control> elements... // Now read the internal tags
// TODO: Make a new object for this ReadInput(reader.ReadSubtree(), input);
// string control_type = reader.GetAttribute("type");
// string control_player = reader.GetAttribute("player");
// string control_buttons = reader.GetAttribute("buttons");
// string control_regbuttons = reader.GetAttribute("regbuttons");
// string control_minimum = reader.GetAttribute("minimum");
// string control_maximum = reader.GetAttribute("maximum");
// string control_sensitivity = reader.GetAttribute("sensitivity");
// string control_keydelta = reader.GetAttribute("keydelta");
// bool? control_reverse = Utilities.GetYesNo(reader.GetAttribute("reverse"));
// string control_ways = reader.GetAttribute("ways");
// string control_ways2 = reader.GetAttribute("ways2");
// string control_ways3 = reader.GetAttribute("ways3");
// Skip the input now that we've processed it
reader.Skip(); reader.Skip();
break; break;
case "dipswitch": case "dipswitch":
// TODO: Use these dipswitches // TODO: Use these dipswitches
var dipSwitch = new ListXMLDipSwitch(reader.GetAttribute("name"), reader.GetAttribute("tag"), reader.GetAttribute("mask")); var dipSwitch = new ListXMLDipSwitch();
dipSwitch.Name = reader.GetAttribute("name");
dipSwitch.Tag = reader.GetAttribute("tag");
dipSwitch.Mask = reader.GetAttribute("mask");
// Now read the internal tags
ReadDipSwitch(reader.ReadSubtree(), dipSwitch); ReadDipSwitch(reader.ReadSubtree(), dipSwitch);
// Skip the dipswitch now that we've processed it // Skip the dipswitch now that we've processed it
@@ -573,7 +572,63 @@ namespace SabreTools.Library.DatFiles
} }
/// <summary> /// <summary>
/// Read DipSwitch DipValues information /// Read Input information
/// </summary>
/// <param name="reader">XmlReader representing a diskarea block</param>
/// <param name="input">ListXMLInput to populate</param>
private void ReadInput(XmlReader reader, ListXMLInput input)
{
// If we have an empty trurip, skip it
if (reader == null)
return;
// Get list ready
input.Controls = new List<ListXMLControl>();
// Otherwise, add what is possible
reader.MoveToContent();
while (!reader.EOF)
{
// We only want elements
if (reader.NodeType != XmlNodeType.Element)
{
reader.Read();
continue;
}
// Get the information from the dipswitch
switch (reader.Name)
{
case "control":
var control = new ListXMLControl();
control.Type = reader.GetAttribute("type");
control.Player = reader.GetAttribute("player");
control.Buttons = reader.GetAttribute("buttons");
control.RegButtons = reader.GetAttribute("regbuttons");
control.Minimum = reader.GetAttribute("minimum");
control.Maximum = reader.GetAttribute("maximum");
control.Sensitivity = reader.GetAttribute("sensitivity");
control.KeyDelta = reader.GetAttribute("keydelta");
control.Reverse = reader.GetAttribute("reverse").AsYesNo();
control.Ways = reader.GetAttribute("ways");
control.Ways2 = reader.GetAttribute("ways2");
control.Ways3 = reader.GetAttribute("ways3");
input.Controls.Add(control);
reader.Read();
break;
default:
reader.Read();
break;
}
}
}
/// <summary>
/// Read DipSwitch information
/// </summary> /// </summary>
/// <param name="reader">XmlReader representing a diskarea block</param> /// <param name="reader">XmlReader representing a diskarea block</param>
/// <param name="dipSwitch">ListXMLDipSwitch to populate</param> /// <param name="dipSwitch">ListXMLDipSwitch to populate</param>
@@ -603,18 +658,24 @@ namespace SabreTools.Library.DatFiles
switch (reader.Name) switch (reader.Name)
{ {
case "diplocation": case "diplocation":
dipSwitch.Locations.Add(new ListXMLDipLocation( var dipLocation = new ListXMLDipLocation();
reader.GetAttribute("name"), dipLocation.Name = reader.GetAttribute("name");
reader.GetAttribute("number"), dipLocation.Number = reader.GetAttribute("number");
reader.GetAttribute("inverted").AsYesNo())); dipLocation.Inverted = reader.GetAttribute("inverted").AsYesNo();
dipSwitch.Locations.Add(dipLocation);
reader.Read(); reader.Read();
break; break;
case "dipvalue": case "dipvalue":
dipSwitch.Values.Add(new ListXMLDipValue( var dipValue = new ListXMLDipValue();
reader.GetAttribute("name"), dipValue.Name = reader.GetAttribute("name");
reader.GetAttribute("value"), dipValue.Value = reader.GetAttribute("value");
reader.GetAttribute("default").AsYesNo())); dipValue.Default = reader.GetAttribute("default").AsYesNo();
dipSwitch.Values.Add(dipValue);
reader.Read(); reader.Read();
break; break;

8
SabreTools.Library/DatFiles/OpenMSX.cs
View File

@@ -248,9 +248,9 @@ namespace SabreTools.Library.DatFiles
break; break;
case "original": case "original":
bool? value = reader.GetAttribute("value").AsYesNo(); original = new OpenMSXOriginal();
string orig = reader.ReadElementContentAsString(); original.Value = reader.GetAttribute("value").AsYesNo();
original = new OpenMSXOriginal(orig, value); original.Name = reader.ReadElementContentAsString();
break; break;
default: default:
@@ -730,7 +730,7 @@ namespace SabreTools.Library.DatFiles
{ {
xtw.WriteStartElement("original"); xtw.WriteStartElement("original");
xtw.WriteAttributeString("value", rom.Original.Value == true ? "true" : "false"); xtw.WriteAttributeString("value", rom.Original.Value == true ? "true" : "false");
xtw.WriteString(rom.Original.Original); xtw.WriteString(rom.Original.Name);
xtw.WriteEndElement(); xtw.WriteEndElement();
} }

12
SabreTools.Library/DatFiles/SeparatedValue.cs
View File

@@ -715,7 +715,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,
@@ -750,7 +750,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,
@@ -788,7 +788,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,
@@ -838,7 +838,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,
@@ -878,7 +878,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,
@@ -932,7 +932,7 @@ namespace SabreTools.Library.DatFiles
AltName = altName, AltName = altName,
AltTitle = altTitle, AltTitle = altTitle,
Original = new OpenMSXOriginal(original, null), Original = new OpenMSXOriginal() { Name = original },
OpenMSXSubType = subType, OpenMSXSubType = subType,
OpenMSXType = msxType, OpenMSXType = msxType,
Remark = remark, Remark = remark,

18
SabreTools.Library/DatFiles/SoftwareList.cs
View File

@@ -334,7 +334,12 @@ namespace SabreTools.Library.DatFiles
case "dipswitch": case "dipswitch":
// TODO: Use these dipswitches // TODO: Use these dipswitches
var dipSwitch = new ListXMLDipSwitch(reader.GetAttribute("name"), reader.GetAttribute("tag"), reader.GetAttribute("mask")); var dipSwitch = new ListXMLDipSwitch();
dipSwitch.Name = reader.GetAttribute("name");
dipSwitch.Tag = reader.GetAttribute("tag");
dipSwitch.Mask = reader.GetAttribute("mask");
// Now read the internal tags
ReadDipSwitch(reader.ReadSubtree(), dipSwitch); ReadDipSwitch(reader.ReadSubtree(), dipSwitch);
// Skip the dipswitch now that we've processed it // Skip the dipswitch now that we've processed it
@@ -590,10 +595,13 @@ namespace SabreTools.Library.DatFiles
switch (reader.Name) switch (reader.Name)
{ {
case "dipvalue": case "dipvalue":
dipSwitch.Values.Add(new ListXMLDipValue( var dipValue = new ListXMLDipValue();
reader.GetAttribute("name"), dipValue.Name = reader.GetAttribute("name");
reader.GetAttribute("value"), dipValue.Value = reader.GetAttribute("value");
reader.GetAttribute("default").AsYesNo())); dipValue.Default = reader.GetAttribute("default").AsYesNo();
dipSwitch.Values.Add(dipValue);
reader.Read(); reader.Read();
break; break;

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

@@ -33,20 +33,76 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
public class OpenMSXOriginal public class OpenMSXOriginal
{ {
public string Original { get; set; } public string Name { get; set; }
public bool? Value { get; set; } public bool? Value { get; set; }
public OpenMSXOriginal(string original, bool? value)
{
Original = original;
Value = value;
}
} }
#endregion #endregion
#region ListXML #region ListXML
/// <summary>
/// Represents one ListXML chip
/// </summary>
public class ListXMLChip
{
public string Name { get; set; }
public string Tag { get; set; }
public string Type { get; set; } // TODO: (cpu|audio)
public string Clock { get; set; }
}
/// <summary>
/// Represents one ListXML condition
/// </summary>
public class ListXMLCondition
{
public string Tag { get; set; }
public string Mask { get; set; }
public string Relation { get; set; } // TODO: (eq|ne|gt|le|lt|ge)
public string Value { get; set; }
}
/// <summary>
/// Represents one ListXML control
/// </summary>
public class ListXMLControl
{
public string Type { get; set; }
public string Player { get; set; } // TODO: Int32?
public string Buttons { get; set; } // TODO: Int32?
public string RegButtons { get; set; } // TODO: Int32?
public string Minimum { get; set; } // TODO: Int32? Float?
public string Maximum { get; set; } // TODO: Int32? Float?
public string Sensitivity { get; set; } // TODO: Int32? Float?
public string KeyDelta { get; set; } // TODO: Int32? Float?
public bool? Reverse { get; set; }
public string Ways { get; set; } // TODO: Int32? Float?
public string Ways2 { get; set; } // TODO: Int32? Float?
public string Ways3 { get; set; } // TODO: Int32? Float?
}
/// <summary>
/// Represents one ListXML display
/// </summary>
public class ListXMLDisplay
{
public string Tag { get; set; }
public string Type { get; set; } // TODO: (raster|vector|lcd|svg|unknown)
public string Rotate { get; set; } // TODO: (0|90|180|270) Int32?
public bool? FlipX { get; set; }
public string Width { get; set; } // TODO: Int32?
public string Height { get; set; } // TODO: Int32?
public string Refresh { get; set; } // TODO: Int32? Float?
public string PixClock { get; set; } // TODO: Int32? Float?
public string HTotal { get; set; } // TODO: Int32? Float?
public string HBend { get; set; } // TODO: Int32? Float?
public string HStart { get; set; } // TODO: Int32? Float?
public string VTotal { get; set; } // TODO: Int32? Float?
public string VBend { get; set; } // TODO: Int32? Float?
public string VStart { get; set; } // TODO: Int32? Float?
}
/// <summary> /// <summary>
/// Represents one ListXML dipswitch /// Represents one ListXML dipswitch
/// </summary> /// </summary>
@@ -59,11 +115,8 @@ namespace SabreTools.Library.DatItems
public List<ListXMLDipLocation> Locations { get; set; } public List<ListXMLDipLocation> Locations { get; set; }
public List<ListXMLDipValue> Values { get; set; } public List<ListXMLDipValue> Values { get; set; }
public ListXMLDipSwitch(string name, string tag, string mask) public ListXMLDipSwitch()
{ {
Name = name;
Tag = tag;
Mask = mask;
Locations = new List<ListXMLDipLocation>(); Locations = new List<ListXMLDipLocation>();
Values = new List<ListXMLDipValue>(); Values = new List<ListXMLDipValue>();
} }
@@ -77,13 +130,6 @@ namespace SabreTools.Library.DatItems
public string Name { get; set; } public string Name { get; set; }
public string Number { get; set; } public string Number { get; set; }
public bool? Inverted { get; set; } public bool? Inverted { get; set; }
public ListXMLDipLocation(string name, string number, bool? inverted)
{
Name = name;
Number = number;
Inverted = inverted;
}
} }
/// <summary> /// <summary>
@@ -95,15 +141,33 @@ namespace SabreTools.Library.DatItems
public string Name { get; set; } public string Name { get; set; }
public string Value { get; set; } public string Value { get; set; }
public bool? Default { get; set; } public bool? Default { get; set; }
}
public ListXMLDipValue(string name, string value, bool? def) /// <summary>
/// Represents one ListXML input
/// </summary>
public class ListXMLInput
{
public bool? Service { get; set; }
public bool? Tilt { get; set; }
public string Players { get; set; } // TODO: Int32?
public string Coins { get; set; } // TODO: Int32?
public List<ListXMLControl> Controls { get; set; }
public ListXMLInput()
{ {
Name = name; Controls = new List<ListXMLControl>();
Value = value;
Default = def;
} }
} }
/// <summary>
/// Represents one ListXML sound
/// </summary>
public class ListXMLSound
{
public string Channels { get; set; } // TODO: Int32?
}
#endregion #endregion
#region SoftwareList #region SoftwareList

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

@@ -352,7 +352,7 @@ namespace SabreTools.Library.DatItems
#region OpenMSX #region OpenMSX
case Field.Original: case Field.Original:
fieldValue = Original.Original; fieldValue = Original.Name;
break; break;
case Field.OpenMSXSubType: case Field.OpenMSXSubType:
fieldValue = OpenMSXSubType.ToString(); fieldValue = OpenMSXSubType.ToString();
@@ -442,7 +442,7 @@ namespace SabreTools.Library.DatItems
#region OpenMSX #region OpenMSX
if (mappings.Keys.Contains(Field.Original)) if (mappings.Keys.Contains(Field.Original))
Original = new OpenMSXOriginal(mappings[Field.Original], null); Original = new OpenMSXOriginal() { Name = mappings[Field.Original] };
if (mappings.Keys.Contains(Field.OpenMSXSubType)) if (mappings.Keys.Contains(Field.OpenMSXSubType))
OpenMSXSubType = mappings[Field.OpenMSXSubType].AsOpenMSXSubType(); OpenMSXSubType = mappings[Field.OpenMSXSubType].AsOpenMSXSubType();
@@ -725,9 +725,9 @@ namespace SabreTools.Library.DatItems
#region OpenMSX #region OpenMSX
// Filter on original // Filter on original
if (filter.Original.MatchesPositiveSet(Original.Original) == false) if (filter.Original.MatchesPositiveSet(Original.Name) == false)
return false; return false;
if (filter.Original.MatchesNegativeSet(Original.Original) == true) if (filter.Original.MatchesNegativeSet(Original.Name) == true)
return false; return false;
// Filter on OpenMSX subtype // Filter on OpenMSX subtype