Bump version

SabreTools.Printing/Interfaces/IPrinter.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Interfaces
 {
     /// <summary>
     /// Marks a class as a printer associated with a model

SabreTools.Printing/PrintExtensions.cs

@@ -0,0 +1,430 @@
+using System;
+using System.Text;
+using SabreTools.Printing.Printers;
+using SabreTools.Serialization.Interfaces;
+using Wrapper = SabreTools.Serialization.Wrappers;
+
+namespace SabreTools.Printing
+{
+    /// <summary>
+    /// Generic wrapper around printing methods
+    /// </summary>
+    public static class PrintExtensions
+    {
+        /// <summary>
+        /// Print the item information from a wrapper to console as
+        /// pretty-printed text
+        /// </summary>
+        public static void PrintToConsole(this IWrapper wrapper)
+        {
+            var sb = wrapper.ExportStringBuilder();
+            if (sb == null)
+            {
+                Console.WriteLine("No item information could be generated");
+                return;
+            }
+
+            Console.WriteLine(sb.ToString());
+        }
+
+        /// <summary>
+        /// Export the item information as a StringBuilder
+        /// </summary>
+        public static StringBuilder? ExportStringBuilder(this IWrapper wrapper)
+        {
+            return wrapper switch
+            {
+                Wrapper.AACSMediaKeyBlock item => item.PrettyPrint(),
+                Wrapper.BDPlusSVM item => item.PrettyPrint(),
+                Wrapper.BFPK item => item.PrettyPrint(),
+                Wrapper.BSP item => item.PrettyPrint(),
+                Wrapper.CFB item => item.PrettyPrint(),
+                Wrapper.CIA item => item.PrettyPrint(),
+                Wrapper.GCF item => item.PrettyPrint(),
+                Wrapper.InstallShieldCabinet item => item.PrettyPrint(),
+                Wrapper.IRD item => item.PrettyPrint(),
+                Wrapper.LinearExecutable item => item.PrettyPrint(),
+                Wrapper.MicrosoftCabinet item => item.PrettyPrint(),
+                Wrapper.MoPaQ item => item.PrettyPrint(),
+                Wrapper.MSDOS item => item.PrettyPrint(),
+                Wrapper.N3DS item => item.PrettyPrint(),
+                Wrapper.NCF item => item.PrettyPrint(),
+                Wrapper.NewExecutable item => item.PrettyPrint(),
+                Wrapper.Nitro item => item.PrettyPrint(),
+                Wrapper.PAK item => item.PrettyPrint(),
+                Wrapper.PFF item => item.PrettyPrint(),
+                Wrapper.PIC item => item.PrettyPrint(),
+                Wrapper.PlayJAudioFile item => item.PrettyPrint(),
+                Wrapper.PlayJPlaylist item => item.PrettyPrint(),
+                Wrapper.PortableExecutable item => item.PrettyPrint(),
+                Wrapper.Quantum item => item.PrettyPrint(),
+                Wrapper.SGA item => item.PrettyPrint(),
+                Wrapper.VBSP item => item.PrettyPrint(),
+                Wrapper.VPK item => item.PrettyPrint(),
+                Wrapper.WAD item => item.PrettyPrint(),
+                Wrapper.XeMID item => item.PrettyPrint(),
+                Wrapper.XMID item => item.PrettyPrint(),
+                Wrapper.XZP item => item.PrettyPrint(),
+                _ => null,
+            };
+        }
+
+#if NET6_0_OR_GREATER
+        /// <summary>
+        /// Export the item information as JSON
+        /// </summary>
+        public static string ExportJSON(this IWrapper wrapper)
+        {
+            return wrapper switch
+            {
+                Wrapper.AACSMediaKeyBlock item => item.ExportJSON(),
+                Wrapper.BDPlusSVM item => item.ExportJSON(),
+                Wrapper.BFPK item => item.ExportJSON(),
+                Wrapper.BSP item => item.ExportJSON(),
+                Wrapper.CFB item => item.ExportJSON(),
+                Wrapper.CIA item => item.ExportJSON(),
+                Wrapper.GCF item => item.ExportJSON(),
+                Wrapper.InstallShieldCabinet item => item.ExportJSON(),
+                Wrapper.IRD item => item.ExportJSON(),
+                Wrapper.LinearExecutable item => item.ExportJSON(),
+                Wrapper.MicrosoftCabinet item => item.ExportJSON(),
+                Wrapper.MoPaQ item => item.ExportJSON(),
+                Wrapper.MSDOS item => item.ExportJSON(),
+                Wrapper.N3DS item => item.ExportJSON(),
+                Wrapper.NCF item => item.ExportJSON(),
+                Wrapper.NewExecutable item => item.ExportJSON(),
+                Wrapper.Nitro item => item.ExportJSON(),
+                Wrapper.PAK item => item.ExportJSON(),
+                Wrapper.PFF item => item.ExportJSON(),
+                Wrapper.PIC item => item.ExportJSON(),
+                Wrapper.PlayJAudioFile item => item.ExportJSON(),
+                Wrapper.PlayJPlaylist item => item.ExportJSON(),
+                Wrapper.PortableExecutable item => item.ExportJSON(),
+                Wrapper.Quantum item => item.ExportJSON(),
+                Wrapper.SGA item => item.ExportJSON(),
+                Wrapper.VBSP item => item.ExportJSON(),
+                Wrapper.VPK item => item.ExportJSON(),
+                Wrapper.WAD item => item.ExportJSON(),
+                Wrapper.XeMID item => item.ExportJSON(),
+                Wrapper.XMID item => item.ExportJSON(),
+                Wrapper.XZP item => item.ExportJSON(),
+                _ => string.Empty,
+            };
+        }
+#endif
+
+        #region Static Printing Implementations
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.AACSMediaKeyBlock item)
+        {
+            var builder = new StringBuilder();
+            AACSMediaKeyBlock.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.BDPlusSVM item)
+        {
+            var builder = new StringBuilder();
+            BDPlusSVM.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.BFPK item)
+        {
+            var builder = new StringBuilder();
+            BFPK.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.BSP item)
+        {
+            var builder = new StringBuilder();
+            BSP.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.CFB item)
+        {
+            var builder = new StringBuilder();
+            CFB.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.CIA item)
+        {
+            var builder = new StringBuilder();
+            CIA.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.GCF item)
+        {
+            var builder = new StringBuilder();
+            GCF.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.InstallShieldCabinet item)
+        {
+            var builder = new StringBuilder();
+            InstallShieldCabinet.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.IRD item)
+        {
+            var builder = new StringBuilder();
+            IRD.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.LinearExecutable item)
+        {
+            var builder = new StringBuilder();
+            LinearExecutable.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.MicrosoftCabinet item)
+        {
+            var builder = new StringBuilder();
+            MicrosoftCabinet.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.MoPaQ item)
+        {
+            var builder = new StringBuilder();
+            MoPaQ.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.MSDOS item)
+        {
+            var builder = new StringBuilder();
+            MSDOS.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.N3DS item)
+        {
+            var builder = new StringBuilder();
+            N3DS.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.NCF item)
+        {
+            var builder = new StringBuilder();
+            NCF.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.NewExecutable item)
+        {
+            var builder = new StringBuilder();
+            NewExecutable.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.Nitro item)
+        {
+            var builder = new StringBuilder();
+            Nitro.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PAK item)
+        {
+            var builder = new StringBuilder();
+            PAK.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PFF item)
+        {
+            var builder = new StringBuilder();
+            PFF.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PIC item)
+        {
+            var builder = new StringBuilder();
+            PIC.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PlayJAudioFile item)
+        {
+            var builder = new StringBuilder();
+            PlayJAudioFile.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PlayJPlaylist item)
+        {
+            var builder = new StringBuilder();
+            PlayJPlaylist.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.PortableExecutable item)
+        {
+            var builder = new StringBuilder();
+            PortableExecutable.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.Quantum item)
+        {
+            var builder = new StringBuilder();
+            Quantum.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.SGA item)
+        {
+            var builder = new StringBuilder();
+            SGA.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.VBSP item)
+        {
+            var builder = new StringBuilder();
+            VBSP.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.VPK item)
+        {
+            var builder = new StringBuilder();
+            VPK.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.WAD item)
+        {
+            var builder = new StringBuilder();
+            WAD.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.XeMID item)
+        {
+            var builder = new StringBuilder();
+            XeMID.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.XMID item)
+        {
+            var builder = new StringBuilder();
+            XMID.Print(builder, item.Model);
+            return builder;
+        }
+
+        /// <summary>
+        /// Export the item information as pretty-printed text
+        /// </summary>
+        private static StringBuilder PrettyPrint(this Wrapper.XZP item)
+        {
+            var builder = new StringBuilder();
+            XZP.Print(builder, item.Model);
+            return builder;
+        }
+
+        #endregion
+    }
+}

SabreTools.Printing/Printers/AACSMediaKeyBlock.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.AACS;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class AACSMediaKeyBlock : IPrinter<MediaKeyBlock>
     {

SabreTools.Printing/Printers/BDPlusSVM.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.BDPlus;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class BDPlusSVM : IPrinter<SVM>
     {

SabreTools.Printing/Printers/BFPK.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.BFPK;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class BFPK : IPrinter<Archive>
     {

SabreTools.Printing/Printers/BSP.cs

@@ -1,8 +1,9 @@
 using System.Text;
 using SabreTools.Models.BSP;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Models.BSP.Constants;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class BSP : IPrinter<File>
     {

SabreTools.Printing/Printers/CFB.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Text;
 using SabreTools.Models.CFB;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class CFB : IPrinter<Binary>
     {

SabreTools.Printing/Printers/CIA.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.N3DS;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class CIA : IPrinter<Models.N3DS.CIA>
     {

SabreTools.Printing/Printers/GCF.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.GCF;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class GCF : IPrinter<File>
     {

SabreTools.Printing/Printers/IRD.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.IRD;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class IRD : IPrinter<File>
     {

SabreTools.Printing/Printers/InstallShieldCabinet.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
 using SabreTools.Models.InstallShieldCabinet;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class InstallShieldCabinet : IPrinter<Cabinet>
     {

SabreTools.Printing/Printers/LinearExecutable.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.LinearExecutable;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class LinearExecutable : IPrinter<Executable>
     {

SabreTools.Printing/Printers/MSDOS.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.MSDOS;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class MSDOS : IPrinter<Executable>
     {

SabreTools.Printing/Printers/MicrosoftCabinet.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.MicrosoftCabinet;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class MicrosoftCabinet : IPrinter<Cabinet>
     {

SabreTools.Printing/Printers/MoPaQ.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.MoPaQ;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class MoPaQ : IPrinter<Archive>
     {

SabreTools.Printing/Printers/N3DS.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.N3DS;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class N3DS : IPrinter<Cart>
     {

SabreTools.Printing/Printers/NCF.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.NCF;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class NCF : IPrinter<File>
     {

SabreTools.Printing/Printers/NewExecutable.cs

@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using System.Text;
 using SabreTools.Models.NewExecutable;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Serialization.Extensions;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class NewExecutable : IPrinter<Executable>
     {

SabreTools.Printing/Printers/Nitro.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.Nitro;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class Nitro : IPrinter<Cart>
     {

SabreTools.Printing/Printers/PAK.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.PAK;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class PAK : IPrinter<File>
     {

SabreTools.Printing/Printers/PFF.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.PFF;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class PFF : IPrinter<Archive>
     {

SabreTools.Printing/Printers/PIC.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.PIC;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class PIC : IPrinter<DiscInformation>
     {

SabreTools.Printing/Printers/PlayJAudioFile.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.PlayJ;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class PlayJAudioFile : IPrinter<AudioFile>
     {

SabreTools.Printing/Printers/PlayJPlaylist.cs

@@ -1,9 +1,10 @@
 using System.Text;
 using SabreTools.Models.PlayJ;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
-    public class PlayJAudioPlaylist : IPrinter<Playlist>
+    public class PlayJPlaylist : IPrinter<Playlist>
     {
         /// <inheritdoc/>
         public void PrintInformation(StringBuilder builder, Playlist model)

SabreTools.Printing/Printers/PortableExecutable.cs

@@ -4,11 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Xml;
 using SabreTools.ASN1;
-using SabreTools.IO;
+using SabreTools.IO.Extensions;
 using SabreTools.Models.PortableExecutable;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Serialization.Extensions;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class PortableExecutable : IPrinter<Executable>
     {

SabreTools.Printing/Printers/Quantum.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.Quantum;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class Quantum : IPrinter<Archive>
     {

SabreTools.Printing/Printers/SGA.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.SGA;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class SGA : IPrinter<File>
     {

SabreTools.Printing/Printers/VBSP.cs

@@ -1,8 +1,9 @@
 using System.Text;
 using SabreTools.Models.VBSP;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Models.VBSP.Constants;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class VBSP : IPrinter<File>
     {

SabreTools.Printing/Printers/VPK.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.VPK;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class VPK : IPrinter<File>
     {

SabreTools.Printing/Printers/WAD.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.WAD;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class WAD : IPrinter<File>
     {

SabreTools.Printing/Printers/XMID.cs

@@ -1,7 +1,8 @@
 using System.Text;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Models.Xbox.Constants;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class XMID : IPrinter<Models.Xbox.XMID>
     {

SabreTools.Printing/Printers/XZP.cs

@@ -1,7 +1,8 @@
 using System.Text;
 using SabreTools.Models.XZP;
+using SabreTools.Printing.Interfaces;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class XZP : IPrinter<File>
     {

SabreTools.Printing/Printers/XeMID.cs

@@ -1,7 +1,8 @@
 using System.Text;
+using SabreTools.Printing.Interfaces;
 using static SabreTools.Models.Xbox.Constants;
 
-namespace SabreTools.Printing
+namespace SabreTools.Printing.Printers
 {
     public class XeMID : IPrinter<Models.Xbox.XeMID>
     {

SabreTools.Printing/SabreTools.Printing.csproj

@@ -7,7 +7,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.3.5</Version>
+    <Version>1.3.6</Version>
 
     <!-- Package Properties -->
     <Authors>Matt Nadareski</Authors>
@@ -27,9 +27,9 @@
 
   <ItemGroup>
     <PackageReference Include="SabreTools.ASN1" Version="1.3.1" />
-    <PackageReference Include="SabreTools.IO" Version="1.3.3" />
+    <PackageReference Include="SabreTools.IO" Version="1.3.6" />
     <PackageReference Include="SabreTools.Models" Version="1.4.2" />
-    <PackageReference Include="SabreTools.Serialization" Version="1.5.0" />
+    <PackageReference Include="SabreTools.Serialization" Version="1.5.2" />
   </ItemGroup>
   
 </Project>

SabreTools.Printing/StringBuilderExtensions.cs

@@ -5,7 +5,7 @@ using System.Text;
 namespace SabreTools.Printing
 {
     // TODO: Add extension for printing enums, if possible
-    internal static class Extensions
+    internal static class StringBuilderExtensions
     {
         /// <summary>
         /// Append a line containing a boolean to a StringBuilder