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

Wire up remaining OpenMSX machine fields

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-21 17:27:11 -07:00
parent 755b6f030b
commit c3cde1f8e2
8 changed files with 258 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -623,6 +623,20 @@ namespace SabreTools.Library.DatFiles
#endregion
#region OpenMSX
case "genmsxid":
machine.GenMSXID = jtr.ReadAsString();
break;
case "system":
machine.System = jtr.ReadAsString();
break;
case "country":
machine.Country = jtr.ReadAsString();
break;
#endregion
#region SoftwareList
case "supported":
@@ -1758,6 +1772,26 @@ namespace SabreTools.Library.DatFiles
#endregion
#region OpenMSX
if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.GenMSXID, Header.ExcludeFields)))
{
jtw.WritePropertyName("genmsxid");
jtw.WriteValue(datItem.Machine.GenMSXID);
}
if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.System, Header.ExcludeFields)))
{
jtw.WritePropertyName("system");
jtw.WriteValue(datItem.Machine.System);
}
if (!string.IsNullOrWhiteSpace(datItem.GetField(Field.Country, Header.ExcludeFields)))
{
jtw.WritePropertyName("country");
jtw.WriteValue(datItem.Machine.Country);
}
#endregion
#region SoftwareList
if (!Header.ExcludeFields.Contains(Field.Supported) && datItem.Machine.Supported != null)

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

@@ -135,13 +135,11 @@ namespace SabreTools.Library.DatFiles
break;
case "genmsxid":
// string id = reader.ReadElementContentAsString();
reader.Read();
machine.GenMSXID = reader.ReadElementContentAsString();
break;
case "system":
// string system = reader.ReadElementContentAsString();
reader.Read();
machine.System = reader.ReadElementContentAsString();
break;
case "company":
@@ -153,8 +151,7 @@ namespace SabreTools.Library.DatFiles
break;
case "country":
// string country = reader.ReadElementContentAsString();
reader.Read();
machine.Country = reader.ReadElementContentAsString();
break;
case "dump":
@@ -631,11 +628,11 @@ namespace SabreTools.Library.DatFiles
// Build the state based on excluded fields
xtw.WriteStartElement("software");
xtw.WriteElementString("title", datItem.GetField(Field.MachineName, Header.ExcludeFields));
//xtw.WriteElementString("genmsxid", msxid);
//xtw.WriteElementString("system", system));
xtw.WriteElementString("genmsxid", datItem.GetField(Field.GenMSXID, Header.ExcludeFields));
xtw.WriteElementString("system", datItem.GetField(Field.System, Header.ExcludeFields));
xtw.WriteElementString("company", datItem.GetField(Field.Manufacturer, Header.ExcludeFields));
xtw.WriteElementString("year", datItem.GetField(Field.Year, Header.ExcludeFields));
//xtw.WriteElementString("country", country);
xtw.WriteElementString("country", datItem.GetField(Field.Country, Header.ExcludeFields));
xtw.Flush();
}

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

@@ -459,6 +459,22 @@ namespace SabreTools.Library.DatFiles
#endregion
#region OpenMSX
case "Machine.GenMSXID":
machine.GenMSXID = value;
break;
case "Machine.System":
machine.System = value;
break;
case "Machine.Country":
machine.Country = value;
break;
#endregion
#region SoftwareList
case "Machine.Supported":
@@ -1238,6 +1254,25 @@ namespace SabreTools.Library.DatFiles
#endregion
#region OpenMSX
case "genmsxid":
case "genmsx id":
case "genmsx-id":
case "gen msx id":
case "gen-msx-id":
return "Machine.GenMSXID";
case "msxsystem":
case "msx system":
case "msx-system":
return "Machine.System";
case "country":
return "Machine.Country";
#endregion
#region SoftwareList
case "supported":