De/Serialize XboxOne/XSX catalog.js files (#6)

* Add JSON/catalog.js logic

* Proper json deserialize

* Update packages

* Catalog is UTF-16 LE, make BaseJsonFile encoding independent

* Bump version, use ST.Models 1.4.1

* Implement JsonFile as interface with UTF8 as default

* typo

.github/workflows/build_nupkg.yml

@@ -0,0 +1,43 @@
+name: Nuget Pack
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Pack
+      run: dotnet pack
+
+    - name: Upload build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'Nuget Package'
+        path: 'bin/Release/*.nupkg'
+
+    - name: Upload to rolling
+      uses: ncipollo/release-action@v1.14.0
+      with:
+        allowUpdates: True
+        artifacts: 'bin/Release/*.nupkg'
+        body: 'Last built commit: ${{ github.sha }}'
+        name: 'Rolling Release'
+        prerelease: True
+        replacesArtifacts: True
+        tag: "rolling"
+        updateOnlyUnreleased: True

.github/workflows/check_pr.yml

@@ -0,0 +1,17 @@
+name: Build PR
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+      
+    - name: Build
+      run: dotnet build

CrossModel/ArchiveDotOrg.Serializer.cs

@@ -10,7 +10,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             if (item == null)
                 return null;
-            
+
             var metadataFile = new Models.Metadata.MetadataFile
             {
                 [Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item),
@@ -45,10 +45,12 @@ namespace SabreTools.Serialization.CrossModel
         /// </summary>
         private static Models.Metadata.Machine ConvertMachineToInternalModel(Models.ArchiveDotOrg.File? item)
         {
-            var machine = new Models.Metadata.Machine
-            {
-                [Models.Metadata.Machine.RomKey] = ConvertToInternalModel(item),
-            };
+            var machine = new Models.Metadata.Machine();
+
+            var rom = ConvertToInternalModel(item);
+            if (rom != null)
+                machine[Models.Metadata.Machine.RomKey] = new Models.Metadata.Rom[] { rom };
+
             return machine;
         }
 

CrossModel/Listrom.Serializer.cs

@@ -65,8 +65,8 @@ namespace SabreTools.Serialization.CrossModel
                     datItems.Add(ConvertToInternalModel(file));
                 }
 
-                machine[Models.Metadata.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "disk")?.ToArray();
-                machine[Models.Metadata.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "rom")?.ToArray();
+                machine[Models.Metadata.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "disk").Select(d => d as Models.Metadata.Disk).ToArray();
+                machine[Models.Metadata.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Metadata.DatItem.TypeKey) == "rom").Select(d => d as Models.Metadata.Rom).ToArray();
             }
 
             return machine;
@@ -81,6 +81,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 var disk = new Models.Metadata.Disk
                 {
+                    [Models.Metadata.DatItem.TypeKey] = "disk",
                     [Models.Metadata.Disk.NameKey] = item.Name,
                     [Models.Metadata.Disk.MD5Key] = item.MD5,
                     [Models.Metadata.Disk.SHA1Key] = item.SHA1,
@@ -97,6 +98,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 var rom = new Models.Metadata.Rom
                 {
+                    [Models.Metadata.DatItem.TypeKey] = "rom",
                     [Models.Metadata.Rom.NameKey] = item.Name,
                     [Models.Metadata.Rom.SizeKey] = item.Size,
                     [Models.Metadata.Rom.CRCKey] = item.CRC,

CrossModel/Listxml.Deserializer.cs

@@ -308,7 +308,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 Name = item.ReadString(Models.Metadata.Chip.NameKey),
                 Tag = item.ReadString(Models.Metadata.Chip.TagKey),
-                Type = item.ReadString(Models.Metadata.Chip.TypeKey),
+                Type = item.ReadString(Models.Metadata.Chip.ChipTypeKey),
                 SoundOnly = item.ReadString(Models.Metadata.Chip.SoundOnlyKey),
                 Clock = item.ReadString(Models.Metadata.Chip.ClockKey),
             };
@@ -407,7 +407,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var control = new Control
             {
-                Type = item.ReadString(Models.Metadata.Control.TypeKey),
+                Type = item.ReadString(Models.Metadata.Control.ControlTypeKey),
                 Player = item.ReadString(Models.Metadata.Control.PlayerKey),
                 Buttons = item.ReadString(Models.Metadata.Control.ButtonsKey),
                 ReqButtons = item.ReadString(Models.Metadata.Control.ReqButtonsKey),
@@ -430,7 +430,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var device = new Device
             {
-                Type = item.ReadString(Models.Metadata.Device.TypeKey),
+                Type = item.ReadString(Models.Metadata.Device.DeviceTypeKey),
                 Tag = item.ReadString(Models.Metadata.Device.TagKey),
                 FixedImage = item.ReadString(Models.Metadata.Device.FixedImageKey),
                 Mandatory = item.ReadString(Models.Metadata.Device.MandatoryKey),
@@ -563,7 +563,7 @@ namespace SabreTools.Serialization.CrossModel
             var display = new Display
             {
                 Tag = item.ReadString(Models.Metadata.Display.TagKey),
-                Type = item.ReadString(Models.Metadata.Display.TypeKey),
+                Type = item.ReadString(Models.Metadata.Display.DisplayTypeKey),
                 Rotate = item.ReadString(Models.Metadata.Display.RotateKey),
                 FlipX = item.ReadString(Models.Metadata.Display.FlipXKey),
                 Width = item.ReadString(Models.Metadata.Display.WidthKey),
@@ -621,7 +621,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var feature = new Feature
             {
-                Type = item.ReadString(Models.Metadata.Feature.TypeKey),
+                Type = item.ReadString(Models.Metadata.Feature.FeatureTypeKey),
                 Status = item.ReadString(Models.Metadata.Feature.StatusKey),
                 Overall = item.ReadString(Models.Metadata.Feature.OverallKey),
             };

CrossModel/Listxml.Serializer.cs

@@ -264,7 +264,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 [Models.Metadata.Chip.NameKey] = item.Name,
                 [Models.Metadata.Chip.TagKey] = item.Tag,
-                [Models.Metadata.Chip.TypeKey] = item.Type,
+                [Models.Metadata.Chip.ChipTypeKey] = item.Type,
                 [Models.Metadata.Chip.SoundOnlyKey] = item.SoundOnly,
                 [Models.Metadata.Chip.ClockKey] = item.Clock,
             };
@@ -359,7 +359,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var control = new Models.Metadata.Control
             {
-                [Models.Metadata.Control.TypeKey] = item.Type,
+                [Models.Metadata.Control.ControlTypeKey] = item.Type,
                 [Models.Metadata.Control.PlayerKey] = item.Player,
                 [Models.Metadata.Control.ButtonsKey] = item.Buttons,
                 [Models.Metadata.Control.ReqButtonsKey] = item.ReqButtons,
@@ -382,7 +382,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var device = new Models.Metadata.Device
             {
-                [Models.Metadata.Device.TypeKey] = item.Type,
+                [Models.Metadata.Device.DeviceTypeKey] = item.Type,
                 [Models.Metadata.Device.TagKey] = item.Tag,
                 [Models.Metadata.Device.FixedImageKey] = item.FixedImage,
                 [Models.Metadata.Device.MandatoryKey] = item.Mandatory,
@@ -509,7 +509,7 @@ namespace SabreTools.Serialization.CrossModel
             var display = new Models.Metadata.Display
             {
                 [Models.Metadata.Display.TagKey] = item.Tag,
-                [Models.Metadata.Display.TypeKey] = item.Type,
+                [Models.Metadata.Display.DisplayTypeKey] = item.Type,
                 [Models.Metadata.Display.RotateKey] = item.Rotate,
                 [Models.Metadata.Display.FlipXKey] = item.FlipX,
                 [Models.Metadata.Display.WidthKey] = item.Width,
@@ -567,7 +567,7 @@ namespace SabreTools.Serialization.CrossModel
         {
             var feature = new Models.Metadata.Feature
             {
-                [Models.Metadata.Feature.TypeKey] = item.Type,
+                [Models.Metadata.Feature.FeatureTypeKey] = item.Type,
                 [Models.Metadata.Feature.StatusKey] = item.Status,
                 [Models.Metadata.Feature.OverallKey] = item.Overall,
             };

CrossModel/OpenMSX.Deserializer.cs

@@ -100,7 +100,7 @@ namespace SabreTools.Serialization.CrossModel
             var megaRom = new MegaRom
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };
@@ -128,7 +128,7 @@ namespace SabreTools.Serialization.CrossModel
             var rom = new Rom
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };
@@ -143,7 +143,7 @@ namespace SabreTools.Serialization.CrossModel
             var sccPlusCart = new SCCPlusCart
             {
                 Start = item.ReadString(Models.Metadata.Rom.StartKey),
-                Type = item.ReadString(Models.Metadata.Rom.TypeKey),
+                Type = item.ReadString(Models.Metadata.Rom.OpenMSXType),
                 Hash = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Remark = item.ReadString(Models.Metadata.Rom.RemarkKey),
             };

CrossModel/OpenMSX.Serializer.cs

@@ -118,7 +118,7 @@ namespace SabreTools.Serialization.CrossModel
             var rom = new Models.Metadata.Rom
             {
                 [Models.Metadata.Rom.StartKey] = item.Start,
-                [Models.Metadata.Rom.TypeKey] = item.Type,
+                [Models.Metadata.Rom.OpenMSXType] = item.Type,
                 [Models.Metadata.Rom.SHA1Key] = item.Hash,
                 [Models.Metadata.Rom.RemarkKey] = item.Remark,
             };

CrossModel/SeparatedValue.Deserializer.cs

@@ -21,7 +21,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 metadataFile.Row = machines
                     .Where(m => m != null)
-                    .SelectMany(ConvertMachineFromInternalModel)
+                    .SelectMany(m => ConvertMachineFromInternalModel(m, header))
                     .ToArray();
             }
 
@@ -43,7 +43,7 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Machine"/> to an array of <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Row[] ConvertMachineFromInternalModel(Models.Metadata.Machine item)
+        private static Row[] ConvertMachineFromInternalModel(Models.Metadata.Machine item, Models.Metadata.Header? header)
         {
             var rowItems = new List<Row>();
 
@@ -52,7 +52,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 rowItems.AddRange(roms
                     .Where(r => r != null)
-                    .Select(rom => ConvertFromInternalModel(rom, item)));
+                    .Select(rom => ConvertFromInternalModel(rom, item, header)));
             }
 
             var disks = item.Read<Models.Metadata.Disk[]>(Models.Metadata.Machine.DiskKey);
@@ -60,7 +60,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 rowItems.AddRange(disks
                     .Where(d => d != null)
-                    .Select(disk => ConvertFromInternalModel(disk, item)));
+                    .Select(disk => ConvertFromInternalModel(disk, item, header)));
             }
 
             var media = item.Read<Models.Metadata.Media[]>(Models.Metadata.Machine.MediaKey);
@@ -68,7 +68,7 @@ namespace SabreTools.Serialization.CrossModel
             {
                 rowItems.AddRange(media
                     .Where(m => m != null)
-                    .Select(medium => ConvertFromInternalModel(medium, item)));
+                    .Select(medium => ConvertFromInternalModel(medium, item, header)));
             }
 
             return rowItems.ToArray();
@@ -77,16 +77,26 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Disk"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Row ConvertFromInternalModel(Models.Metadata.Disk item, Models.Metadata.Machine parent)
+        private static Row ConvertFromInternalModel(Models.Metadata.Disk item, Models.Metadata.Machine parent, Models.Metadata.Header? header)
         {
             var row = new Row
             {
+                FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve
+                InternalName = header?.ReadString(Models.Metadata.Header.NameKey),
+                Description = header?.ReadString(Models.Metadata.Header.DescriptionKey),
                 GameName = parent.ReadString(Models.Metadata.Machine.NameKey),
-                Description = parent.ReadString(Models.Metadata.Machine.DescriptionKey),
+                GameDescription = parent.ReadString(Models.Metadata.Machine.DescriptionKey),
                 Type = "disk",
+                RomName = null,
                 DiskName = item.ReadString(Models.Metadata.Disk.NameKey),
+                Size = null,
+                CRC = null,
                 MD5 = item.ReadString(Models.Metadata.Disk.MD5Key),
                 SHA1 = item.ReadString(Models.Metadata.Disk.SHA1Key),
+                SHA256 = null,
+                SHA384 = null,
+                SHA512 = null,
+                SpamSum = null,
                 Status = item.ReadString(Models.Metadata.Disk.StatusKey),
             };
             return row;
@@ -95,17 +105,25 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Media"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Row ConvertFromInternalModel(Models.Metadata.Media item, Models.Metadata.Machine parent)
+        private static Row ConvertFromInternalModel(Models.Metadata.Media item, Models.Metadata.Machine parent, Models.Metadata.Header? header)
         {
             var row = new Row
             {
+                FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve
+                InternalName = header?.ReadString(Models.Metadata.Header.NameKey),
+                Description = header?.ReadString(Models.Metadata.Header.DescriptionKey),
                 GameName = parent.ReadString(Models.Metadata.Machine.NameKey),
-                Description = parent.ReadString(Models.Metadata.Machine.DescriptionKey),
+                GameDescription = parent.ReadString(Models.Metadata.Machine.DescriptionKey),
                 Type = "media",
+                RomName = null,
                 DiskName = item.ReadString(Models.Metadata.Media.NameKey),
+                Size = null,
+                CRC = null,
                 MD5 = item.ReadString(Models.Metadata.Media.MD5Key),
                 SHA1 = item.ReadString(Models.Metadata.Media.SHA1Key),
                 SHA256 = item.ReadString(Models.Metadata.Media.SHA256Key),
+                SHA384 = null,
+                SHA512 = null,
                 SpamSum = item.ReadString(Models.Metadata.Media.SpamSumKey),
             };
             return row;
@@ -114,14 +132,18 @@ namespace SabreTools.Serialization.CrossModel
         /// <summary>
         /// Convert from <cref="Models.Metadata.Rom"/> to <cref="Models.SeparatedValue.Row"/>
         /// </summary>
-        private static Row ConvertFromInternalModel(Models.Metadata.Rom item, Models.Metadata.Machine parent)
+        private static Row ConvertFromInternalModel(Models.Metadata.Rom item, Models.Metadata.Machine parent, Models.Metadata.Header? header)
         {
             var row = new Row
             {
-                GameName = parent?.ReadString(Models.Metadata.Machine.NameKey),
-                Description = parent?.ReadString(Models.Metadata.Machine.DescriptionKey),
+                FileName = header?.ReadString("FILENAME"), // TODO: Make this an actual key to retrieve
+                InternalName = header?.ReadString(Models.Metadata.Header.NameKey),
+                Description = header?.ReadString(Models.Metadata.Header.DescriptionKey),
+                GameName = parent.ReadString(Models.Metadata.Machine.NameKey),
+                GameDescription = parent.ReadString(Models.Metadata.Machine.DescriptionKey),
                 Type = "rom",
                 RomName = item.ReadString(Models.Metadata.Rom.NameKey),
+                DiskName = null,
                 Size = item.ReadString(Models.Metadata.Rom.SizeKey),
                 CRC = item.ReadString(Models.Metadata.Rom.CRCKey),
                 MD5 = item.ReadString(Models.Metadata.Rom.MD5Key),

Extensions.PortableExecutable.cs

@@ -1309,6 +1309,8 @@ namespace SabreTools.Serialization
                     }
 
                     stringTableChildren.Add(stringData);
+                    if (stringData.Length == 0 && stringData.ValueLength == 0)
+                        break;
                 }
 
                 stringTable.Children = [.. stringTableChildren];

Files/Catalog.Deserializer.cs

@@ -0,0 +1,11 @@
+using System.Text;
+
+namespace SabreTools.Serialization.Files
+{
+    public partial class Catalog : JsonFile<Models.Xbox.Catalog>
+    {
+        // Catalog.js file is a UTF-16 LE JSON
+        public new Models.Xbox.Catalog? Deserialize(string? path)
+            => Deserialize(path, new UnicodeEncoding());
+    }
+}

Files/Catalog.Serializer.cs

@@ -0,0 +1,11 @@
+using System.Text;
+
+namespace SabreTools.Serialization.Files
+{
+    public partial class Catalog : JsonFile<Models.Xbox.Catalog>
+    {
+        // Catalog.js file is a UTF-16 LE JSON
+        public new bool Serialize(Models.Xbox.Catalog? obj, string? path)
+            => Serialize(obj, path, new UnicodeEncoding());
+    }
+}

Files/JsonFile.Deserializer.cs

@@ -0,0 +1,31 @@
+using System.Text;
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Files
+{
+    /// <summary>
+    /// Base class for other JSON serializers
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class JsonFile<T> : IFileSerializer<T>
+    {
+        /// <inheritdoc/>
+        public T? Deserialize(string? path)
+            => Deserialize(path, new UTF8Encoding(false));
+
+        /// <summary>
+        /// Deserialize a file into <typeparamref name="T"/>
+        /// </summary>
+        /// <typeparam name="T">Type of object to deserialize to</typeparam>
+        /// <param name="path">Path to deserialize from</param>
+        /// <param name="encoding">Encoding to parse text as</param>
+        /// <returns>Filled object on success, null on error</returns>
+        public T? Deserialize(string? path, Encoding encoding)
+        {
+            using (var data = PathProcessor.OpenStream(path))
+            {
+                return new Streams.JsonFile<T>().Deserialize(data, encoding);
+            }
+        }
+    }
+}

Files/JsonFile.Serializer.cs

@@ -0,0 +1,40 @@
+using System.IO;
+using System.Text;
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Files
+{
+    /// <summary>
+    /// Base class for other JSON serializers
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class JsonFile<T> : IFileSerializer<T>
+    {
+        /// <inheritdoc/>
+        public bool Serialize(T? obj, string? path)
+            => Serialize(obj, path, new UTF8Encoding(false));
+
+        /// <summary>
+        /// Serialize a <typeparamref name="T"/> into a file
+        /// </summary>
+        /// <typeparam name="T">Type of object to serialize from</typeparam>
+        /// <param name="obj">Data to serialize</param>
+        /// <param name="path">Path to the file to serialize to</param>
+        /// <param name="encoding">Encoding to parse text as</param>
+        /// <returns>True on successful serialization, false otherwise</returns>
+        public bool Serialize(T? obj, string? path, Encoding encoding)
+        {
+            if (string.IsNullOrEmpty(path))
+                return false;
+
+            using var stream = new Streams.JsonFile<T>().Serialize(obj, encoding);
+            if (stream == null)
+                return false;
+
+            using var fs = File.OpenWrite(path);
+            stream.CopyTo(fs);
+
+            return true;
+        }
+    }
+}

Files/Logiqx.Serializer.cs

@@ -5,7 +5,7 @@ namespace SabreTools.Serialization.Files
     public partial class Logiqx : XmlFile<Datafile>
     {
         /// <inheritdoc cref="Serialize(Datafile, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(Datafile obj, string path)
+        public bool SerializeToFileWithDocType(Datafile? obj, string path)
             => Serialize(obj, path, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId);
     }
 }

Files/OpenMSX.Serializer.cs

@@ -5,7 +5,7 @@ namespace SabreTools.Serialization.Files
     public partial class OpenMSX : XmlFile<SoftwareDb>
     {
         /// <inheritdoc cref="Serialize(SoftwareDb, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(SoftwareDb obj, string path)
+        public bool SerializeToFileWithDocType(SoftwareDb? obj, string path)
             => Serialize(obj, path, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId);
     }
 }

Files/SoftwareList.Serializer.cs

@@ -3,7 +3,7 @@ namespace SabreTools.Serialization.Files
     public partial class SoftwareList : XmlFile<Models.SoftwareList.SoftwareList>
     {
         /// <inheritdoc cref="SerializeToFile(Models.SoftwareList.SoftwareList, string, string?, string?, string?, string?)" />
-        public bool SerializeToFileWithDocType(Models.SoftwareList.SoftwareList obj, string path)
+        public bool SerializeToFileWithDocType(Models.SoftwareList.SoftwareList? obj, string path)
             => Serialize(obj, path, Serialization.SoftawreList.DocTypeName, Serialization.SoftawreList.DocTypePubId, Serialization.SoftawreList.DocTypeSysId, Serialization.SoftawreList.DocTypeSysId);
     }
 }

Files/XmlFile.Serializer.cs

@@ -18,7 +18,6 @@ namespace SabreTools.Serialization.Files
         /// </summary>
         /// <param name="obj">Data to serialize</param>
         /// <param name="path">Path to the file to serialize to</param>
-        /// <param name="obj">Data to serialize</param>
         /// <param name="name">Optional DOCTYPE name</param>
         /// <param name="pubid">Optional DOCTYPE pubid</param>
         /// <param name="sysid">Optional DOCTYPE sysid</param>

SabreTools.Serialization.csproj

@@ -8,7 +8,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.3.2</Version>
+    <Version>1.4.2</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
@@ -27,8 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.IO" Version="1.3.0" />
-    <PackageReference Include="SabreTools.Models" Version="1.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="SabreTools.IO" Version="1.3.2" />
+    <PackageReference Include="SabreTools.Models" Version="1.4.1" />
   </ItemGroup>
 
 </Project>

Streams/AttractMode.Serializer.cs

@@ -28,6 +28,7 @@ namespace SabreTools.Serialization.Streams
             // TODO: Include flag to write out long or short header
             // Write the short header
             writer.WriteString(Serialization.AttractMode.HeaderWithoutRomname); // TODO: Convert to array of values
+            writer.WriteLine();
 
             // Write out the rows, if they exist
             WriteRows(obj.Row, writer);

Streams/Catalog.Deserializer.cs

@@ -0,0 +1,12 @@
+using System.IO;
+using System.Text;
+
+namespace SabreTools.Serialization.Streams
+{
+    public partial class Catalog : JsonFile<Models.Xbox.Catalog>
+    {
+        // Catalog JSON is encoded as UTF-16 LE
+        public new Models.Xbox.Catalog? Deserialize(Stream? data)
+            => Deserialize(data, new UnicodeEncoding());
+    }
+}

Streams/Catalog.Serializer.cs

@@ -0,0 +1,12 @@
+using System.IO;
+using System.Text;
+
+namespace SabreTools.Serialization.Streams
+{
+    public partial class Catalog : JsonFile<Models.Xbox.Catalog>
+    {
+        // Catalog JSON is encoded as UTF-16 LE
+        public new Stream? Serialize(Models.Xbox.Catalog? obj)
+            => Serialize(obj, new UnicodeEncoding());
+    }
+}

Streams/JsonFile.Deserializer.cs

@@ -0,0 +1,40 @@
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Streams
+{
+    /// <summary>
+    /// Base class for other JSON serializers
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class JsonFile<T> : IStreamSerializer<T>
+    {
+        /// <inheritdoc/>
+        public T? Deserialize(Stream? data)
+            => Deserialize(data, new UTF8Encoding(false));
+
+        /// <summary>
+        /// Deserialize a Stream into <typeparamref name="T"/>
+        /// </summary>
+        /// <typeparam name="T">Type of object to deserialize to</typeparam>
+        /// <param name="data">Stream to parse</param>
+        /// <param name="encoding">Text encoding to use</param>
+        /// <returns>Filled object on success, null on error</returns>
+        public T? Deserialize(Stream? data, Encoding encoding)
+        {
+            // If the stream is null
+            if (data == null)
+                return default;
+
+            // Setup the serializer and the reader
+            var serializer = JsonSerializer.Create();
+            var streamReader = new StreamReader(data, encoding);
+            var jsonReader = new JsonTextReader(streamReader);
+
+            // Perform the deserialization and return
+            return serializer.Deserialize<T>(jsonReader);
+        }
+    }
+}

Streams/JsonFile.Serializer.cs

@@ -0,0 +1,43 @@
+using System.IO;
+using System.Text;
+using Newtonsoft.Json;
+using SabreTools.Serialization.Interfaces;
+
+namespace SabreTools.Serialization.Streams
+{
+    /// <summary>
+    /// Base class for other JSON serializers
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public partial class JsonFile<T> : IStreamSerializer<T>
+    {
+        /// <inheritdoc/>
+        public Stream? Serialize(T? obj)
+            => Serialize(obj, new UTF8Encoding(false));
+
+        /// <summary>
+        /// Serialize a <typeparamref name="T"/> into a Stream
+        /// </summary>
+        /// <typeparam name="T">Type of object to serialize from</typeparam>
+        /// <param name="obj">Data to serialize</param>
+        /// <param name="encoding"></param>
+        /// <returns>Filled object on success, null on error</returns>
+        public Stream? Serialize(T? obj, Encoding encoding)
+        {
+            // If the object is null
+            if (obj == null)
+                return null;
+
+            // Setup the serializer and the writer
+            var serializer = JsonSerializer.Create();
+            var stream = new MemoryStream();
+            var streamWriter = new StreamWriter(stream, encoding);
+            var jsonWriter = new JsonTextWriter(streamWriter);
+
+            // Perform the deserialization and return
+            serializer.Serialize(jsonWriter, obj);
+            stream.Seek(0, SeekOrigin.Begin);
+            return stream;
+        }
+    }
+}

Streams/LinearExecutable.Deserializer.cs

@@ -424,7 +424,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled information block on success, null on error</returns>
-        private static InformationBlock? ParseInformationBlock(Stream data)
+        public static InformationBlock? ParseInformationBlock(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var informationBlock = new InformationBlock();
@@ -491,7 +491,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled object table entry on success, null on error</returns>
-        private static ObjectTableEntry ParseObjectTableEntry(Stream data)
+        public static ObjectTableEntry ParseObjectTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ObjectTableEntry();
@@ -511,7 +511,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled object page map entry on success, null on error</returns>
-        private static ObjectPageMapEntry ParseObjectPageMapEntry(Stream data)
+        public static ObjectPageMapEntry ParseObjectPageMapEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ObjectPageMapEntry();
@@ -528,7 +528,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled resource table entry on success, null on error</returns>
-        private static ResourceTableEntry ParseResourceTableEntry(Stream data)
+        public static ResourceTableEntry ParseResourceTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ResourceTableEntry();
@@ -547,7 +547,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled resident names table entry on success, null on error</returns>
-        private static ResidentNamesTableEntry ParseResidentNamesTableEntry(Stream data)
+        public static ResidentNamesTableEntry ParseResidentNamesTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ResidentNamesTableEntry();
@@ -569,7 +569,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled entry table bundle on success, null on error</returns>
-        private static EntryTableBundle? ParseEntryTableBundle(Stream data)
+        public static EntryTableBundle? ParseEntryTableBundle(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var bundle = new EntryTableBundle();
@@ -632,7 +632,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled module format directives table entry on success, null on error</returns>
-        private static ModuleFormatDirectivesTableEntry ParseModuleFormatDirectivesTableEntry(Stream data)
+        public static ModuleFormatDirectivesTableEntry ParseModuleFormatDirectivesTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ModuleFormatDirectivesTableEntry();
@@ -649,7 +649,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled verify record directive table entry on success, null on error</returns>
-        private static VerifyRecordDirectiveTableEntry ParseVerifyRecordDirectiveTableEntry(Stream data)
+        public static VerifyRecordDirectiveTableEntry ParseVerifyRecordDirectiveTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new VerifyRecordDirectiveTableEntry();
@@ -670,7 +670,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled fix-up page table entry on success, null on error</returns>
-        private static FixupPageTableEntry ParseFixupPageTableEntry(Stream data)
+        public static FixupPageTableEntry ParseFixupPageTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new FixupPageTableEntry();
@@ -685,7 +685,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled fix-up record table entry on success, null on error</returns>
-        private static FixupRecordTableEntry? ParseFixupRecordTableEntry(Stream data)
+        public static FixupRecordTableEntry? ParseFixupRecordTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new FixupRecordTableEntry();
@@ -904,7 +904,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled import module name table entry on success, null on error</returns>
-        private static ImportModuleNameTableEntry ParseImportModuleNameTableEntry(Stream data)
+        public static ImportModuleNameTableEntry ParseImportModuleNameTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ImportModuleNameTableEntry();
@@ -925,7 +925,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled import module name table entry on success, null on error</returns>
-        private static ImportModuleProcedureNameTableEntry ParseImportModuleProcedureNameTableEntry(Stream data)
+        public static ImportModuleProcedureNameTableEntry ParseImportModuleProcedureNameTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new ImportModuleProcedureNameTableEntry();
@@ -946,7 +946,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled per-page checksum table entry on success, null on error</returns>
-        private static PerPageChecksumTableEntry ParsePerPageChecksumTableEntry(Stream data)
+        public static PerPageChecksumTableEntry ParsePerPageChecksumTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new PerPageChecksumTableEntry();
@@ -961,7 +961,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled non-resident names table entry on success, null on error</returns>
-        private static NonResidentNamesTableEntry ParseNonResidentNameTableEntry(Stream data)
+        public static NonResidentNamesTableEntry ParseNonResidentNameTableEntry(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var entry = new NonResidentNamesTableEntry();
@@ -984,7 +984,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="size">Total size of the debug information</param>
         /// <returns>Filled debug information on success, null on error</returns>
-        private static DebugInformation? ParseDebugInformation(Stream data, long size)
+        public static DebugInformation? ParseDebugInformation(Stream data, long size)
         {
             // TODO: Use marshalling here instead of building
             var debugInformation = new DebugInformation();

Streams/NewExecutable.Deserializer.cs

@@ -213,7 +213,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled executable header on success, null on error</returns>
-        private static ExecutableHeader? ParseExecutableHeader(Stream data)
+        public static ExecutableHeader? ParseExecutableHeader(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var header = new ExecutableHeader();
@@ -266,7 +266,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="count">Number of segment table entries to read</param>
         /// <returns>Filled segment table on success, null on error</returns>
-        private static SegmentTableEntry[] ParseSegmentTable(Stream data, int count)
+        public static SegmentTableEntry[] ParseSegmentTable(Stream data, int count)
         {
             // TODO: Use marshalling here instead of building
             var segmentTable = new SegmentTableEntry[count];
@@ -290,7 +290,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="count">Number of resource table entries to read</param>
         /// <returns>Filled resource table on success, null on error</returns>
-        private static ResourceTable ParseResourceTable(Stream data, int count)
+        public static ResourceTable ParseResourceTable(Stream data, int count)
         {
             long initialOffset = data.Position;
 
@@ -355,7 +355,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="endOffset">First address not part of the resident-name table</param>
         /// <returns>Filled resident-name table on success, null on error</returns>
-        private static ResidentNameTableEntry[] ParseResidentNameTable(Stream data, int endOffset)
+        public static ResidentNameTableEntry[] ParseResidentNameTable(Stream data, int endOffset)
         {
             // TODO: Use marshalling here instead of building
             var residentNameTable = new List<ResidentNameTableEntry>();
@@ -378,7 +378,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="count">Number of module-reference table entries to read</param>
         /// <returns>Filled module-reference table on success, null on error</returns>
-        private static ModuleReferenceTableEntry[] ParseModuleReferenceTable(Stream data, int count)
+        public static ModuleReferenceTableEntry[] ParseModuleReferenceTable(Stream data, int count)
         {
             // TODO: Use marshalling here instead of building
             var moduleReferenceTable = new ModuleReferenceTableEntry[count];
@@ -399,7 +399,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="endOffset">First address not part of the imported-name table</param>
         /// <returns>Filled imported-name table on success, null on error</returns>
-        private static Dictionary<ushort, ImportedNameTableEntry?> ParseImportedNameTable(Stream data, int endOffset)
+        public static Dictionary<ushort, ImportedNameTableEntry?> ParseImportedNameTable(Stream data, int endOffset)
         {
             // TODO: Use marshalling here instead of building
             var importedNameTable = new Dictionary<ushort, ImportedNameTableEntry?>();
@@ -422,7 +422,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="endOffset">First address not part of the entry table</param>
         /// <returns>Filled entry table on success, null on error</returns>
-        private static EntryTableBundle[] ParseEntryTable(Stream data, int endOffset)
+        public static EntryTableBundle[] ParseEntryTable(Stream data, int endOffset)
         {
             // TODO: Use marshalling here instead of building
             var entryTable = new List<EntryTableBundle>();
@@ -461,7 +461,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="endOffset">First address not part of the nonresident-name table</param>
         /// <returns>Filled nonresident-name table on success, null on error</returns>
-        private static NonResidentNameTableEntry[] ParseNonResidentNameTable(Stream data, int endOffset)
+        public static NonResidentNameTableEntry[] ParseNonResidentNameTable(Stream data, int endOffset)
         {
             // TODO: Use marshalling here instead of building
             var residentNameTable = new List<NonResidentNameTableEntry>();

Streams/PortableExecutable.Deserializer.cs

@@ -292,7 +292,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled executable header on success, null on error</returns>
-        private static COFFFileHeader ParseCOFFFileHeader(Stream data)
+        public static COFFFileHeader ParseCOFFFileHeader(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var fileHeader = new COFFFileHeader();
@@ -314,7 +314,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="optionalSize">Size of the optional header</param>
         /// <returns>Filled optional header on success, null on error</returns>
-        private static OptionalHeader ParseOptionalHeader(Stream data, int optionalSize)
+        public static OptionalHeader ParseOptionalHeader(Stream data, int optionalSize)
         {
             long initialOffset = data.Position;
 
@@ -484,7 +484,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="count">Number of section table entries to read</param>
         /// <returns>Filled section table on success, null on error</returns>
-        private static SectionHeader[] ParseSectionTable(Stream data, int count)
+        public static SectionHeader[] ParseSectionTable(Stream data, int count)
         {
             // TODO: Use marshalling here instead of building
             var sectionTable = new SectionHeader[count];
@@ -524,7 +524,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="count">Number of COFF symbol table entries to read</param>
         /// <returns>Filled COFF symbol table on success, null on error</returns>
-        private static COFFSymbolTableEntry[] ParseCOFFSymbolTable(Stream data, uint count)
+        public static COFFSymbolTableEntry[] ParseCOFFSymbolTable(Stream data, uint count)
         {
             // TODO: Use marshalling here instead of building
             var coffSymbolTable = new COFFSymbolTableEntry[count];
@@ -681,7 +681,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled COFF string table on success, null on error</returns>
-        private static COFFStringTable ParseCOFFStringTable(Stream data)
+        public static COFFStringTable ParseCOFFStringTable(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var coffStringTable = new COFFStringTable();
@@ -712,7 +712,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="endOffset">First address not part of the attribute certificate table</param>
         /// <returns>Filled attribute certificate on success, null on error</returns>
-        private static AttributeCertificateTableEntry[] ParseAttributeCertificateTable(Stream data, int endOffset)
+        public static AttributeCertificateTableEntry[] ParseAttributeCertificateTable(Stream data, int endOffset)
         {
             var attributeCertificateTable = new List<AttributeCertificateTableEntry>();
 
@@ -743,7 +743,7 @@ namespace SabreTools.Serialization.Streams
         /// </summary>
         /// <param name="data">Stream to parse</param>
         /// <returns>Filled delay-load directory table on success, null on error</returns>
-        private static DelayLoadDirectoryTable ParseDelayLoadDirectoryTable(Stream data)
+        public static DelayLoadDirectoryTable ParseDelayLoadDirectoryTable(Stream data)
         {
             // TODO: Use marshalling here instead of building
             var delayLoadDirectoryTable = new DelayLoadDirectoryTable();
@@ -767,7 +767,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="endOffset">First address not part of the base relocation table</param>
         /// <param name="sections">Section table to use for virtual address translation</param>
         /// <returns>Filled base relocation table on success, null on error</returns>
-        private static BaseRelocationBlock[] ParseBaseRelocationTable(Stream data, int endOffset, SectionHeader?[] sections)
+        public static BaseRelocationBlock[] ParseBaseRelocationTable(Stream data, int endOffset, SectionHeader?[] sections)
         {
             // TODO: Use marshalling here instead of building
             var baseRelocationTable = new List<BaseRelocationBlock>();
@@ -808,7 +808,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="endOffset">First address not part of the debug table</param>
         /// <param name="sections">Section table to use for virtual address translation</param>
         /// <returns>Filled debug table on success, null on error</returns>
-        private static DebugTable ParseDebugTable(Stream data, int endOffset, SectionHeader?[] sections)
+        public static DebugTable ParseDebugTable(Stream data, int endOffset, SectionHeader?[] sections)
         {
             // TODO: Use marshalling here instead of building
             var debugTable = new DebugTable();
@@ -845,7 +845,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="data">Stream to parse</param>
         /// <param name="sections">Section table to use for virtual address translation</param>
         /// <returns>Filled export table on success, null on error</returns>
-        private static ExportTable ParseExportTable(Stream data, SectionHeader?[] sections)
+        public static ExportTable ParseExportTable(Stream data, SectionHeader?[] sections)
         {
             // TODO: Use marshalling here instead of building
             var exportTable = new ExportTable();
@@ -962,7 +962,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="magic">Optional header magic number indicating PE32 or PE32+</param>
         /// <param name="sections">Section table to use for virtual address translation</param>
         /// <returns>Filled import table on success, null on error</returns>
-        private static ImportTable ParseImportTable(Stream data, OptionalHeaderMagicNumber magic, SectionHeader?[] sections)
+        public static ImportTable ParseImportTable(Stream data, OptionalHeaderMagicNumber magic, SectionHeader?[] sections)
         {
             // TODO: Use marshalling here instead of building
             var importTable = new ImportTable();
@@ -1187,7 +1187,7 @@ namespace SabreTools.Serialization.Streams
         /// <param name="sections">Section table to use for virtual address translation</param>
         /// <param name="topLevel">Indicates if this is the top level or not</param>
         /// <returns>Filled resource directory table on success, null on error</returns>
-        private static ResourceDirectoryTable? ParseResourceDirectoryTable(Stream data, long initialOffset, SectionHeader?[] sections, bool topLevel = false)
+        public static ResourceDirectoryTable? ParseResourceDirectoryTable(Stream data, long initialOffset, SectionHeader?[] sections, bool topLevel = false)
         {
             // TODO: Use marshalling here instead of building
             var resourceDirectoryTable = new ResourceDirectoryTable();

Streams/RomCenter.Serializer.cs

@@ -48,15 +48,22 @@ namespace SabreTools.Serialization.Streams
             if (credits == null)
                 return;
 
-            writer.WriteSection("credits");
+            writer.WriteSection("CREDITS");
 
-            writer.WriteKeyValuePair("author", credits.Author);
-            writer.WriteKeyValuePair("version", credits.Version);
-            writer.WriteKeyValuePair("email", credits.Email);
-            writer.WriteKeyValuePair("homepage", credits.Homepage);
-            writer.WriteKeyValuePair("url", credits.Url);
-            writer.WriteKeyValuePair("date", credits.Date);
-            writer.WriteKeyValuePair("comment", credits.Comment);
+            if (credits.Author != null)
+                writer.WriteKeyValuePair("Author", credits.Author);
+            if (credits.Version != null)
+                writer.WriteKeyValuePair("Version", credits.Version);
+            if (credits.Email != null)
+                writer.WriteKeyValuePair("Email", credits.Email);
+            if (credits.Homepage != null)
+                writer.WriteKeyValuePair("Homepage", credits.Homepage);
+            if (credits.Url != null)
+                writer.WriteKeyValuePair("Url", credits.Url);
+            if (credits.Date != null)
+                writer.WriteKeyValuePair("Date", credits.Date);
+            if (credits.Comment != null)
+                writer.WriteKeyValuePair("Comment", credits.Comment);
             writer.WriteLine();
 
             writer.Flush();
@@ -73,12 +80,16 @@ namespace SabreTools.Serialization.Streams
             if (dat == null)
                 return;
 
-            writer.WriteSection("dat");
+            writer.WriteSection("DAT");
 
-            writer.WriteKeyValuePair("version", dat.Version);
-            writer.WriteKeyValuePair("plugin", dat.Plugin);
-            writer.WriteKeyValuePair("split", dat.Split);
-            writer.WriteKeyValuePair("merge", dat.Merge);
+            if (dat.Version != null)
+                writer.WriteKeyValuePair("Version", dat.Version);
+            if (dat.Plugin != null)
+                writer.WriteKeyValuePair("Plugin", dat.Plugin);
+            if (dat.Split != null)
+                writer.WriteKeyValuePair("Split", dat.Split);
+            if (dat.Merge != null)
+                writer.WriteKeyValuePair("Merge", dat.Merge);
             writer.WriteLine();
 
             writer.Flush();
@@ -95,10 +106,12 @@ namespace SabreTools.Serialization.Streams
             if (emulator == null)
                 return;
 
-            writer.WriteSection("emulator");
+            writer.WriteSection("EMULATOR");
 
-            writer.WriteKeyValuePair("refname", emulator.RefName);
-            writer.WriteKeyValuePair("version", emulator.Version);
+            if (emulator.RefName != null)
+                writer.WriteKeyValuePair("refname", emulator.RefName);
+            if (emulator.Version != null)
+                writer.WriteKeyValuePair("version", emulator.Version);
             writer.WriteLine();
 
             writer.Flush();
@@ -115,7 +128,7 @@ namespace SabreTools.Serialization.Streams
             if (games?.Rom == null || !games.Rom.Any())
                 return;
 
-            writer.WriteSection("games");
+            writer.WriteSection("GAMES");
 
             foreach (var rom in games.Rom)
             {

Streams/XmlFile.Serializer.cs

@@ -35,7 +35,7 @@ namespace SabreTools.Serialization.Streams
             if (obj == null)
                 return null;
 
-            // Setup the serializer and the reader
+            // Setup the serializer and the writer
             var serializer = new XmlSerializer(typeof(T));
             var settings = new XmlWriterSettings
             {