From bfee7dd449dd91ca6f2e9758827d278f07e3711d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 3 Apr 2024 16:35:54 -0400 Subject: [PATCH] Use better naming --- .../Bytes/AACS.Deserializer.cs | 10 ++++----- .../Bytes/BDPlus.Deserializer.cs | 10 ++++----- .../Bytes/BFPK.Deserializer.cs | 10 ++++----- .../Bytes/BSP.Deserializer.cs | 10 ++++----- .../Bytes/CFB.Deserializer.cs | 10 ++++----- .../Bytes/CIA.Deserializer.cs | 10 ++++----- .../Bytes/GCF.Deserializer.cs | 10 ++++----- .../Bytes/IRD.Deserializer.cs | 10 ++++----- .../InstallShieldCabinet.Deserializer.cs | 10 ++++----- .../Bytes/LinearExecutable.Deserializer.cs | 10 ++++----- .../Bytes/MSDOS.Deserializer.cs | 10 ++++----- .../Bytes/MicrosoftCabinet.Deserializer.cs | 10 ++++----- .../Bytes/MoPaQ.Deserializer.cs | 10 ++++----- .../Bytes/N3DS.Deserializer.cs | 10 ++++----- .../Bytes/NCF.Deserializer.cs | 10 ++++----- .../Bytes/NewExecutable.Deserializer.cs | 10 ++++----- .../Bytes/Nitro.Deserializer.cs | 10 ++++----- .../Bytes/PAK.Deserializer.cs | 10 ++++----- .../Bytes/PFF.Deserializer.cs | 10 ++++----- .../Bytes/PlayJAudio.Deserializer.cs | 10 ++++----- .../Bytes/PlayJPlaylist.Deserializer.cs | 10 ++++----- .../Bytes/PortableExecutable.Deserializer.cs | 10 ++++----- .../Bytes/Quantum.Deserializer.cs | 10 ++++----- .../Bytes/SGA.Deserializer.cs | 10 ++++----- .../Bytes/VBSP.Deserializer.cs | 10 ++++----- .../Bytes/VPK.Deserializer.cs | 10 ++++----- .../Bytes/WAD.Deserializer.cs | 10 ++++----- .../Bytes/XZP.Deserializer.cs | 10 ++++----- .../Files/AACS.Deserializer.cs | 8 +++---- .../Files/AACS.Serializer.cs | 10 ++++----- .../Files/ArchiveDotOrg.Deserializer.cs | 4 ++-- .../Files/ArchiveDotOrg.Serializer.cs | 6 ++--- .../Files/AttractMode.Deserializer.cs | 8 +++---- .../Files/AttractMode.Serializer.cs | 10 ++++----- .../Files/BDPlus.Deserializer.cs | 8 +++---- .../Files/BDPlus.Serializer.cs | 10 ++++----- .../Files/BFPK.Deserializer.cs | 8 +++---- .../Files/BFPK.Serializer.cs | 10 ++++----- .../Files/BSP.Deserializer.cs | 8 +++---- .../Files/BSP.Serializer.cs | 10 ++++----- .../Files/CFB.Deserializer.cs | 8 +++---- .../Files/CFB.Serializer.cs | 10 ++++----- .../Files/CIA.Deserializer.cs | 8 +++---- .../Files/CIA.Serializer.cs | 10 ++++----- .../Files/Catalog.Deserializer.cs | 8 +++---- .../Files/Catalog.Serializer.cs | 10 ++++----- .../Files/ClrMamePro.Deserializer.cs | 12 +++++----- .../Files/ClrMamePro.Serializer.cs | 22 +++++++++---------- .../Files/CueSheet.Deserializer.cs | 8 +++---- .../Files/CueSheet.Serializer.cs | 10 ++++----- .../Files/DosCenter.Deserializer.cs | 8 +++---- .../Files/DosCenter.Serializer.cs | 10 ++++----- .../Files/EverdriveSMDB.Deserializer.cs | 8 +++---- .../Files/EverdriveSMDB.Serializer.cs | 10 ++++----- .../Files/GCF.Deserializer.cs | 8 +++---- .../Files/GCF.Serializer.cs | 10 ++++----- .../Files/Hashfile.Deserializer.cs | 12 +++++----- .../Files/Hashfile.Serializer.cs | 20 ++++++++--------- .../Files/IRD.Deserializer.cs | 8 +++---- .../Files/IRD.Serializer.cs | 10 ++++----- .../InstallShieldCabinet.Deserializer.cs | 8 +++---- .../Files/InstallShieldCabinet.Serializer.cs | 10 ++++----- .../Files/JsonFile.Deserializer.cs | 8 +++---- .../Files/JsonFile.Serializer.cs | 8 +++---- .../Files/LinearExecutable.Deserializer.cs | 8 +++---- .../Files/LinearExecutable.Serializer.cs | 10 ++++----- .../Files/Listrom.Deserializer.cs | 8 +++---- .../Files/Listrom.Serializer.cs | 10 ++++----- .../Files/Listxml.Deserializer.cs | 4 ++-- .../Files/Listxml.Serializer.cs | 6 ++--- .../Files/Logiqx.Deserializer.cs | 4 ++-- .../Files/Logiqx.Serializer.cs | 12 +++++----- .../Files/M1.Deserializer.cs | 4 ++-- .../Files/M1.Serializer.cs | 6 ++--- .../Files/MSDOS.Deserializer.cs | 8 +++---- .../Files/MSDOS.Serializer.cs | 10 ++++----- .../Files/MicrosoftCabinet.Deserializer.cs | 8 +++---- .../Files/MicrosoftCabinet.Serializer.cs | 10 ++++----- .../Files/MoPaQ.Deserializer.cs | 8 +++---- .../Files/MoPaQ.Serializer.cs | 10 ++++----- .../Files/N3DS.Deserializer.cs | 8 +++---- .../Files/N3DS.Serializer.cs | 10 ++++----- .../Files/NCF.Deserializer.cs | 8 +++---- .../Files/NCF.Serializer.cs | 10 ++++----- .../Files/NewExecutable.Deserializer.cs | 8 +++---- .../Files/NewExecutable.Serializer.cs | 10 ++++----- .../Files/Nitro.Deserializer.cs | 8 +++---- .../Files/Nitro.Serializer.cs | 10 ++++----- .../Files/OfflineList.Deserializer.cs | 4 ++-- .../Files/OfflineList.Serializer.cs | 6 ++--- .../Files/OpenMSX.Deserializer.cs | 4 ++-- .../Files/OpenMSX.Serializer.cs | 12 +++++----- .../Files/PAK.Deserializer.cs | 8 +++---- .../Files/PAK.Serializer.cs | 10 ++++----- .../Files/PFF.Deserializer.cs | 8 +++---- .../Files/PFF.Serializer.cs | 10 ++++----- .../Files/PIC.Deserializer.cs | 8 +++---- .../Files/PIC.Serializer.cs | 10 ++++----- .../Files/PlayJAudio.Deserializer.cs | 8 +++---- .../Files/PlayJAudio.Serializer.cs | 10 ++++----- .../Files/PlayJPlaylist.Deserializer.cs | 8 +++---- .../Files/PlayJPlaylist.Serializer.cs | 10 ++++----- .../Files/PortableExecutable.Deserializer.cs | 8 +++---- .../Files/PortableExecutable.Serializer.cs | 10 ++++----- .../Files/Quantum.Deserializer.cs | 8 +++---- .../Files/Quantum.Serializer.cs | 10 ++++----- .../Files/RomCenter.Deserializer.cs | 8 +++---- .../Files/RomCenter.Serializer.cs | 10 ++++----- .../Files/SGA.Deserializer.cs | 8 +++---- .../Files/SGA.Serializer.cs | 10 ++++----- .../Files/SeparatedValue.Deserializer.cs | 12 +++++----- .../Files/SeparatedValue.Serializer.cs | 20 ++++++++--------- .../Files/SoftwareList.Deserializer.cs | 4 ++-- .../Files/SoftwareList.Serializer.cs | 12 +++++----- .../Files/VBSP.Deserializer.cs | 8 +++---- .../Files/VBSP.Serializer.cs | 10 ++++----- .../Files/VPK.Deserializer.cs | 8 +++---- .../Files/VPK.Serializer.cs | 10 ++++----- .../Files/WAD.Deserializer.cs | 8 +++---- .../Files/WAD.Serializer.cs | 10 ++++----- .../Files/XZP.Deserializer.cs | 8 +++---- .../Files/XZP.Serializer.cs | 10 ++++----- .../Files/XmlFile.Deserializer.cs | 4 ++-- .../Files/XmlFile.Serializer.cs | 8 +++---- .../Interfaces/IByteSerializer.cs | 2 +- .../Interfaces/IFileSerializer.cs | 4 ++-- .../Interfaces/IStreamSerializer.cs | 4 ++-- .../Streams/AACS.Deserializer.cs | 8 +++---- .../Streams/AACS.Serializer.cs | 8 +++---- .../Streams/ArchiveDotOrg.Deserializer.cs | 6 ++--- .../Streams/ArchiveDotOrg.Serializer.cs | 6 ++--- .../Streams/AttractMode.Deserializer.cs | 8 +++---- .../Streams/AttractMode.Serializer.cs | 8 +++---- .../Streams/BDPlus.Deserializer.cs | 8 +++---- .../Streams/BDPlus.Serializer.cs | 8 +++---- .../Streams/BFPK.Deserializer.cs | 8 +++---- .../Streams/BFPK.Serializer.cs | 8 +++---- .../Streams/BSP.Deserializer.cs | 8 +++---- .../Streams/BSP.Serializer.cs | 8 +++---- .../Streams/CFB.Deserializer.cs | 8 +++---- .../Streams/CFB.Serializer.cs | 8 +++---- .../Streams/CIA.Deserializer.cs | 8 +++---- .../Streams/CIA.Serializer.cs | 8 +++---- .../Streams/Catalog.Deserializer.cs | 10 ++++----- .../Streams/Catalog.Serializer.cs | 10 ++++----- .../Streams/ClrMamePro.Deserializer.cs | 14 ++++++------ .../Streams/ClrMamePro.Serializer.cs | 20 ++++++++--------- .../Streams/CueSheet.Deserializer.cs | 8 +++---- .../Streams/CueSheet.Serializer.cs | 8 +++---- .../Streams/DosCenter.Deserializer.cs | 8 +++---- .../Streams/DosCenter.Serializer.cs | 8 +++---- .../Streams/EverdriveSMDB.Deserializer.cs | 8 +++---- .../Streams/EverdriveSMDB.Serializer.cs | 8 +++---- .../Streams/GCF.Deserializer.cs | 8 +++---- .../Streams/GCF.Serializer.cs | 8 +++---- .../Streams/HashFile.Deserializer.cs | 14 ++++++------ .../Streams/Hashfile.Serializer.cs | 18 +++++++-------- .../Streams/IRD.Deserializer.cs | 8 +++---- .../Streams/IRD.Serializer.cs | 8 +++---- .../InstallShieldCabinet.Deserializer.cs | 8 +++---- .../InstallShieldCabinet.Serializer.cs | 8 +++---- .../Streams/JsonFile.Deserializer.cs | 6 ++--- .../Streams/JsonFile.Serializer.cs | 6 ++--- .../Streams/LinearExecutable.Deserializer.cs | 10 ++++----- .../Streams/LinearExecutable.Serializer.cs | 8 +++---- .../Streams/Listrom.Deserializer.cs | 8 +++---- .../Streams/Listrom.Serializer.cs | 8 +++---- .../Streams/Listxml.Deserializer.cs | 6 ++--- .../Streams/Listxml.Serializer.cs | 6 ++--- .../Streams/Logiqx.Deserializer.cs | 6 ++--- .../Streams/Logiqx.Serializer.cs | 12 +++++----- .../Streams/M1.Deserializer.cs | 6 ++--- .../Streams/M1.Serializer.cs | 6 ++--- .../Streams/MSDOS.Deserializer.cs | 8 +++---- .../Streams/MSDOS.Serializer.cs | 8 +++---- .../Streams/MicrosoftCabinet.Deserializer.cs | 8 +++---- .../Streams/MicrosoftCabinet.Serializer.cs | 8 +++---- .../Streams/MoPaQ.Deserializer.cs | 8 +++---- .../Streams/MoPaQ.Serializer.cs | 8 +++---- .../Streams/N3DS.Deserializer.cs | 8 +++---- .../Streams/N3DS.Serializer.cs | 8 +++---- .../Streams/NCF.Deserialization.cs | 8 +++---- .../Streams/NCF.Serialization.cs | 8 +++---- .../Streams/NewExecutable.Deserializer.cs | 10 ++++----- .../Streams/NewExecutable.Serializer.cs | 8 +++---- .../Streams/Nitro.Deserializer.cs | 8 +++---- .../Streams/Nitro.Serializer.cs | 8 +++---- .../Streams/OfflineList.Deserializer.cs | 6 ++--- .../Streams/OfflineList.Serializer.cs | 6 ++--- .../Streams/OpenMSX.Deserializer.cs | 6 ++--- .../Streams/OpenMSX.Serializer.cs | 12 +++++----- .../Streams/PAK.Deserializer.cs | 8 +++---- .../Streams/PAK.Serializer.cs | 8 +++---- .../Streams/PFF.Deserializer.cs | 8 +++---- .../Streams/PFF.Serializer.cs | 8 +++---- .../Streams/PIC.Deserializer.cs | 8 +++---- .../Streams/PIC.Serializer.cs | 8 +++---- .../Streams/PlayJAudio.Deserializer.cs | 21 ++++++------------ .../Streams/PlayJAudio.Serializer.cs | 8 +++---- .../Streams/PlayJPlaylist.Deserializer.cs | 10 ++++----- .../Streams/PlayJPlaylist.Serializer.cs | 8 +++---- .../PortableExecutable.Deserializer.cs | 10 ++++----- .../Streams/PortableExecutable.Serializer.cs | 8 +++---- .../Streams/Quantum.Deserializer.cs | 8 +++---- .../Streams/Quantum.Serializer.cs | 8 +++---- .../Streams/RomCenter.Deserializer.cs | 8 +++---- .../Streams/RomCenter.Serializer.cs | 8 +++---- .../Streams/SGA.Deserializer.cs | 8 +++---- .../Streams/SGA.Serializer.cs | 8 +++---- .../Streams/SeparatedValue.Deserializer.cs | 12 +++++----- .../Streams/SeparatedValue.Serializer.cs | 20 ++++++++--------- .../Streams/SoftwareList.Deserializer.cs | 6 ++--- .../Streams/SoftwareList.Serializer.cs | 12 +++++----- .../Streams/VBSP.Deserializer.cs | 8 +++---- .../Streams/VBSP.Serializer.cs | 8 +++---- .../Streams/VPK.Deserializer.cs | 8 +++---- .../Streams/VPK.Serializer.cs | 8 +++---- .../Streams/WAD.Deserializer.cs | 8 +++---- .../Streams/WAD.Serializer.cs | 8 +++---- .../Streams/XZP.Deserializer.cs | 8 +++---- .../Streams/XZP.Serializer.cs | 8 +++---- .../Streams/XmlFile.Deserializer.cs | 2 +- .../Streams/XmlFile.Serializer.cs | 6 ++--- .../Wrappers/AACSMediaKeyBlock.cs | 2 +- .../Wrappers/BDPlusSVM.cs | 4 ++-- SabreTools.Serialization/Wrappers/BFPK.cs | 2 +- SabreTools.Serialization/Wrappers/BSP.cs | 2 +- SabreTools.Serialization/Wrappers/CFB.cs | 2 +- SabreTools.Serialization/Wrappers/CIA.cs | 2 +- SabreTools.Serialization/Wrappers/GCF.cs | 2 +- SabreTools.Serialization/Wrappers/IRD.cs | 2 +- .../Wrappers/InstallShieldCabinet.cs | 2 +- .../Wrappers/LinearExecutable.cs | 2 +- SabreTools.Serialization/Wrappers/MSDOS.cs | 2 +- .../Wrappers/MicrosoftCabinet.cs | 2 +- SabreTools.Serialization/Wrappers/N3DS.cs | 2 +- SabreTools.Serialization/Wrappers/NCF.cs | 2 +- .../Wrappers/NewExecutable.cs | 2 +- SabreTools.Serialization/Wrappers/Nitro.cs | 2 +- SabreTools.Serialization/Wrappers/PAK.cs | 2 +- SabreTools.Serialization/Wrappers/PFF.cs | 2 +- .../Wrappers/PlayJAudioFile.cs | 2 +- .../Wrappers/PortableExecutable.cs | 2 +- SabreTools.Serialization/Wrappers/Quantum.cs | 2 +- SabreTools.Serialization/Wrappers/SGA.cs | 2 +- SabreTools.Serialization/Wrappers/VBSP.cs | 2 +- SabreTools.Serialization/Wrappers/VPK.cs | 2 +- SabreTools.Serialization/Wrappers/WAD.cs | 2 +- SabreTools.Serialization/Wrappers/XZP.cs | 2 +- 249 files changed, 1010 insertions(+), 1017 deletions(-) diff --git a/SabreTools.Serialization/Bytes/AACS.Deserializer.cs b/SabreTools.Serialization/Bytes/AACS.Deserializer.cs index f8612219..07f03aa0 100644 --- a/SabreTools.Serialization/Bytes/AACS.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/AACS.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class AACS : IByteSerializer { - /// - public static Models.AACS.MediaKeyBlock? Deserialize(byte[]? data, int offset) + /// + public static Models.AACS.MediaKeyBlock? DeserializeBytes(byte[]? data, int offset) { var deserializer = new AACS(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.AACS.MediaKeyBlock? DeserializeImpl(byte[]? data, int offset) + public Models.AACS.MediaKeyBlock? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.AACS.Deserialize(dataStream); + return Streams.AACS.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs b/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs index 87127ec6..37995b62 100644 --- a/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/BDPlus.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class BDPlus : IByteSerializer { - /// - public static Models.BDPlus.SVM? Deserialize(byte[]? data, int offset) + /// + public static Models.BDPlus.SVM? DeserializeBytes(byte[]? data, int offset) { var deserializer = new BDPlus(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.BDPlus.SVM? DeserializeImpl(byte[]? data, int offset) + public Models.BDPlus.SVM? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.BDPlus.Deserialize(dataStream); + return Streams.BDPlus.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs b/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs index 7069966d..04a89940 100644 --- a/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/BFPK.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class BFPK : IByteSerializer { - /// - public static Models.BFPK.Archive? Deserialize(byte[]? data, int offset) + /// + public static Models.BFPK.Archive? DeserializeBytes(byte[]? data, int offset) { var deserializer = new BFPK(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.BFPK.Archive? DeserializeImpl(byte[]? data, int offset) + public Models.BFPK.Archive? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.BFPK.Deserialize(dataStream); + return Streams.BFPK.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/BSP.Deserializer.cs b/SabreTools.Serialization/Bytes/BSP.Deserializer.cs index 6574aa82..f4bcb09c 100644 --- a/SabreTools.Serialization/Bytes/BSP.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/BSP.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class BSP : IByteSerializer { - /// - public static Models.BSP.File? Deserialize(byte[]? data, int offset) + /// + public static Models.BSP.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new BSP(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.BSP.File? DeserializeImpl(byte[]? data, int offset) + public Models.BSP.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.BSP.Deserialize(dataStream); + return Streams.BSP.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/CFB.Deserializer.cs b/SabreTools.Serialization/Bytes/CFB.Deserializer.cs index 76cb291a..f105bb62 100644 --- a/SabreTools.Serialization/Bytes/CFB.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/CFB.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class CFB : IByteSerializer { - /// - public static Models.CFB.Binary? Deserialize(byte[]? data, int offset) + /// + public static Models.CFB.Binary? DeserializeBytes(byte[]? data, int offset) { var deserializer = new CFB(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.CFB.Binary? DeserializeImpl(byte[]? data, int offset) + public Models.CFB.Binary? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.CFB.Deserialize(dataStream); + return Streams.CFB.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/CIA.Deserializer.cs b/SabreTools.Serialization/Bytes/CIA.Deserializer.cs index 0d7392a2..47c8cd5a 100644 --- a/SabreTools.Serialization/Bytes/CIA.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/CIA.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class CIA : IByteSerializer { - /// - public static Models.N3DS.CIA? Deserialize(byte[]? data, int offset) + /// + public static Models.N3DS.CIA? DeserializeBytes(byte[]? data, int offset) { var deserializer = new CIA(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.N3DS.CIA? DeserializeImpl(byte[]? data, int offset) + public Models.N3DS.CIA? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.CIA.Deserialize(dataStream); + return Streams.CIA.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/GCF.Deserializer.cs b/SabreTools.Serialization/Bytes/GCF.Deserializer.cs index 213aa861..e7e03bdb 100644 --- a/SabreTools.Serialization/Bytes/GCF.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/GCF.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class GCF : IByteSerializer { - /// - public static Models.GCF.File? Deserialize(byte[]? data, int offset) + /// + public static Models.GCF.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new GCF(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.GCF.File? DeserializeImpl(byte[]? data, int offset) + public Models.GCF.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.GCF.Deserialize(dataStream); + return Streams.GCF.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/IRD.Deserializer.cs b/SabreTools.Serialization/Bytes/IRD.Deserializer.cs index 62a1f978..e73cca36 100644 --- a/SabreTools.Serialization/Bytes/IRD.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/IRD.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class IRD : IByteSerializer { - /// - public static Models.IRD.File? Deserialize(byte[]? data, int offset) + /// + public static Models.IRD.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new IRD(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.IRD.File? DeserializeImpl(byte[]? data, int offset) + public Models.IRD.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.IRD.Deserialize(dataStream); + return Streams.IRD.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs index 0aa5d6ca..ee58bcfb 100644 --- a/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/InstallShieldCabinet.Deserializer.cs @@ -6,15 +6,15 @@ namespace SabreTools.Serialization.Bytes // TODO: Add multi-cabinet reading public partial class InstallShieldCabinet : IByteSerializer { - /// - public static Models.InstallShieldCabinet.Cabinet? Deserialize(byte[]? data, int offset) + /// + public static Models.InstallShieldCabinet.Cabinet? DeserializeBytes(byte[]? data, int offset) { var deserializer = new InstallShieldCabinet(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.InstallShieldCabinet.Cabinet? DeserializeImpl(byte[]? data, int offset) + public Models.InstallShieldCabinet.Cabinet? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -26,7 +26,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.InstallShieldCabinet.Deserialize(dataStream); + return Streams.InstallShieldCabinet.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs index 5e743034..06ef14c9 100644 --- a/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/LinearExecutable.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class LinearExecutable : IByteSerializer { - /// - public static Models.LinearExecutable.Executable? Deserialize(byte[]? data, int offset) + /// + public static Models.LinearExecutable.Executable? DeserializeBytes(byte[]? data, int offset) { var deserializer = new LinearExecutable(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.LinearExecutable.Executable? DeserializeImpl(byte[]? data, int offset) + public Models.LinearExecutable.Executable? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.LinearExecutable.Deserialize(dataStream); + return Streams.LinearExecutable.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs b/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs index ccb657d3..0b83269a 100644 --- a/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/MSDOS.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class MSDOS : IByteSerializer { - /// - public static Models.MSDOS.Executable? Deserialize(byte[]? data, int offset) + /// + public static Models.MSDOS.Executable? DeserializeBytes(byte[]? data, int offset) { var deserializer = new MSDOS(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.MSDOS.Executable? DeserializeImpl(byte[]? data, int offset) + public Models.MSDOS.Executable? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.MSDOS.Deserialize(dataStream); + return Streams.MSDOS.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs index 0583c5ea..6784fee8 100644 --- a/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/MicrosoftCabinet.Deserializer.cs @@ -6,15 +6,15 @@ namespace SabreTools.Serialization.Bytes // TODO: Add multi-cabinet reading public partial class MicrosoftCabinet : IByteSerializer { - /// - public static Models.MicrosoftCabinet.Cabinet? Deserialize(byte[]? data, int offset) + /// + public static Models.MicrosoftCabinet.Cabinet? DeserializeBytes(byte[]? data, int offset) { var deserializer = new MicrosoftCabinet(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.MicrosoftCabinet.Cabinet? DeserializeImpl(byte[]? data, int offset) + public Models.MicrosoftCabinet.Cabinet? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -26,7 +26,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.MicrosoftCabinet.Deserialize(dataStream); + return Streams.MicrosoftCabinet.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs index b28bdad0..65dfe4d0 100644 --- a/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/MoPaQ.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class MoPaQ : IByteSerializer { - /// - public static Models.MoPaQ.Archive? Deserialize(byte[]? data, int offset) + /// + public static Models.MoPaQ.Archive? DeserializeBytes(byte[]? data, int offset) { var deserializer = new MoPaQ(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.MoPaQ.Archive? DeserializeImpl(byte[]? data, int offset) + public Models.MoPaQ.Archive? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.MoPaQ.Deserialize(dataStream); + return Streams.MoPaQ.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs b/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs index 2cba17d5..7e28205f 100644 --- a/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/N3DS.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class N3DS : IByteSerializer { - /// - public static Models.N3DS.Cart? Deserialize(byte[]? data, int offset) + /// + public static Models.N3DS.Cart? DeserializeBytes(byte[]? data, int offset) { var deserializer = new N3DS(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.N3DS.Cart? DeserializeImpl(byte[]? data, int offset) + public Models.N3DS.Cart? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.N3DS.Deserialize(dataStream); + return Streams.N3DS.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/NCF.Deserializer.cs b/SabreTools.Serialization/Bytes/NCF.Deserializer.cs index f817c7f0..1565630b 100644 --- a/SabreTools.Serialization/Bytes/NCF.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/NCF.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class NCF : IByteSerializer { - /// - public static Models.NCF.File? Deserialize(byte[]? data, int offset) + /// + public static Models.NCF.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new NCF(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.NCF.File? DeserializeImpl(byte[]? data, int offset) + public Models.NCF.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.NCF.Deserialize(dataStream); + return Streams.NCF.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs index ca4f0400..fb0585b2 100644 --- a/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/NewExecutable.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class NewExecutable : IByteSerializer { - /// - public static Models.NewExecutable.Executable? Deserialize(byte[]? data, int offset) + /// + public static Models.NewExecutable.Executable? DeserializeBytes(byte[]? data, int offset) { var deserializer = new NewExecutable(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.NewExecutable.Executable? DeserializeImpl(byte[]? data, int offset) + public Models.NewExecutable.Executable? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.NewExecutable.Deserialize(dataStream); + return Streams.NewExecutable.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs b/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs index d731ac8a..75a26d31 100644 --- a/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/Nitro.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class Nitro : IByteSerializer { - /// - public static Models.Nitro.Cart? Deserialize(byte[]? data, int offset) + /// + public static Models.Nitro.Cart? DeserializeBytes(byte[]? data, int offset) { var deserializer = new Nitro(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.Nitro.Cart? DeserializeImpl(byte[]? data, int offset) + public Models.Nitro.Cart? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.Nitro.Deserialize(dataStream); + return Streams.Nitro.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/PAK.Deserializer.cs b/SabreTools.Serialization/Bytes/PAK.Deserializer.cs index e7392c2d..6911fdda 100644 --- a/SabreTools.Serialization/Bytes/PAK.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/PAK.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class PAK : IByteSerializer { - /// - public static Models.PAK.File? Deserialize(byte[]? data, int offset) + /// + public static Models.PAK.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new PAK(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.PAK.File? DeserializeImpl(byte[]? data, int offset) + public Models.PAK.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.PAK.Deserialize(dataStream); + return Streams.PAK.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/PFF.Deserializer.cs b/SabreTools.Serialization/Bytes/PFF.Deserializer.cs index 3110bfc7..4e0f16f2 100644 --- a/SabreTools.Serialization/Bytes/PFF.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/PFF.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class PFF : IByteSerializer { - /// - public static Models.PFF.Archive? Deserialize(byte[]? data, int offset) + /// + public static Models.PFF.Archive? DeserializeBytes(byte[]? data, int offset) { var deserializer = new PFF(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.PFF.Archive? DeserializeImpl(byte[]? data, int offset) + public Models.PFF.Archive? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.PFF.Deserialize(dataStream); + return Streams.PFF.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs index f8e4aad3..a4f98c99 100644 --- a/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/PlayJAudio.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class PlayJAudio : IByteSerializer { - /// - public static Models.PlayJ.AudioFile? Deserialize(byte[]? data, int offset) + /// + public static Models.PlayJ.AudioFile? DeserializeBytes(byte[]? data, int offset) { var deserializer = new PlayJAudio(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.PlayJ.AudioFile? DeserializeImpl(byte[]? data, int offset) + public Models.PlayJ.AudioFile? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.PlayJAudio.Deserialize(dataStream); + return Streams.PlayJAudio.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs index b28488eb..f3d5f9e0 100644 --- a/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/PlayJPlaylist.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class PlayJPlaylist : IByteSerializer { - /// - public static Models.PlayJ.Playlist? Deserialize(byte[]? data, int offset) + /// + public static Models.PlayJ.Playlist? DeserializeBytes(byte[]? data, int offset) { var deserializer = new PlayJPlaylist(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.PlayJ.Playlist? DeserializeImpl(byte[]? data, int offset) + public Models.PlayJ.Playlist? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.PlayJPlaylist.Deserialize(dataStream); + return Streams.PlayJPlaylist.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs index 8ba82122..499e59c6 100644 --- a/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/PortableExecutable.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class PortableExecutable : IByteSerializer { - /// - public static Models.PortableExecutable.Executable? Deserialize(byte[]? data, int offset) + /// + public static Models.PortableExecutable.Executable? DeserializeBytes(byte[]? data, int offset) { var deserializer = new PortableExecutable(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.PortableExecutable.Executable? DeserializeImpl(byte[]? data, int offset) + public Models.PortableExecutable.Executable? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.PortableExecutable.Deserialize(dataStream); + return Streams.PortableExecutable.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs b/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs index 75bd7c94..5c017a28 100644 --- a/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/Quantum.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class Quantum : IByteSerializer { - /// - public static Models.Quantum.Archive? Deserialize(byte[]? data, int offset) + /// + public static Models.Quantum.Archive? DeserializeBytes(byte[]? data, int offset) { var deserializer = new Quantum(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.Quantum.Archive? DeserializeImpl(byte[]? data, int offset) + public Models.Quantum.Archive? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.Quantum.Deserialize(dataStream); + return Streams.Quantum.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/SGA.Deserializer.cs b/SabreTools.Serialization/Bytes/SGA.Deserializer.cs index a626563c..3802a509 100644 --- a/SabreTools.Serialization/Bytes/SGA.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/SGA.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class SGA : IByteSerializer { - /// - public static Models.SGA.File? Deserialize(byte[]? data, int offset) + /// + public static Models.SGA.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new SGA(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.SGA.File? DeserializeImpl(byte[]? data, int offset) + public Models.SGA.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.SGA.Deserialize(dataStream); + return Streams.SGA.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs b/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs index 3b50f39f..6105c1e2 100644 --- a/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/VBSP.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class VBSP : IByteSerializer { - /// - public static Models.VBSP.File? Deserialize(byte[]? data, int offset) + /// + public static Models.VBSP.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new VBSP(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.VBSP.File? DeserializeImpl(byte[]? data, int offset) + public Models.VBSP.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.VBSP.Deserialize(dataStream); + return Streams.VBSP.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/VPK.Deserializer.cs b/SabreTools.Serialization/Bytes/VPK.Deserializer.cs index 182489f5..3830b86a 100644 --- a/SabreTools.Serialization/Bytes/VPK.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/VPK.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class VPK : IByteSerializer { - /// - public static Models.VPK.File? Deserialize(byte[]? data, int offset) + /// + public static Models.VPK.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new VPK(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.VPK.File? DeserializeImpl(byte[]? data, int offset) + public Models.VPK.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.VPK.Deserialize(dataStream); + return Streams.VPK.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/WAD.Deserializer.cs b/SabreTools.Serialization/Bytes/WAD.Deserializer.cs index 6918edfd..8737cf20 100644 --- a/SabreTools.Serialization/Bytes/WAD.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/WAD.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class WAD : IByteSerializer { - /// - public static Models.WAD.File? Deserialize(byte[]? data, int offset) + /// + public static Models.WAD.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new WAD(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.WAD.File? DeserializeImpl(byte[]? data, int offset) + public Models.WAD.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.WAD.Deserialize(dataStream); + return Streams.WAD.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Bytes/XZP.Deserializer.cs b/SabreTools.Serialization/Bytes/XZP.Deserializer.cs index b3be60a5..d00a6e75 100644 --- a/SabreTools.Serialization/Bytes/XZP.Deserializer.cs +++ b/SabreTools.Serialization/Bytes/XZP.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Bytes { public partial class XZP : IByteSerializer { - /// - public static Models.XZP.File? Deserialize(byte[]? data, int offset) + /// + public static Models.XZP.File? DeserializeBytes(byte[]? data, int offset) { var deserializer = new XZP(); - return deserializer.DeserializeImpl(data, offset); + return deserializer.Deserialize(data, offset); } /// - public Models.XZP.File? DeserializeImpl(byte[]? data, int offset) + public Models.XZP.File? Deserialize(byte[]? data, int offset) { // If the data is invalid if (data == null) @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Bytes // Create a memory stream and parse that var dataStream = new MemoryStream(data, offset, data.Length - offset); - return Streams.XZP.Deserialize(dataStream); + return Streams.XZP.DeserializeStream(dataStream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/AACS.Deserializer.cs b/SabreTools.Serialization/Files/AACS.Deserializer.cs index 5aca1fde..08f9bdb9 100644 --- a/SabreTools.Serialization/Files/AACS.Deserializer.cs +++ b/SabreTools.Serialization/Files/AACS.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class AACS : IFileSerializer { /// - public static Models.AACS.MediaKeyBlock? Deserialize(string? path) + public static Models.AACS.MediaKeyBlock? DeserializeFile(string? path) { var deserializer = new AACS(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.AACS.MediaKeyBlock? DeserializeImpl(string? path) + public Models.AACS.MediaKeyBlock? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.AACS.Deserialize(stream); + return Streams.AACS.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/AACS.Serializer.cs b/SabreTools.Serialization/Files/AACS.Serializer.cs index 8cb157b7..62a26f10 100644 --- a/SabreTools.Serialization/Files/AACS.Serializer.cs +++ b/SabreTools.Serialization/Files/AACS.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class AACS : IFileSerializer { - /// - public static bool Serialize(Models.AACS.MediaKeyBlock? obj, string? path) + /// + public static bool SerializeFile(Models.AACS.MediaKeyBlock? obj, string? path) { var serializer = new AACS(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.AACS.MediaKeyBlock? obj, string? path) + public bool Serialize(Models.AACS.MediaKeyBlock? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.AACS.Serialize(obj); + using var stream = Streams.AACS.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs index 97969340..61b86637 100644 --- a/SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs +++ b/SabreTools.Serialization/Files/ArchiveDotOrg.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class ArchiveDotOrg : XmlFile { /// - public static Models.ArchiveDotOrg.Files? Deserialize(string? path) + public static Models.ArchiveDotOrg.Files? DeserializeFile(string? path) { var deserializer = new ArchiveDotOrg(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs index 9687f323..c0eddd6d 100644 --- a/SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs +++ b/SabreTools.Serialization/Files/ArchiveDotOrg.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Files { public partial class ArchiveDotOrg : XmlFile { - /// - public static bool Serialize(Models.ArchiveDotOrg.Files? obj, string? path) + /// + public static bool SerializeFile(Models.ArchiveDotOrg.Files? obj, string? path) { var serializer = new ArchiveDotOrg(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/AttractMode.Deserializer.cs b/SabreTools.Serialization/Files/AttractMode.Deserializer.cs index 0478e78c..231f7adb 100644 --- a/SabreTools.Serialization/Files/AttractMode.Deserializer.cs +++ b/SabreTools.Serialization/Files/AttractMode.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class AttractMode : IFileSerializer { /// - public static Models.AttractMode.MetadataFile? Deserialize(string? path) + public static Models.AttractMode.MetadataFile? DeserializeFile(string? path) { var deserializer = new AttractMode(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.AttractMode.MetadataFile? DeserializeImpl(string? path) + public Models.AttractMode.MetadataFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.AttractMode.Deserialize(stream); + return Streams.AttractMode.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/AttractMode.Serializer.cs b/SabreTools.Serialization/Files/AttractMode.Serializer.cs index 9bd6e3fe..a57feb3d 100644 --- a/SabreTools.Serialization/Files/AttractMode.Serializer.cs +++ b/SabreTools.Serialization/Files/AttractMode.Serializer.cs @@ -5,20 +5,20 @@ namespace SabreTools.Serialization.Files { public partial class AttractMode : IFileSerializer { - /// - public static bool Serialize(Models.AttractMode.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.AttractMode.MetadataFile? obj, string? path) { var serializer = new AttractMode(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.AttractMode.MetadataFile? obj, string? path) + public bool Serialize(Models.AttractMode.MetadataFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.AttractMode.Serialize(obj); + using var stream = Streams.AttractMode.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BDPlus.Deserializer.cs b/SabreTools.Serialization/Files/BDPlus.Deserializer.cs index d09493b6..1f8c7849 100644 --- a/SabreTools.Serialization/Files/BDPlus.Deserializer.cs +++ b/SabreTools.Serialization/Files/BDPlus.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class BDPlus : IFileSerializer { /// - public static Models.BDPlus.SVM? Deserialize(string? path) + public static Models.BDPlus.SVM? DeserializeFile(string? path) { var deserializer = new BDPlus(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.BDPlus.SVM? DeserializeImpl(string? path) + public Models.BDPlus.SVM? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.BDPlus.Deserialize(stream); + return Streams.BDPlus.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/BDPlus.Serializer.cs b/SabreTools.Serialization/Files/BDPlus.Serializer.cs index 2a3ef946..ae4a0f8f 100644 --- a/SabreTools.Serialization/Files/BDPlus.Serializer.cs +++ b/SabreTools.Serialization/Files/BDPlus.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class BDPlus : IFileSerializer { - /// - public static bool Serialize(Models.BDPlus.SVM? obj, string? path) + /// + public static bool SerializeFile(Models.BDPlus.SVM? obj, string? path) { var serializer = new BDPlus(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.BDPlus.SVM? obj, string? path) + public bool Serialize(Models.BDPlus.SVM? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.BDPlus.Serialize(obj); + using var stream = Streams.BDPlus.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BFPK.Deserializer.cs b/SabreTools.Serialization/Files/BFPK.Deserializer.cs index 7eec8988..8906096a 100644 --- a/SabreTools.Serialization/Files/BFPK.Deserializer.cs +++ b/SabreTools.Serialization/Files/BFPK.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class BFPK : IFileSerializer { /// - public static Models.BFPK.Archive? Deserialize(string? path) + public static Models.BFPK.Archive? DeserializeFile(string? path) { var deserializer = new BFPK(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.BFPK.Archive? DeserializeImpl(string? path) + public Models.BFPK.Archive? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.BFPK.Deserialize(stream); + return Streams.BFPK.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/BFPK.Serializer.cs b/SabreTools.Serialization/Files/BFPK.Serializer.cs index b68adceb..e7ccfdb5 100644 --- a/SabreTools.Serialization/Files/BFPK.Serializer.cs +++ b/SabreTools.Serialization/Files/BFPK.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class BFPK : IFileSerializer { - /// - public static bool Serialize(Models.BFPK.Archive? obj, string? path) + /// + public static bool SerializeFile(Models.BFPK.Archive? obj, string? path) { var serializer = new BFPK(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.BFPK.Archive? obj, string? path) + public bool Serialize(Models.BFPK.Archive? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.BFPK.Serialize(obj); + using var stream = Streams.BFPK.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BSP.Deserializer.cs b/SabreTools.Serialization/Files/BSP.Deserializer.cs index 08a5fc86..8657fbfc 100644 --- a/SabreTools.Serialization/Files/BSP.Deserializer.cs +++ b/SabreTools.Serialization/Files/BSP.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class BSP : IFileSerializer { /// - public static Models.BSP.File? Deserialize(string? path) + public static Models.BSP.File? DeserializeFile(string? path) { var deserializer = new BSP(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.BSP.File? DeserializeImpl(string? path) + public Models.BSP.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.BSP.Deserialize(stream); + return Streams.BSP.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/BSP.Serializer.cs b/SabreTools.Serialization/Files/BSP.Serializer.cs index d74dac59..15dbffad 100644 --- a/SabreTools.Serialization/Files/BSP.Serializer.cs +++ b/SabreTools.Serialization/Files/BSP.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class BSP : IFileSerializer { - /// - public static bool Serialize(Models.BSP.File? obj, string? path) + /// + public static bool SerializeFile(Models.BSP.File? obj, string? path) { var serializer = new BSP(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.BSP.File? obj, string? path) + public bool Serialize(Models.BSP.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.BSP.Serialize(obj); + using var stream = Streams.BSP.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CFB.Deserializer.cs b/SabreTools.Serialization/Files/CFB.Deserializer.cs index 8d0ad232..b1e2598b 100644 --- a/SabreTools.Serialization/Files/CFB.Deserializer.cs +++ b/SabreTools.Serialization/Files/CFB.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class CFB : IFileSerializer { /// - public static Models.CFB.Binary? Deserialize(string? path) + public static Models.CFB.Binary? DeserializeFile(string? path) { var deserializer = new CFB(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.CFB.Binary? DeserializeImpl(string? path) + public Models.CFB.Binary? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.CFB.Deserialize(stream); + return Streams.CFB.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/CFB.Serializer.cs b/SabreTools.Serialization/Files/CFB.Serializer.cs index 6530d67b..b6a94433 100644 --- a/SabreTools.Serialization/Files/CFB.Serializer.cs +++ b/SabreTools.Serialization/Files/CFB.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class CFB : IFileSerializer { - /// - public static bool Serialize(Models.CFB.Binary? obj, string? path) + /// + public static bool SerializeFile(Models.CFB.Binary? obj, string? path) { var serializer = new CFB(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.CFB.Binary? obj, string? path) + public bool Serialize(Models.CFB.Binary? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.CFB.Serialize(obj); + using var stream = Streams.CFB.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CIA.Deserializer.cs b/SabreTools.Serialization/Files/CIA.Deserializer.cs index 7d0ab90f..aea3fe72 100644 --- a/SabreTools.Serialization/Files/CIA.Deserializer.cs +++ b/SabreTools.Serialization/Files/CIA.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class CIA : IFileSerializer { /// - public static Models.N3DS.CIA? Deserialize(string? path) + public static Models.N3DS.CIA? DeserializeFile(string? path) { var deserializer = new CIA(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.N3DS.CIA? DeserializeImpl(string? path) + public Models.N3DS.CIA? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.CIA.Deserialize(stream); + return Streams.CIA.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/CIA.Serializer.cs b/SabreTools.Serialization/Files/CIA.Serializer.cs index d0bbb044..0d7c406e 100644 --- a/SabreTools.Serialization/Files/CIA.Serializer.cs +++ b/SabreTools.Serialization/Files/CIA.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class CIA : IFileSerializer { - /// - public static bool Serialize(Models.N3DS.CIA? obj, string? path) + /// + public static bool SerializeFile(Models.N3DS.CIA? obj, string? path) { var serializer = new CIA(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.N3DS.CIA? obj, string? path) + public bool Serialize(Models.N3DS.CIA? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.CIA.Serialize(obj); + using var stream = Streams.CIA.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Catalog.Deserializer.cs b/SabreTools.Serialization/Files/Catalog.Deserializer.cs index b2c00294..0916c68a 100644 --- a/SabreTools.Serialization/Files/Catalog.Deserializer.cs +++ b/SabreTools.Serialization/Files/Catalog.Deserializer.cs @@ -5,14 +5,14 @@ namespace SabreTools.Serialization.Files public partial class Catalog : JsonFile { /// - public static Models.Xbox.Catalog? Deserialize(string? path) + public static Models.Xbox.Catalog? DeserializeFile(string? path) { var deserializer = new Catalog(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } // Catalog.js file is a UTF-16 LE JSON - public override Models.Xbox.Catalog? DeserializeImpl(string? path) - => DeserializeImpl(path, new UnicodeEncoding()); + public override Models.Xbox.Catalog? Deserialize(string? path) + => Deserialize(path, new UnicodeEncoding()); } } diff --git a/SabreTools.Serialization/Files/Catalog.Serializer.cs b/SabreTools.Serialization/Files/Catalog.Serializer.cs index 28c3609c..fa7df48a 100644 --- a/SabreTools.Serialization/Files/Catalog.Serializer.cs +++ b/SabreTools.Serialization/Files/Catalog.Serializer.cs @@ -4,15 +4,15 @@ namespace SabreTools.Serialization.Files { public partial class Catalog : JsonFile { - /// - public static bool Serialize(Models.Xbox.Catalog? obj, string? path) + /// + public static bool SerializeFile(Models.Xbox.Catalog? obj, string? path) { var serializer = new Catalog(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } // Catalog.js file is a UTF-16 LE JSON - public override bool SerializeImpl(Models.Xbox.Catalog? obj, string? path) - => SerializeImpl(obj, path, new UnicodeEncoding()); + public override bool Serialize(Models.Xbox.Catalog? obj, string? path) + => Serialize(obj, path, new UnicodeEncoding()); } } diff --git a/SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs index b403ad92..9f96ec5d 100644 --- a/SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs +++ b/SabreTools.Serialization/Files/ClrMamePro.Deserializer.cs @@ -5,21 +5,21 @@ namespace SabreTools.Serialization.Files public partial class ClrMamePro : IFileSerializer { /// - public static Models.ClrMamePro.MetadataFile? Deserialize(string? path, bool quotes = true) + public static Models.ClrMamePro.MetadataFile? DeserializeFile(string? path, bool quotes = true) { var deserializer = new ClrMamePro(); - return deserializer.DeserializeImpl(path, quotes); + return deserializer.Deserialize(path, quotes); } /// - public Models.ClrMamePro.MetadataFile? DeserializeImpl(string? path) - => DeserializeImpl(path, true); + public Models.ClrMamePro.MetadataFile? Deserialize(string? path) + => Deserialize(path, true); /// - public Models.ClrMamePro.MetadataFile? DeserializeImpl(string? path, bool quotes) + public Models.ClrMamePro.MetadataFile? Deserialize(string? path, bool quotes) { using var stream = PathProcessor.OpenStream(path); - return Streams.ClrMamePro.Deserialize(stream, quotes); + return Streams.ClrMamePro.DeserializeStream(stream, quotes); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs b/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs index 62bb9f5b..2711187c 100644 --- a/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs @@ -5,31 +5,31 @@ namespace SabreTools.Serialization.Files { public partial class ClrMamePro : IFileSerializer { - /// - public static bool Serialize(Models.ClrMamePro.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.ClrMamePro.MetadataFile? obj, string? path) { var serializer = new ClrMamePro(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public static bool Serialize(Models.ClrMamePro.MetadataFile? obj, string? path, bool quotes) + /// + public static bool SerializeFile(Models.ClrMamePro.MetadataFile? obj, string? path, bool quotes) { var serializer = new ClrMamePro(); - return serializer.SerializeImpl(obj, path, quotes); + return serializer.Serialize(obj, path, quotes); } /// - public bool SerializeImpl(Models.ClrMamePro.MetadataFile? obj, string? path) - => SerializeImpl(obj, path, true); + public bool Serialize(Models.ClrMamePro.MetadataFile? obj, string? path) + => Serialize(obj, path, true); - /// - public bool SerializeImpl(Models.ClrMamePro.MetadataFile? obj, string? path, bool quotes) + /// + public bool Serialize(Models.ClrMamePro.MetadataFile? obj, string? path, bool quotes) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.ClrMamePro.Serialize(obj, quotes); + using var stream = Streams.ClrMamePro.SerializeStream(obj, quotes); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CueSheet.Deserializer.cs b/SabreTools.Serialization/Files/CueSheet.Deserializer.cs index c8e76632..eb0362f3 100644 --- a/SabreTools.Serialization/Files/CueSheet.Deserializer.cs +++ b/SabreTools.Serialization/Files/CueSheet.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class CueSheet : IFileSerializer { /// - public static Models.CueSheets.CueSheet? Deserialize(string? path) + public static Models.CueSheets.CueSheet? DeserializeFile(string? path) { var deserializer = new CueSheet(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.CueSheets.CueSheet? DeserializeImpl(string? path) + public Models.CueSheets.CueSheet? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.CueSheet.Deserialize(stream); + return Streams.CueSheet.DeserializeStream(stream); } } } diff --git a/SabreTools.Serialization/Files/CueSheet.Serializer.cs b/SabreTools.Serialization/Files/CueSheet.Serializer.cs index e0e820e0..ed47fba8 100644 --- a/SabreTools.Serialization/Files/CueSheet.Serializer.cs +++ b/SabreTools.Serialization/Files/CueSheet.Serializer.cs @@ -5,20 +5,20 @@ namespace SabreTools.Serialization.Files { public partial class CueSheet : IFileSerializer { - /// - public static bool Serialize(Models.CueSheets.CueSheet? obj, string? path) + /// + public static bool SerializeFile(Models.CueSheets.CueSheet? obj, string? path) { var serializer = new CueSheet(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.CueSheets.CueSheet? obj, string? path) + public bool Serialize(Models.CueSheets.CueSheet? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.CueSheet.Serialize(obj); + using var stream = Streams.CueSheet.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/DosCenter.Deserializer.cs b/SabreTools.Serialization/Files/DosCenter.Deserializer.cs index a0feec05..2738ebc5 100644 --- a/SabreTools.Serialization/Files/DosCenter.Deserializer.cs +++ b/SabreTools.Serialization/Files/DosCenter.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class DosCenter : IFileSerializer { /// - public static Models.DosCenter.MetadataFile? Deserialize(string? path) + public static Models.DosCenter.MetadataFile? DeserializeFile(string? path) { var deserializer = new DosCenter(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.DosCenter.MetadataFile? DeserializeImpl(string? path) + public Models.DosCenter.MetadataFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.DosCenter.Deserialize(stream); + return Streams.DosCenter.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/DosCenter.Serializer.cs b/SabreTools.Serialization/Files/DosCenter.Serializer.cs index 630c152a..bca5ba4c 100644 --- a/SabreTools.Serialization/Files/DosCenter.Serializer.cs +++ b/SabreTools.Serialization/Files/DosCenter.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class DosCenter : IFileSerializer { - /// - public static bool Serialize(Models.DosCenter.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.DosCenter.MetadataFile? obj, string? path) { var serializer = new DosCenter(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.DosCenter.MetadataFile? obj, string? path) + public bool Serialize(Models.DosCenter.MetadataFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.DosCenter.Serialize(obj); + using var stream = Streams.DosCenter.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs index d21648ec..791fa995 100644 --- a/SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs +++ b/SabreTools.Serialization/Files/EverdriveSMDB.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class EverdriveSMDB : IFileSerializer { /// - public static Models.EverdriveSMDB.MetadataFile? Deserialize(string? path) + public static Models.EverdriveSMDB.MetadataFile? DeserializeFile(string? path) { var deserializer = new EverdriveSMDB(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.EverdriveSMDB.MetadataFile? DeserializeImpl(string? path) + public Models.EverdriveSMDB.MetadataFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.EverdriveSMDB.Deserialize(stream); + return Streams.EverdriveSMDB.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs index c9dd00c3..1248378c 100644 --- a/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs +++ b/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class EverdriveSMDB : IFileSerializer { - /// - public static bool Serialize(Models.EverdriveSMDB.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.EverdriveSMDB.MetadataFile? obj, string? path) { var serializer = new EverdriveSMDB(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.EverdriveSMDB.MetadataFile? obj, string? path) + public bool Serialize(Models.EverdriveSMDB.MetadataFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.EverdriveSMDB.Serialize(obj); + using var stream = Streams.EverdriveSMDB.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/GCF.Deserializer.cs b/SabreTools.Serialization/Files/GCF.Deserializer.cs index 2fb92975..51a70abd 100644 --- a/SabreTools.Serialization/Files/GCF.Deserializer.cs +++ b/SabreTools.Serialization/Files/GCF.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class GCF : IFileSerializer { /// - public static Models.GCF.File? Deserialize(string? path) + public static Models.GCF.File? DeserializeFile(string? path) { var deserializer = new GCF(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.GCF.File? DeserializeImpl(string? path) + public Models.GCF.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.GCF.Deserialize(stream); + return Streams.GCF.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/GCF.Serializer.cs b/SabreTools.Serialization/Files/GCF.Serializer.cs index bf399963..33032537 100644 --- a/SabreTools.Serialization/Files/GCF.Serializer.cs +++ b/SabreTools.Serialization/Files/GCF.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class GCF : IFileSerializer { - /// - public static bool Serialize(Models.GCF.File? obj, string? path) + /// + public static bool SerializeFile(Models.GCF.File? obj, string? path) { var serializer = new GCF(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.GCF.File? obj, string? path) + public bool Serialize(Models.GCF.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.GCF.Serialize(obj); + using var stream = Streams.GCF.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Hashfile.Deserializer.cs b/SabreTools.Serialization/Files/Hashfile.Deserializer.cs index fa532fa8..7f830ab7 100644 --- a/SabreTools.Serialization/Files/Hashfile.Deserializer.cs +++ b/SabreTools.Serialization/Files/Hashfile.Deserializer.cs @@ -5,21 +5,21 @@ namespace SabreTools.Serialization.Files public partial class Hashfile : IFileSerializer { /// - public static Models.Hashfile.Hashfile? Deserialize(string? path, Hash hash = Hash.CRC) + public static Models.Hashfile.Hashfile? DeserializeFile(string? path, Hash hash = Hash.CRC) { var deserializer = new Hashfile(); - return deserializer.DeserializeImpl(path, hash); + return deserializer.Deserialize(path, hash); } /// - public Models.Hashfile.Hashfile? DeserializeImpl(string? path) - => DeserializeImpl(path, Hash.CRC); + public Models.Hashfile.Hashfile? Deserialize(string? path) + => Deserialize(path, Hash.CRC); /// - public Models.Hashfile.Hashfile? DeserializeImpl(string? path, Hash hash) + public Models.Hashfile.Hashfile? Deserialize(string? path, Hash hash) { using var stream = PathProcessor.OpenStream(path); - return Streams.Hashfile.Deserialize(stream, hash); + return Streams.Hashfile.DeserializeStream(stream, hash); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Hashfile.Serializer.cs b/SabreTools.Serialization/Files/Hashfile.Serializer.cs index a83cf420..76655d96 100644 --- a/SabreTools.Serialization/Files/Hashfile.Serializer.cs +++ b/SabreTools.Serialization/Files/Hashfile.Serializer.cs @@ -4,31 +4,31 @@ namespace SabreTools.Serialization.Files { public partial class Hashfile : IFileSerializer { - /// - public static bool Serialize(Models.Hashfile.Hashfile? obj, string? path) + /// + public static bool SerializeFile(Models.Hashfile.Hashfile? obj, string? path) { var serializer = new Hashfile(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public static bool Serialize(Models.Hashfile.Hashfile? obj, string? path, Hash hash) + /// + public static bool SerializeFile(Models.Hashfile.Hashfile? obj, string? path, Hash hash) { var serializer = new Hashfile(); - return serializer.SerializeImpl(obj, path, hash); + return serializer.Serialize(obj, path, hash); } /// - public bool SerializeImpl(Models.Hashfile.Hashfile? obj, string? path) - => SerializeImpl(obj, path, Hash.CRC); + public bool Serialize(Models.Hashfile.Hashfile? obj, string? path) + => Serialize(obj, path, Hash.CRC); /// - public bool SerializeImpl(Models.Hashfile.Hashfile? obj, string? path, Hash hash) + public bool Serialize(Models.Hashfile.Hashfile? obj, string? path, Hash hash) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.Hashfile.Serialize(obj, hash); + using var stream = Streams.Hashfile.SerializeStream(obj, hash); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/IRD.Deserializer.cs b/SabreTools.Serialization/Files/IRD.Deserializer.cs index 9ac237e5..c4482204 100644 --- a/SabreTools.Serialization/Files/IRD.Deserializer.cs +++ b/SabreTools.Serialization/Files/IRD.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class IRD : IFileSerializer { /// - public static Models.IRD.File? Deserialize(string? path) + public static Models.IRD.File? DeserializeFile(string? path) { var deserializer = new IRD(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.IRD.File? DeserializeImpl(string? path) + public Models.IRD.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.IRD.Deserialize(stream); + return Streams.IRD.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/IRD.Serializer.cs b/SabreTools.Serialization/Files/IRD.Serializer.cs index 0748e733..7f2a5e7b 100644 --- a/SabreTools.Serialization/Files/IRD.Serializer.cs +++ b/SabreTools.Serialization/Files/IRD.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class IRD : IFileSerializer { - /// - public static bool Serialize(Models.IRD.File? obj, string? path) + /// + public static bool SerializeFile(Models.IRD.File? obj, string? path) { var serializer = new IRD(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.IRD.File? obj, string? path) + public bool Serialize(Models.IRD.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.IRD.Serialize(obj); + using var stream = Streams.IRD.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Files/InstallShieldCabinet.Deserializer.cs index cdb26227..f90fe2f0 100644 --- a/SabreTools.Serialization/Files/InstallShieldCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Files/InstallShieldCabinet.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class InstallShieldCabinet : IFileSerializer { /// - public static Models.InstallShieldCabinet.Cabinet? Deserialize(string? path) + public static Models.InstallShieldCabinet.Cabinet? DeserializeFile(string? path) { var deserializer = new InstallShieldCabinet(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.InstallShieldCabinet.Cabinet? DeserializeImpl(string? path) + public Models.InstallShieldCabinet.Cabinet? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.InstallShieldCabinet.Deserialize(stream); + return Streams.InstallShieldCabinet.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs b/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs index 37fbd3ae..a23b3c97 100644 --- a/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs +++ b/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class InstallShieldCabinet : IFileSerializer { - /// - public static bool Serialize(Models.InstallShieldCabinet.Cabinet? obj, string? path) + /// + public static bool SerializeFile(Models.InstallShieldCabinet.Cabinet? obj, string? path) { var serializer = new InstallShieldCabinet(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.InstallShieldCabinet.Cabinet? obj, string? path) + public bool Serialize(Models.InstallShieldCabinet.Cabinet? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.InstallShieldCabinet.Serialize(obj); + using var stream = Streams.InstallShieldCabinet.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/JsonFile.Deserializer.cs b/SabreTools.Serialization/Files/JsonFile.Deserializer.cs index 67a41ca4..265bb43d 100644 --- a/SabreTools.Serialization/Files/JsonFile.Deserializer.cs +++ b/SabreTools.Serialization/Files/JsonFile.Deserializer.cs @@ -10,8 +10,8 @@ namespace SabreTools.Serialization.Files public partial class JsonFile : IFileSerializer { /// - public virtual T? DeserializeImpl(string? path) - => DeserializeImpl(path, new UTF8Encoding(false)); + public virtual T? Deserialize(string? path) + => Deserialize(path, new UTF8Encoding(false)); /// /// Deserialize a file into @@ -20,10 +20,10 @@ namespace SabreTools.Serialization.Files /// Path to deserialize from /// Encoding to parse text as /// Filled object on success, null on error - public T? DeserializeImpl(string? path, Encoding encoding) + public T? Deserialize(string? path, Encoding encoding) { using var data = PathProcessor.OpenStream(path); - return new Streams.JsonFile().DeserializeImpl(data, encoding); + return new Streams.JsonFile().Deserialize(data, encoding); } } } diff --git a/SabreTools.Serialization/Files/JsonFile.Serializer.cs b/SabreTools.Serialization/Files/JsonFile.Serializer.cs index 0896c1a7..a2638438 100644 --- a/SabreTools.Serialization/Files/JsonFile.Serializer.cs +++ b/SabreTools.Serialization/Files/JsonFile.Serializer.cs @@ -11,8 +11,8 @@ namespace SabreTools.Serialization.Files public partial class JsonFile : IFileSerializer { /// - public virtual bool SerializeImpl(T? obj, string? path) - => SerializeImpl(obj, path, new UTF8Encoding(false)); + public virtual bool Serialize(T? obj, string? path) + => Serialize(obj, path, new UTF8Encoding(false)); /// /// Serialize a into a file @@ -22,12 +22,12 @@ namespace SabreTools.Serialization.Files /// Path to the file to serialize to /// Encoding to parse text as /// True on successful serialization, false otherwise - public bool SerializeImpl(T? obj, string? path, Encoding encoding) + public bool Serialize(T? obj, string? path, Encoding encoding) { if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.JsonFile().SerializeImpl(obj, encoding); + using var stream = new Streams.JsonFile().Serialize(obj, encoding); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Files/LinearExecutable.Deserializer.cs index 09120f19..2c32daf3 100644 --- a/SabreTools.Serialization/Files/LinearExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Files/LinearExecutable.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class LinearExecutable : IFileSerializer { /// - public static Models.LinearExecutable.Executable? Deserialize(string? path) + public static Models.LinearExecutable.Executable? DeserializeFile(string? path) { var deserializer = new LinearExecutable(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.LinearExecutable.Executable? DeserializeImpl(string? path) + public Models.LinearExecutable.Executable? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.LinearExecutable.Deserialize(stream); + return Streams.LinearExecutable.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs b/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs index a1d594bd..a768da7e 100644 --- a/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class LinearExecutable : IFileSerializer { - /// - public static bool Serialize(Models.LinearExecutable.Executable? obj, string? path) + /// + public static bool SerializeFile(Models.LinearExecutable.Executable? obj, string? path) { var serializer = new LinearExecutable(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.LinearExecutable.Executable? obj, string? path) + public bool Serialize(Models.LinearExecutable.Executable? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.LinearExecutable.Serialize(obj); + using var stream = Streams.LinearExecutable.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Listrom.Deserializer.cs b/SabreTools.Serialization/Files/Listrom.Deserializer.cs index 09b32f86..dd098c19 100644 --- a/SabreTools.Serialization/Files/Listrom.Deserializer.cs +++ b/SabreTools.Serialization/Files/Listrom.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class Listrom : IFileSerializer { /// - public static Models.Listrom.MetadataFile? Deserialize(string? path) + public static Models.Listrom.MetadataFile? DeserializeFile(string? path) { var deserializer = new Listrom(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.Listrom.MetadataFile? DeserializeImpl(string? path) + public Models.Listrom.MetadataFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.Listrom.Deserialize(stream); + return Streams.Listrom.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Listrom.Serializer.cs b/SabreTools.Serialization/Files/Listrom.Serializer.cs index cc3f82fa..bff73c31 100644 --- a/SabreTools.Serialization/Files/Listrom.Serializer.cs +++ b/SabreTools.Serialization/Files/Listrom.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class Listrom : IFileSerializer { - /// - public static bool Serialize(Models.Listrom.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.Listrom.MetadataFile? obj, string? path) { var serializer = new Listrom(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.Listrom.MetadataFile? obj, string? path) + public bool Serialize(Models.Listrom.MetadataFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.Listrom.Serialize(obj); + using var stream = Streams.Listrom.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Listxml.Deserializer.cs b/SabreTools.Serialization/Files/Listxml.Deserializer.cs index 3399b4a3..e84d8d48 100644 --- a/SabreTools.Serialization/Files/Listxml.Deserializer.cs +++ b/SabreTools.Serialization/Files/Listxml.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class Listxml : XmlFile { /// - public static Models.Listxml.Mame? Deserialize(string? path) + public static Models.Listxml.Mame? DeserializeFile(string? path) { var deserializer = new Listxml(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Listxml.Serializer.cs b/SabreTools.Serialization/Files/Listxml.Serializer.cs index f280c729..d75a7d80 100644 --- a/SabreTools.Serialization/Files/Listxml.Serializer.cs +++ b/SabreTools.Serialization/Files/Listxml.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Files { public partial class Listxml : XmlFile { - /// - public static bool Serialize(Models.Listxml.Mame? obj, string? path) + /// + public static bool SerializeFile(Models.Listxml.Mame? obj, string? path) { var serializer = new Listxml(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Logiqx.Deserializer.cs b/SabreTools.Serialization/Files/Logiqx.Deserializer.cs index dcb2737d..c64a43b8 100644 --- a/SabreTools.Serialization/Files/Logiqx.Deserializer.cs +++ b/SabreTools.Serialization/Files/Logiqx.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class Logiqx : XmlFile { /// - public static Models.Logiqx.Datafile? Deserialize(string? path) + public static Models.Logiqx.Datafile? DeserializeFile(string? path) { var deserializer = new Logiqx(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Logiqx.Serializer.cs b/SabreTools.Serialization/Files/Logiqx.Serializer.cs index daeaba51..db4a5ce8 100644 --- a/SabreTools.Serialization/Files/Logiqx.Serializer.cs +++ b/SabreTools.Serialization/Files/Logiqx.Serializer.cs @@ -2,15 +2,15 @@ namespace SabreTools.Serialization.Files { public partial class Logiqx : XmlFile { - /// - public static bool Serialize(Models.Logiqx.Datafile? obj, string? path) + /// + public static bool SerializeFile(Models.Logiqx.Datafile? obj, string? path) { var serializer = new Logiqx(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public override bool SerializeImpl(Models.Logiqx.Datafile? obj, string? path) - => SerializeImpl(obj, path, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId); + /// + public override bool Serialize(Models.Logiqx.Datafile? obj, string? path) + => Serialize(obj, path, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/M1.Deserializer.cs b/SabreTools.Serialization/Files/M1.Deserializer.cs index 6f8eaec7..cce932cc 100644 --- a/SabreTools.Serialization/Files/M1.Deserializer.cs +++ b/SabreTools.Serialization/Files/M1.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class M1 : XmlFile { /// - public static Models.Listxml.M1? Deserialize(string? path) + public static Models.Listxml.M1? DeserializeFile(string? path) { var deserializer = new M1(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/M1.Serializer.cs b/SabreTools.Serialization/Files/M1.Serializer.cs index 8c50ee17..058d3cee 100644 --- a/SabreTools.Serialization/Files/M1.Serializer.cs +++ b/SabreTools.Serialization/Files/M1.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Files { public partial class M1 : XmlFile { - /// - public static bool Serialize(Models.Listxml.M1? obj, string? path) + /// + public static bool SerializeFile(Models.Listxml.M1? obj, string? path) { var serializer = new M1(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/MSDOS.Deserializer.cs b/SabreTools.Serialization/Files/MSDOS.Deserializer.cs index 12ebadae..6a888882 100644 --- a/SabreTools.Serialization/Files/MSDOS.Deserializer.cs +++ b/SabreTools.Serialization/Files/MSDOS.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class MSDOS : IFileSerializer { /// - public static Models.MSDOS.Executable? Deserialize(string? path) + public static Models.MSDOS.Executable? DeserializeFile(string? path) { var deserializer = new MSDOS(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.MSDOS.Executable? DeserializeImpl(string? path) + public Models.MSDOS.Executable? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.MSDOS.Deserialize(stream); + return Streams.MSDOS.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/MSDOS.Serializer.cs b/SabreTools.Serialization/Files/MSDOS.Serializer.cs index 4f6c5e54..c344ab9e 100644 --- a/SabreTools.Serialization/Files/MSDOS.Serializer.cs +++ b/SabreTools.Serialization/Files/MSDOS.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class MSDOS : IFileSerializer { - /// - public static bool Serialize(Models.MSDOS.Executable? obj, string? path) + /// + public static bool SerializeFile(Models.MSDOS.Executable? obj, string? path) { var serializer = new MSDOS(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.MSDOS.Executable? obj, string? path) + public bool Serialize(Models.MSDOS.Executable? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.MSDOS.Serialize(obj); + using var stream = Streams.MSDOS.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Files/MicrosoftCabinet.Deserializer.cs index e90f5e71..4f312d91 100644 --- a/SabreTools.Serialization/Files/MicrosoftCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Files/MicrosoftCabinet.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class MicrosoftCabinet : IFileSerializer { /// - public static Models.MicrosoftCabinet.Cabinet? Deserialize(string? path) + public static Models.MicrosoftCabinet.Cabinet? DeserializeFile(string? path) { var deserializer = new MicrosoftCabinet(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.MicrosoftCabinet.Cabinet? DeserializeImpl(string? path) + public Models.MicrosoftCabinet.Cabinet? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.MicrosoftCabinet.Deserialize(stream); + return Streams.MicrosoftCabinet.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs b/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs index 5deae101..9c382ce3 100644 --- a/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs +++ b/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class MicrosoftCabinet : IFileSerializer { - /// - public static bool Serialize(Models.MicrosoftCabinet.Cabinet? obj, string? path) + /// + public static bool SerializeFile(Models.MicrosoftCabinet.Cabinet? obj, string? path) { var serializer = new MicrosoftCabinet(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.MicrosoftCabinet.Cabinet? obj, string? path) + public bool Serialize(Models.MicrosoftCabinet.Cabinet? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.MicrosoftCabinet.Serialize(obj); + using var stream = Streams.MicrosoftCabinet.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Files/MoPaQ.Deserializer.cs index c068bb56..88b56eb6 100644 --- a/SabreTools.Serialization/Files/MoPaQ.Deserializer.cs +++ b/SabreTools.Serialization/Files/MoPaQ.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class MoPaQ : IFileSerializer { /// - public static Models.MoPaQ.Archive? Deserialize(string? path) + public static Models.MoPaQ.Archive? DeserializeFile(string? path) { var deserializer = new MoPaQ(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.MoPaQ.Archive? DeserializeImpl(string? path) + public Models.MoPaQ.Archive? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.MoPaQ.Deserialize(stream); + return Streams.MoPaQ.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/MoPaQ.Serializer.cs b/SabreTools.Serialization/Files/MoPaQ.Serializer.cs index 90d02210..90ba3559 100644 --- a/SabreTools.Serialization/Files/MoPaQ.Serializer.cs +++ b/SabreTools.Serialization/Files/MoPaQ.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class MoPaQ : IFileSerializer { - /// - public static bool Serialize(Models.MoPaQ.Archive? obj, string? path) + /// + public static bool SerializeFile(Models.MoPaQ.Archive? obj, string? path) { var serializer = new MoPaQ(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.MoPaQ.Archive? obj, string? path) + public bool Serialize(Models.MoPaQ.Archive? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.MoPaQ.Serialize(obj); + using var stream = Streams.MoPaQ.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/N3DS.Deserializer.cs b/SabreTools.Serialization/Files/N3DS.Deserializer.cs index a0011cf0..dc3ce8df 100644 --- a/SabreTools.Serialization/Files/N3DS.Deserializer.cs +++ b/SabreTools.Serialization/Files/N3DS.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class N3DS : IFileSerializer { /// - public static Models.N3DS.Cart? Deserialize(string? path) + public static Models.N3DS.Cart? DeserializeFile(string? path) { var deserializer = new N3DS(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.N3DS.Cart? DeserializeImpl(string? path) + public Models.N3DS.Cart? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.N3DS.Deserialize(stream); + return Streams.N3DS.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/N3DS.Serializer.cs b/SabreTools.Serialization/Files/N3DS.Serializer.cs index 272895ac..32fca30c 100644 --- a/SabreTools.Serialization/Files/N3DS.Serializer.cs +++ b/SabreTools.Serialization/Files/N3DS.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class N3DS : IFileSerializer { - /// - public static bool Serialize(Models.N3DS.Cart? obj, string? path) + /// + public static bool SerializeFile(Models.N3DS.Cart? obj, string? path) { var serializer = new N3DS(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.N3DS.Cart? obj, string? path) + public bool Serialize(Models.N3DS.Cart? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.N3DS.Serialize(obj); + using var stream = Streams.N3DS.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/NCF.Deserializer.cs b/SabreTools.Serialization/Files/NCF.Deserializer.cs index 8daf122e..0c6942bd 100644 --- a/SabreTools.Serialization/Files/NCF.Deserializer.cs +++ b/SabreTools.Serialization/Files/NCF.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class NCF : IFileSerializer { /// - public static Models.NCF.File? Deserialize(string? path) + public static Models.NCF.File? DeserializeFile(string? path) { var deserializer = new NCF(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.NCF.File? DeserializeImpl(string? path) + public Models.NCF.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.NCF.Deserialize(stream); + return Streams.NCF.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/NCF.Serializer.cs b/SabreTools.Serialization/Files/NCF.Serializer.cs index b82f62f8..d1a7b6bd 100644 --- a/SabreTools.Serialization/Files/NCF.Serializer.cs +++ b/SabreTools.Serialization/Files/NCF.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class NCF : IFileSerializer { - /// - public static bool Serialize(Models.NCF.File? obj, string? path) + /// + public static bool SerializeFile(Models.NCF.File? obj, string? path) { var serializer = new NCF(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.NCF.File? obj, string? path) + public bool Serialize(Models.NCF.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.NCF.Serialize(obj); + using var stream = Streams.NCF.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Files/NewExecutable.Deserializer.cs index 7ed52094..f2d2da64 100644 --- a/SabreTools.Serialization/Files/NewExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Files/NewExecutable.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class NewExecutable : IFileSerializer { /// - public static Models.NewExecutable.Executable? Deserialize(string? path) + public static Models.NewExecutable.Executable? DeserializeFile(string? path) { var deserializer = new NewExecutable(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.NewExecutable.Executable? DeserializeImpl(string? path) + public Models.NewExecutable.Executable? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.NewExecutable.Deserialize(stream); + return Streams.NewExecutable.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/NewExecutable.Serializer.cs b/SabreTools.Serialization/Files/NewExecutable.Serializer.cs index 7f7fd0c4..6c330861 100644 --- a/SabreTools.Serialization/Files/NewExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/NewExecutable.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class NewExecutable : IFileSerializer { - /// - public static bool Serialize(Models.NewExecutable.Executable? obj, string? path) + /// + public static bool SerializeFile(Models.NewExecutable.Executable? obj, string? path) { var serializer = new NewExecutable(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.NewExecutable.Executable? obj, string? path) + public bool Serialize(Models.NewExecutable.Executable? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.NewExecutable.Serialize(obj); + using var stream = Streams.NewExecutable.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Nitro.Deserializer.cs b/SabreTools.Serialization/Files/Nitro.Deserializer.cs index 4214f68c..5ceb3cad 100644 --- a/SabreTools.Serialization/Files/Nitro.Deserializer.cs +++ b/SabreTools.Serialization/Files/Nitro.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class Nitro : IFileSerializer { /// - public static Models.Nitro.Cart? Deserialize(string? path) + public static Models.Nitro.Cart? DeserializeFile(string? path) { var deserializer = new Nitro(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.Nitro.Cart? DeserializeImpl(string? path) + public Models.Nitro.Cart? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.Nitro.Deserialize(stream); + return Streams.Nitro.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Nitro.Serializer.cs b/SabreTools.Serialization/Files/Nitro.Serializer.cs index 7e2652e6..4ed2ca78 100644 --- a/SabreTools.Serialization/Files/Nitro.Serializer.cs +++ b/SabreTools.Serialization/Files/Nitro.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class Nitro : IFileSerializer { - /// - public static bool Serialize(Models.Nitro.Cart? obj, string? path) + /// + public static bool SerializeFile(Models.Nitro.Cart? obj, string? path) { var serializer = new Nitro(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.Nitro.Cart? obj, string? path) + public bool Serialize(Models.Nitro.Cart? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.Nitro.Serialize(obj); + using var stream = Streams.Nitro.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/OfflineList.Deserializer.cs b/SabreTools.Serialization/Files/OfflineList.Deserializer.cs index f46fd99d..40bd5146 100644 --- a/SabreTools.Serialization/Files/OfflineList.Deserializer.cs +++ b/SabreTools.Serialization/Files/OfflineList.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class OfflineList : XmlFile { /// - public static Models.OfflineList.Dat? Deserialize(string? path) + public static Models.OfflineList.Dat? DeserializeFile(string? path) { var deserializer = new OfflineList(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/OfflineList.Serializer.cs b/SabreTools.Serialization/Files/OfflineList.Serializer.cs index 237b4f42..ea4de33c 100644 --- a/SabreTools.Serialization/Files/OfflineList.Serializer.cs +++ b/SabreTools.Serialization/Files/OfflineList.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Files { public partial class OfflineList : XmlFile { - /// - public static bool Serialize(Models.OfflineList.Dat? obj, string? path) + /// + public static bool SerializeFile(Models.OfflineList.Dat? obj, string? path) { var serializer = new OfflineList(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/OpenMSX.Deserializer.cs b/SabreTools.Serialization/Files/OpenMSX.Deserializer.cs index 31c3a091..e584aec5 100644 --- a/SabreTools.Serialization/Files/OpenMSX.Deserializer.cs +++ b/SabreTools.Serialization/Files/OpenMSX.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class OpenMSX : XmlFile { /// - public static Models.OpenMSX.SoftwareDb? Deserialize(string? path) + public static Models.OpenMSX.SoftwareDb? DeserializeFile(string? path) { var deserializer = new OpenMSX(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/OpenMSX.Serializer.cs b/SabreTools.Serialization/Files/OpenMSX.Serializer.cs index 3bf221e8..0a6a8a94 100644 --- a/SabreTools.Serialization/Files/OpenMSX.Serializer.cs +++ b/SabreTools.Serialization/Files/OpenMSX.Serializer.cs @@ -2,15 +2,15 @@ namespace SabreTools.Serialization.Files { public partial class OpenMSX : XmlFile { - /// - public static bool Serialize(Models.OpenMSX.SoftwareDb? obj, string? path) + /// + public static bool SerializeFile(Models.OpenMSX.SoftwareDb? obj, string? path) { var serializer = new OpenMSX(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public override bool SerializeImpl(Models.OpenMSX.SoftwareDb? obj, string? path) - => SerializeImpl(obj, path, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId); + /// + public override bool Serialize(Models.OpenMSX.SoftwareDb? obj, string? path) + => Serialize(obj, path, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PAK.Deserializer.cs b/SabreTools.Serialization/Files/PAK.Deserializer.cs index ddf0f197..fb786b2f 100644 --- a/SabreTools.Serialization/Files/PAK.Deserializer.cs +++ b/SabreTools.Serialization/Files/PAK.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PAK : IFileSerializer { /// - public static Models.PAK.File? Deserialize(string? path) + public static Models.PAK.File? DeserializeFile(string? path) { var deserializer = new PAK(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PAK.File? DeserializeImpl(string? path) + public Models.PAK.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PAK.Deserialize(stream); + return Streams.PAK.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PAK.Serializer.cs b/SabreTools.Serialization/Files/PAK.Serializer.cs index 5477e646..05712efd 100644 --- a/SabreTools.Serialization/Files/PAK.Serializer.cs +++ b/SabreTools.Serialization/Files/PAK.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PAK : IFileSerializer { - /// - public static bool Serialize(Models.PAK.File? obj, string? path) + /// + public static bool SerializeFile(Models.PAK.File? obj, string? path) { var serializer = new PAK(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PAK.File? obj, string? path) + public bool Serialize(Models.PAK.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PAK.Serialize(obj); + using var stream = Streams.PAK.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PFF.Deserializer.cs b/SabreTools.Serialization/Files/PFF.Deserializer.cs index c4718a15..d8438444 100644 --- a/SabreTools.Serialization/Files/PFF.Deserializer.cs +++ b/SabreTools.Serialization/Files/PFF.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PFF : IFileSerializer { /// - public static Models.PFF.Archive? Deserialize(string? path) + public static Models.PFF.Archive? DeserializeFile(string? path) { var deserializer = new PFF(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PFF.Archive? DeserializeImpl(string? path) + public Models.PFF.Archive? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PFF.Deserialize(stream); + return Streams.PFF.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PFF.Serializer.cs b/SabreTools.Serialization/Files/PFF.Serializer.cs index f38ea577..405fb661 100644 --- a/SabreTools.Serialization/Files/PFF.Serializer.cs +++ b/SabreTools.Serialization/Files/PFF.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PFF : IFileSerializer { - /// - public static bool Serialize(Models.PFF.Archive? obj, string? path) + /// + public static bool SerializeFile(Models.PFF.Archive? obj, string? path) { var serializer = new PFF(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PFF.Archive? obj, string? path) + public bool Serialize(Models.PFF.Archive? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PFF.Serialize(obj); + using var stream = Streams.PFF.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PIC.Deserializer.cs b/SabreTools.Serialization/Files/PIC.Deserializer.cs index 90f7f2e7..8079cab8 100644 --- a/SabreTools.Serialization/Files/PIC.Deserializer.cs +++ b/SabreTools.Serialization/Files/PIC.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PIC : IFileSerializer { /// - public static Models.PIC.DiscInformation? Deserialize(string? path) + public static Models.PIC.DiscInformation? DeserializeFile(string? path) { var deserializer = new PIC(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PIC.DiscInformation? DeserializeImpl(string? path) + public Models.PIC.DiscInformation? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PIC.Deserialize(stream); + return Streams.PIC.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PIC.Serializer.cs b/SabreTools.Serialization/Files/PIC.Serializer.cs index 17754f50..9425d848 100644 --- a/SabreTools.Serialization/Files/PIC.Serializer.cs +++ b/SabreTools.Serialization/Files/PIC.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PIC : IFileSerializer { - /// - public static bool Serialize(Models.PIC.DiscInformation? obj, string? path) + /// + public static bool SerializeFile(Models.PIC.DiscInformation? obj, string? path) { var serializer = new PIC(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PIC.DiscInformation? obj, string? path) + public bool Serialize(Models.PIC.DiscInformation? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PIC.Serialize(obj); + using var stream = Streams.PIC.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Files/PlayJAudio.Deserializer.cs index e3824b06..8a5a2205 100644 --- a/SabreTools.Serialization/Files/PlayJAudio.Deserializer.cs +++ b/SabreTools.Serialization/Files/PlayJAudio.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PlayJAudio : IFileSerializer { /// - public static Models.PlayJ.AudioFile? Deserialize(string? path) + public static Models.PlayJ.AudioFile? DeserializeFile(string? path) { var deserializer = new PlayJAudio(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PlayJ.AudioFile? DeserializeImpl(string? path) + public Models.PlayJ.AudioFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PlayJAudio.Deserialize(stream); + return Streams.PlayJAudio.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs b/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs index 4ceb796b..d69e82ea 100644 --- a/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs +++ b/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PlayJAudio : IFileSerializer { - /// - public static bool Serialize(Models.PlayJ.AudioFile? obj, string? path) + /// + public static bool SerializeFile(Models.PlayJ.AudioFile? obj, string? path) { var serializer = new PlayJAudio(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PlayJ.AudioFile? obj, string? path) + public bool Serialize(Models.PlayJ.AudioFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PlayJAudio.Serialize(obj); + using var stream = Streams.PlayJAudio.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Files/PlayJPlaylist.Deserializer.cs index aa9c92c9..08466a1f 100644 --- a/SabreTools.Serialization/Files/PlayJPlaylist.Deserializer.cs +++ b/SabreTools.Serialization/Files/PlayJPlaylist.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PlayJPlaylist : IFileSerializer { /// - public static Models.PlayJ.Playlist? Deserialize(string? path) + public static Models.PlayJ.Playlist? DeserializeFile(string? path) { var deserializer = new PlayJPlaylist(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PlayJ.Playlist? DeserializeImpl(string? path) + public Models.PlayJ.Playlist? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PlayJPlaylist.Deserialize(stream); + return Streams.PlayJPlaylist.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs b/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs index e549c2c3..ed4948b5 100644 --- a/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs +++ b/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PlayJPlaylist : IFileSerializer { - /// - public static bool Serialize(Models.PlayJ.Playlist? obj, string? path) + /// + public static bool SerializeFile(Models.PlayJ.Playlist? obj, string? path) { var serializer = new PlayJPlaylist(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PlayJ.Playlist? obj, string? path) + public bool Serialize(Models.PlayJ.Playlist? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PlayJPlaylist.Serialize(obj); + using var stream = Streams.PlayJPlaylist.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Files/PortableExecutable.Deserializer.cs index 4b649991..ddaab35d 100644 --- a/SabreTools.Serialization/Files/PortableExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Files/PortableExecutable.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class PortableExecutable : IFileSerializer { /// - public static Models.PortableExecutable.Executable? Deserialize(string? path) + public static Models.PortableExecutable.Executable? DeserializeFile(string? path) { var deserializer = new PortableExecutable(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.PortableExecutable.Executable? DeserializeImpl(string? path) + public Models.PortableExecutable.Executable? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.PortableExecutable.Deserialize(stream); + return Streams.PortableExecutable.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs b/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs index b67bdba9..4127a60f 100644 --- a/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class PortableExecutable : IFileSerializer { - /// - public static bool Serialize(Models.PortableExecutable.Executable? obj, string? path) + /// + public static bool SerializeFile(Models.PortableExecutable.Executable? obj, string? path) { var serializer = new PortableExecutable(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.PortableExecutable.Executable? obj, string? path) + public bool Serialize(Models.PortableExecutable.Executable? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.PortableExecutable.Serialize(obj); + using var stream = Streams.PortableExecutable.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Quantum.Deserializer.cs b/SabreTools.Serialization/Files/Quantum.Deserializer.cs index 568e8909..8f1628ce 100644 --- a/SabreTools.Serialization/Files/Quantum.Deserializer.cs +++ b/SabreTools.Serialization/Files/Quantum.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class Quantum : IFileSerializer { /// - public static Models.Quantum.Archive? Deserialize(string? path) + public static Models.Quantum.Archive? DeserializeFile(string? path) { var deserializer = new Quantum(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.Quantum.Archive? DeserializeImpl(string? path) + public Models.Quantum.Archive? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.Quantum.Deserialize(stream); + return Streams.Quantum.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/Quantum.Serializer.cs b/SabreTools.Serialization/Files/Quantum.Serializer.cs index f6c30656..f17d4c9f 100644 --- a/SabreTools.Serialization/Files/Quantum.Serializer.cs +++ b/SabreTools.Serialization/Files/Quantum.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class Quantum : IFileSerializer { - /// - public static bool Serialize(Models.Quantum.Archive? obj, string? path) + /// + public static bool SerializeFile(Models.Quantum.Archive? obj, string? path) { var serializer = new Quantum(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.Quantum.Archive? obj, string? path) + public bool Serialize(Models.Quantum.Archive? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.Quantum.Serialize(obj); + using var stream = Streams.Quantum.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/RomCenter.Deserializer.cs b/SabreTools.Serialization/Files/RomCenter.Deserializer.cs index e16cd168..e739b813 100644 --- a/SabreTools.Serialization/Files/RomCenter.Deserializer.cs +++ b/SabreTools.Serialization/Files/RomCenter.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class RomCenter : IFileSerializer { /// - public static Models.RomCenter.MetadataFile? Deserialize(string? path) + public static Models.RomCenter.MetadataFile? DeserializeFile(string? path) { var deserializer = new RomCenter(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.RomCenter.MetadataFile? DeserializeImpl(string? path) + public Models.RomCenter.MetadataFile? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.RomCenter.Deserialize(stream); + return Streams.RomCenter.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/RomCenter.Serializer.cs b/SabreTools.Serialization/Files/RomCenter.Serializer.cs index fa420ca1..519f5b63 100644 --- a/SabreTools.Serialization/Files/RomCenter.Serializer.cs +++ b/SabreTools.Serialization/Files/RomCenter.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class RomCenter : IFileSerializer { - /// - public static bool Serialize(Models.RomCenter.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.RomCenter.MetadataFile? obj, string? path) { var serializer = new RomCenter(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.RomCenter.MetadataFile? obj, string? path) + public bool Serialize(Models.RomCenter.MetadataFile? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.RomCenter.Serialize(obj); + using var stream = Streams.RomCenter.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/SGA.Deserializer.cs b/SabreTools.Serialization/Files/SGA.Deserializer.cs index 060ae0e4..75fb48ba 100644 --- a/SabreTools.Serialization/Files/SGA.Deserializer.cs +++ b/SabreTools.Serialization/Files/SGA.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class SGA : IFileSerializer { /// - public static Models.SGA.File? Deserialize(string? path) + public static Models.SGA.File? DeserializeFile(string? path) { var deserializer = new SGA(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.SGA.File? DeserializeImpl(string? path) + public Models.SGA.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.SGA.Deserialize(stream); + return Streams.SGA.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/SGA.Serializer.cs b/SabreTools.Serialization/Files/SGA.Serializer.cs index b120659a..4437745c 100644 --- a/SabreTools.Serialization/Files/SGA.Serializer.cs +++ b/SabreTools.Serialization/Files/SGA.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class SGA : IFileSerializer { - /// - public static bool Serialize(Models.SGA.File? obj, string? path) + /// + public static bool SerializeFile(Models.SGA.File? obj, string? path) { var serializer = new SGA(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.SGA.File? obj, string? path) + public bool Serialize(Models.SGA.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.SGA.Serialize(obj); + using var stream = Streams.SGA.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs index 86379285..4ad9e3ca 100644 --- a/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs @@ -5,21 +5,21 @@ namespace SabreTools.Serialization.Files public partial class SeparatedValue : IFileSerializer { /// - public static Models.SeparatedValue.MetadataFile? Deserialize(string? path, char delim = ',') + public static Models.SeparatedValue.MetadataFile? DeserializeFile(string? path, char delim = ',') { var deserializer = new SeparatedValue(); - return deserializer.DeserializeImpl(path, delim); + return deserializer.Deserialize(path, delim); } /// - public Models.SeparatedValue.MetadataFile? DeserializeImpl(string? path) - => DeserializeImpl(path, ','); + public Models.SeparatedValue.MetadataFile? Deserialize(string? path) + => Deserialize(path, ','); /// - public Models.SeparatedValue.MetadataFile? DeserializeImpl(string? path, char delim) + public Models.SeparatedValue.MetadataFile? Deserialize(string? path, char delim) { using var stream = PathProcessor.OpenStream(path); - return Streams.SeparatedValue.Deserialize(stream, delim); + return Streams.SeparatedValue.DeserializeStream(stream, delim); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs b/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs index 01dabd77..b0c472ca 100644 --- a/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs @@ -4,31 +4,31 @@ namespace SabreTools.Serialization.Files { public partial class SeparatedValue : IFileSerializer { - /// - public static bool Serialize(Models.SeparatedValue.MetadataFile? obj, string? path) + /// + public static bool SerializeFile(Models.SeparatedValue.MetadataFile? obj, string? path) { var serializer = new SeparatedValue(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public static bool Serialize(Models.SeparatedValue.MetadataFile? obj, string? path, char delim) + /// + public static bool SerializeFile(Models.SeparatedValue.MetadataFile? obj, string? path, char delim) { var serializer = new SeparatedValue(); - return serializer.SerializeImpl(obj, path, delim); + return serializer.Serialize(obj, path, delim); } /// - public bool SerializeImpl(Models.SeparatedValue.MetadataFile? obj, string? path) - => SerializeImpl(obj, path, ','); + public bool Serialize(Models.SeparatedValue.MetadataFile? obj, string? path) + => Serialize(obj, path, ','); /// - public bool SerializeImpl(Models.SeparatedValue.MetadataFile? obj, string? path, char delim) + public bool Serialize(Models.SeparatedValue.MetadataFile? obj, string? path, char delim) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.SeparatedValue.Serialize(obj, delim); + using var stream = Streams.SeparatedValue.SerializeStream(obj, delim); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/SoftwareList.Deserializer.cs b/SabreTools.Serialization/Files/SoftwareList.Deserializer.cs index 032c5251..ff85e69e 100644 --- a/SabreTools.Serialization/Files/SoftwareList.Deserializer.cs +++ b/SabreTools.Serialization/Files/SoftwareList.Deserializer.cs @@ -3,10 +3,10 @@ namespace SabreTools.Serialization.Files public partial class SoftwareList : XmlFile { /// - public static Models.SoftwareList.SoftwareList? Deserialize(string? path) + public static Models.SoftwareList.SoftwareList? DeserializeFile(string? path) { var deserializer = new SoftwareList(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/SoftwareList.Serializer.cs b/SabreTools.Serialization/Files/SoftwareList.Serializer.cs index 200c05bd..b9b92e64 100644 --- a/SabreTools.Serialization/Files/SoftwareList.Serializer.cs +++ b/SabreTools.Serialization/Files/SoftwareList.Serializer.cs @@ -2,15 +2,15 @@ namespace SabreTools.Serialization.Files { public partial class SoftwareList : XmlFile { - /// - public static bool Serialize(Models.SoftwareList.SoftwareList? obj, string? path) + /// + public static bool SerializeFile(Models.SoftwareList.SoftwareList? obj, string? path) { var serializer = new SoftwareList(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } - /// - public override bool SerializeImpl(Models.SoftwareList.SoftwareList? obj, string? path) - => SerializeImpl(obj, path, SoftawreList.DocTypeName, SoftawreList.DocTypePubId, SoftawreList.DocTypeSysId, SoftawreList.DocTypeSysId); + /// + public override bool Serialize(Models.SoftwareList.SoftwareList? obj, string? path) + => Serialize(obj, path, SoftawreList.DocTypeName, SoftawreList.DocTypePubId, SoftawreList.DocTypeSysId, SoftawreList.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/VBSP.Deserializer.cs b/SabreTools.Serialization/Files/VBSP.Deserializer.cs index 60a9da54..a8edec16 100644 --- a/SabreTools.Serialization/Files/VBSP.Deserializer.cs +++ b/SabreTools.Serialization/Files/VBSP.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class VBSP : IFileSerializer { /// - public static Models.VBSP.File? Deserialize(string? path) + public static Models.VBSP.File? DeserializeFile(string? path) { var deserializer = new VBSP(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.VBSP.File? DeserializeImpl(string? path) + public Models.VBSP.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.VBSP.Deserialize(stream); + return Streams.VBSP.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/VBSP.Serializer.cs b/SabreTools.Serialization/Files/VBSP.Serializer.cs index eb08288f..1b8c0ad8 100644 --- a/SabreTools.Serialization/Files/VBSP.Serializer.cs +++ b/SabreTools.Serialization/Files/VBSP.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class VBSP : IFileSerializer { - /// - public static bool Serialize(Models.VBSP.File? obj, string? path) + /// + public static bool SerializeFile(Models.VBSP.File? obj, string? path) { var serializer = new VBSP(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.VBSP.File? obj, string? path) + public bool Serialize(Models.VBSP.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.VBSP.Serialize(obj); + using var stream = Streams.VBSP.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/VPK.Deserializer.cs b/SabreTools.Serialization/Files/VPK.Deserializer.cs index f7422f6c..099ebd8b 100644 --- a/SabreTools.Serialization/Files/VPK.Deserializer.cs +++ b/SabreTools.Serialization/Files/VPK.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class VPK : IFileSerializer { /// - public static Models.VPK.File? Deserialize(string? path) + public static Models.VPK.File? DeserializeFile(string? path) { var deserializer = new VPK(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.VPK.File? DeserializeImpl(string? path) + public Models.VPK.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.VPK.Deserialize(stream); + return Streams.VPK.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/VPK.Serializer.cs b/SabreTools.Serialization/Files/VPK.Serializer.cs index d8a69a1a..fe30874d 100644 --- a/SabreTools.Serialization/Files/VPK.Serializer.cs +++ b/SabreTools.Serialization/Files/VPK.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class VPK : IFileSerializer { - /// - public static bool Serialize(Models.VPK.File? obj, string? path) + /// + public static bool SerializeFile(Models.VPK.File? obj, string? path) { var serializer = new VPK(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.VPK.File? obj, string? path) + public bool Serialize(Models.VPK.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.VPK.Serialize(obj); + using var stream = Streams.VPK.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/WAD.Deserializer.cs b/SabreTools.Serialization/Files/WAD.Deserializer.cs index 59d613a8..170530ee 100644 --- a/SabreTools.Serialization/Files/WAD.Deserializer.cs +++ b/SabreTools.Serialization/Files/WAD.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class WAD : IFileSerializer { /// - public static Models.WAD.File? Deserialize(string? path) + public static Models.WAD.File? DeserializeFile(string? path) { var deserializer = new WAD(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.WAD.File? DeserializeImpl(string? path) + public Models.WAD.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.WAD.Deserialize(stream); + return Streams.WAD.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/WAD.Serializer.cs b/SabreTools.Serialization/Files/WAD.Serializer.cs index 09f924af..e7c866a1 100644 --- a/SabreTools.Serialization/Files/WAD.Serializer.cs +++ b/SabreTools.Serialization/Files/WAD.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class WAD : IFileSerializer { - /// - public static bool Serialize(Models.WAD.File? obj, string? path) + /// + public static bool SerializeFile(Models.WAD.File? obj, string? path) { var serializer = new WAD(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.WAD.File? obj, string? path) + public bool Serialize(Models.WAD.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.WAD.Serialize(obj); + using var stream = Streams.WAD.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/XZP.Deserializer.cs b/SabreTools.Serialization/Files/XZP.Deserializer.cs index 74eacbc0..d17c3947 100644 --- a/SabreTools.Serialization/Files/XZP.Deserializer.cs +++ b/SabreTools.Serialization/Files/XZP.Deserializer.cs @@ -5,17 +5,17 @@ namespace SabreTools.Serialization.Files public partial class XZP : IFileSerializer { /// - public static Models.XZP.File? Deserialize(string? path) + public static Models.XZP.File? DeserializeFile(string? path) { var deserializer = new XZP(); - return deserializer.DeserializeImpl(path); + return deserializer.Deserialize(path); } /// - public Models.XZP.File? DeserializeImpl(string? path) + public Models.XZP.File? Deserialize(string? path) { using var stream = PathProcessor.OpenStream(path); - return Streams.XZP.Deserialize(stream); + return Streams.XZP.DeserializeStream(stream); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/XZP.Serializer.cs b/SabreTools.Serialization/Files/XZP.Serializer.cs index c42c5fb6..3e9f34b2 100644 --- a/SabreTools.Serialization/Files/XZP.Serializer.cs +++ b/SabreTools.Serialization/Files/XZP.Serializer.cs @@ -4,20 +4,20 @@ namespace SabreTools.Serialization.Files { public partial class XZP : IFileSerializer { - /// - public static bool Serialize(Models.XZP.File? obj, string? path) + /// + public static bool SerializeFile(Models.XZP.File? obj, string? path) { var serializer = new XZP(); - return serializer.SerializeImpl(obj, path); + return serializer.Serialize(obj, path); } /// - public bool SerializeImpl(Models.XZP.File? obj, string? path) + public bool Serialize(Models.XZP.File? obj, string? path) { if (string.IsNullOrEmpty(path)) return false; - using var stream = Streams.XZP.Serialize(obj); + using var stream = Streams.XZP.SerializeStream(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/XmlFile.Deserializer.cs b/SabreTools.Serialization/Files/XmlFile.Deserializer.cs index b0a8c646..f57ce06e 100644 --- a/SabreTools.Serialization/Files/XmlFile.Deserializer.cs +++ b/SabreTools.Serialization/Files/XmlFile.Deserializer.cs @@ -9,10 +9,10 @@ namespace SabreTools.Serialization.Files public partial class XmlFile : IFileSerializer { /// - public T? DeserializeImpl(string? path) + public T? Deserialize(string? path) { using var data = PathProcessor.OpenStream(path); - return new Streams.XmlFile().DeserializeImpl(data); + return new Streams.XmlFile().Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/XmlFile.Serializer.cs b/SabreTools.Serialization/Files/XmlFile.Serializer.cs index 8cd63d8a..8fd0f6b9 100644 --- a/SabreTools.Serialization/Files/XmlFile.Serializer.cs +++ b/SabreTools.Serialization/Files/XmlFile.Serializer.cs @@ -10,8 +10,8 @@ namespace SabreTools.Serialization.Files public partial class XmlFile : IFileSerializer { /// - public virtual bool SerializeImpl(T? obj, string? path) - => SerializeImpl(obj, path, null, null, null, null); + public virtual bool Serialize(T? obj, string? path) + => Serialize(obj, path, null, null, null, null); /// /// Serializes the defined type to an XML file @@ -23,12 +23,12 @@ namespace SabreTools.Serialization.Files /// Optional DOCTYPE sysid /// Optional DOCTYPE name /// True on successful serialization, false otherwise - public bool SerializeImpl(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) + public bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) { if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.XmlFile().SerializeImpl(obj, name, pubid, sysid, subset); + using var stream = new Streams.XmlFile().Serialize(obj, name, pubid, sysid, subset); if (stream == null) return false; diff --git a/SabreTools.Serialization/Interfaces/IByteSerializer.cs b/SabreTools.Serialization/Interfaces/IByteSerializer.cs index 26ec3e0d..01f84a48 100644 --- a/SabreTools.Serialization/Interfaces/IByteSerializer.cs +++ b/SabreTools.Serialization/Interfaces/IByteSerializer.cs @@ -12,7 +12,7 @@ namespace SabreTools.Serialization.Interfaces /// Byte array to parse /// Offset into the byte array /// Filled object on success, null on error - T? DeserializeImpl(byte[]? data, int offset); + T? Deserialize(byte[]? data, int offset); // TODO: Add serialization method } diff --git a/SabreTools.Serialization/Interfaces/IFileSerializer.cs b/SabreTools.Serialization/Interfaces/IFileSerializer.cs index 13c2e597..28e281ec 100644 --- a/SabreTools.Serialization/Interfaces/IFileSerializer.cs +++ b/SabreTools.Serialization/Interfaces/IFileSerializer.cs @@ -11,7 +11,7 @@ namespace SabreTools.Serialization.Interfaces /// Type of object to deserialize to /// Path to deserialize from /// Filled object on success, null on error - T? DeserializeImpl(string? path); + T? Deserialize(string? path); /// /// Serialize a into a file @@ -20,6 +20,6 @@ namespace SabreTools.Serialization.Interfaces /// Data to serialize /// Path to the file to serialize to /// True on successful serialization, false otherwise - bool SerializeImpl(T? obj, string? path); + bool Serialize(T? obj, string? path); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Interfaces/IStreamSerializer.cs b/SabreTools.Serialization/Interfaces/IStreamSerializer.cs index 87bde210..4488b6f8 100644 --- a/SabreTools.Serialization/Interfaces/IStreamSerializer.cs +++ b/SabreTools.Serialization/Interfaces/IStreamSerializer.cs @@ -11,7 +11,7 @@ namespace SabreTools.Serialization.Interfaces /// Type of object to deserialize to /// Stream to parse /// Filled object on success, null on error - T? DeserializeImpl(System.IO.Stream? data); + T? Deserialize(System.IO.Stream? data); /// /// Serialize a into a Stream @@ -19,6 +19,6 @@ namespace SabreTools.Serialization.Interfaces /// Type of object to serialize from /// Data to serialize /// Filled object on success, null on error - System.IO.Stream? SerializeImpl(T? obj); + System.IO.Stream? Serialize(T? obj); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/AACS.Deserializer.cs b/SabreTools.Serialization/Streams/AACS.Deserializer.cs index ce0855de..b48bedf6 100644 --- a/SabreTools.Serialization/Streams/AACS.Deserializer.cs +++ b/SabreTools.Serialization/Streams/AACS.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class AACS : IStreamSerializer { - /// - public static MediaKeyBlock? Deserialize(Stream? data) + /// + public static MediaKeyBlock? DeserializeStream(Stream? data) { var deserializer = new AACS(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MediaKeyBlock? DeserializeImpl(Stream? data) + public MediaKeyBlock? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/AACS.Serializer.cs b/SabreTools.Serialization/Streams/AACS.Serializer.cs index 270b78ad..9d323992 100644 --- a/SabreTools.Serialization/Streams/AACS.Serializer.cs +++ b/SabreTools.Serialization/Streams/AACS.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class AACS : IStreamSerializer { - /// - public static Stream? Serialize(MediaKeyBlock? obj) + /// + public static Stream? SerializeStream(MediaKeyBlock? obj) { var serializer = new AACS(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MediaKeyBlock? obj) => throw new NotImplementedException(); + public Stream? Serialize(MediaKeyBlock? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs index 49a4e4dc..257c36b6 100644 --- a/SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs +++ b/SabreTools.Serialization/Streams/ArchiveDotOrg.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class ArchiveDotOrg : XmlFile { - /// - public static Models.ArchiveDotOrg.Files? Deserialize(System.IO.Stream? data) + /// + public static Models.ArchiveDotOrg.Files? DeserializeStream(System.IO.Stream? data) { var deserializer = new ArchiveDotOrg(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs index 3de0515d..0ac16ddb 100644 --- a/SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs +++ b/SabreTools.Serialization/Streams/ArchiveDotOrg.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class ArchiveDotOrg : XmlFile { - /// - public static System.IO.Stream? Serialize(Models.ArchiveDotOrg.Files? obj) + /// + public static System.IO.Stream? SerializeStream(Models.ArchiveDotOrg.Files? obj) { var serializer = new ArchiveDotOrg(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/AttractMode.Deserializer.cs b/SabreTools.Serialization/Streams/AttractMode.Deserializer.cs index c72cd630..a5008d1e 100644 --- a/SabreTools.Serialization/Streams/AttractMode.Deserializer.cs +++ b/SabreTools.Serialization/Streams/AttractMode.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class AttractMode : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data) + /// + public static MetadataFile? DeserializeStream(Stream? data) { var deserializer = new AttractMode(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/AttractMode.Serializer.cs b/SabreTools.Serialization/Streams/AttractMode.Serializer.cs index 481b7934..1327caa3 100644 --- a/SabreTools.Serialization/Streams/AttractMode.Serializer.cs +++ b/SabreTools.Serialization/Streams/AttractMode.Serializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class AttractMode : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new AttractMode(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MetadataFile? obj) + public Stream? Serialize(MetadataFile? obj) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/BDPlus.Deserializer.cs b/SabreTools.Serialization/Streams/BDPlus.Deserializer.cs index c82f2bf0..8a184e0c 100644 --- a/SabreTools.Serialization/Streams/BDPlus.Deserializer.cs +++ b/SabreTools.Serialization/Streams/BDPlus.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class BDPlus : IStreamSerializer { - /// - public static SVM? Deserialize(Stream? data) + /// + public static SVM? DeserializeStream(Stream? data) { var deserializer = new BDPlus(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public SVM? DeserializeImpl(Stream? data) + public SVM? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/BDPlus.Serializer.cs b/SabreTools.Serialization/Streams/BDPlus.Serializer.cs index 40433339..6743f8bd 100644 --- a/SabreTools.Serialization/Streams/BDPlus.Serializer.cs +++ b/SabreTools.Serialization/Streams/BDPlus.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class BDPlus : IStreamSerializer { - /// - public static Stream? Serialize(SVM? obj) + /// + public static Stream? SerializeStream(SVM? obj) { var serializer = new BDPlus(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(SVM? obj) => throw new NotImplementedException(); + public Stream? Serialize(SVM? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/BFPK.Deserializer.cs b/SabreTools.Serialization/Streams/BFPK.Deserializer.cs index 2b7896d9..a883f450 100644 --- a/SabreTools.Serialization/Streams/BFPK.Deserializer.cs +++ b/SabreTools.Serialization/Streams/BFPK.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class BFPK : IStreamSerializer { - /// - public static Archive? Deserialize(Stream? data) + /// + public static Archive? DeserializeStream(Stream? data) { var deserializer = new BFPK(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Archive? DeserializeImpl(Stream? data) + public Archive? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/BFPK.Serializer.cs b/SabreTools.Serialization/Streams/BFPK.Serializer.cs index b3fe1096..7373ba77 100644 --- a/SabreTools.Serialization/Streams/BFPK.Serializer.cs +++ b/SabreTools.Serialization/Streams/BFPK.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class BFPK : IStreamSerializer { - /// - public static Stream? Serialize(Archive? obj) + /// + public static Stream? SerializeStream(Archive? obj) { var serializer = new BFPK(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Archive? obj) => throw new NotImplementedException(); + public Stream? Serialize(Archive? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/BSP.Deserializer.cs b/SabreTools.Serialization/Streams/BSP.Deserializer.cs index 34f98839..17d2e42c 100644 --- a/SabreTools.Serialization/Streams/BSP.Deserializer.cs +++ b/SabreTools.Serialization/Streams/BSP.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class BSP : IStreamSerializer { - /// - public static Models.BSP.File? Deserialize(Stream? data) + /// + public static Models.BSP.File? DeserializeStream(Stream? data) { var deserializer = new BSP(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.BSP.File? DeserializeImpl(Stream? data) + public Models.BSP.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/BSP.Serializer.cs b/SabreTools.Serialization/Streams/BSP.Serializer.cs index 6670404c..c081f5bf 100644 --- a/SabreTools.Serialization/Streams/BSP.Serializer.cs +++ b/SabreTools.Serialization/Streams/BSP.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class BSP : IStreamSerializer { - /// - public static Stream? Serialize(Models.BSP.File? obj) + /// + public static Stream? SerializeStream(Models.BSP.File? obj) { var serializer = new BSP(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.BSP.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.BSP.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/CFB.Deserializer.cs b/SabreTools.Serialization/Streams/CFB.Deserializer.cs index 76706fa7..cf778802 100644 --- a/SabreTools.Serialization/Streams/CFB.Deserializer.cs +++ b/SabreTools.Serialization/Streams/CFB.Deserializer.cs @@ -11,15 +11,15 @@ namespace SabreTools.Serialization.Streams { public partial class CFB : IStreamSerializer { - /// - public static Binary? Deserialize(Stream? data) + /// + public static Binary? DeserializeStream(Stream? data) { var deserializer = new CFB(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Binary? DeserializeImpl(Stream? data) + public Binary? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/CFB.Serializer.cs b/SabreTools.Serialization/Streams/CFB.Serializer.cs index 5c151638..83fad372 100644 --- a/SabreTools.Serialization/Streams/CFB.Serializer.cs +++ b/SabreTools.Serialization/Streams/CFB.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class CFB : IStreamSerializer { - /// - public static Stream? Serialize(Binary? obj) + /// + public static Stream? SerializeStream(Binary? obj) { var serializer = new CFB(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Binary? obj) => throw new NotImplementedException(); + public Stream? Serialize(Binary? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/CIA.Deserializer.cs b/SabreTools.Serialization/Streams/CIA.Deserializer.cs index 8837ddb0..04dc441d 100644 --- a/SabreTools.Serialization/Streams/CIA.Deserializer.cs +++ b/SabreTools.Serialization/Streams/CIA.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class CIA : IStreamSerializer { - /// - public static Models.N3DS.CIA? Deserialize(Stream? data) + /// + public static Models.N3DS.CIA? DeserializeStream(Stream? data) { var deserializer = new CIA(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.N3DS.CIA? DeserializeImpl(Stream? data) + public Models.N3DS.CIA? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/CIA.Serializer.cs b/SabreTools.Serialization/Streams/CIA.Serializer.cs index 3dc53159..8568485d 100644 --- a/SabreTools.Serialization/Streams/CIA.Serializer.cs +++ b/SabreTools.Serialization/Streams/CIA.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class CIA : IStreamSerializer { - /// - public static Stream? Serialize(Models.N3DS.CIA? obj) + /// + public static Stream? SerializeStream(Models.N3DS.CIA? obj) { var serializer = new CIA(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.N3DS.CIA? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.N3DS.CIA? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Catalog.Deserializer.cs b/SabreTools.Serialization/Streams/Catalog.Deserializer.cs index 521a7432..74458ad8 100644 --- a/SabreTools.Serialization/Streams/Catalog.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Catalog.Deserializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Streams { public partial class Catalog : JsonFile { - /// - public static Models.Xbox.Catalog? Deserialize(Stream? data) + /// + public static Models.Xbox.Catalog? DeserializeStream(Stream? data) { var deserializer = new Catalog(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } // Catalog JSON is encoded as UTF-16 LE - public override Models.Xbox.Catalog? DeserializeImpl(Stream? data) - => DeserializeImpl(data, new UnicodeEncoding()); + public override Models.Xbox.Catalog? Deserialize(Stream? data) + => Deserialize(data, new UnicodeEncoding()); } } diff --git a/SabreTools.Serialization/Streams/Catalog.Serializer.cs b/SabreTools.Serialization/Streams/Catalog.Serializer.cs index e6721dde..64d555ed 100644 --- a/SabreTools.Serialization/Streams/Catalog.Serializer.cs +++ b/SabreTools.Serialization/Streams/Catalog.Serializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Streams { public partial class Catalog : JsonFile { - /// - public static Stream? Serialize(Models.Xbox.Catalog? obj) + /// + public static Stream? SerializeStream(Models.Xbox.Catalog? obj) { var serializer = new Catalog(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } // Catalog JSON is encoded as UTF-16 LE - public override Stream? SerializeImpl(Models.Xbox.Catalog? obj) - => SerializeImpl(obj, new UnicodeEncoding()); + public override Stream? Serialize(Models.Xbox.Catalog? obj) + => Serialize(obj, new UnicodeEncoding()); } } diff --git a/SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs b/SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs index ea92753b..b63ac5a6 100644 --- a/SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs +++ b/SabreTools.Serialization/Streams/ClrMamePro.Deserializer.cs @@ -10,19 +10,19 @@ namespace SabreTools.Serialization.Streams { public partial class ClrMamePro : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data, bool quotes = true) + /// + public static MetadataFile? DeserializeStream(Stream? data, bool quotes = true) { var deserializer = new ClrMamePro(); - return deserializer.DeserializeImpl(data, quotes); + return deserializer.Deserialize(data, quotes); } /// - public MetadataFile? DeserializeImpl(Stream? data) - => DeserializeImpl(data, true); + public MetadataFile? Deserialize(Stream? data) + => Deserialize(data, true); - /// - public MetadataFile? DeserializeImpl(Stream? data, bool quotes) + /// + public MetadataFile? Deserialize(Stream? data, bool quotes) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs b/SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs index cfcffc0b..f7176c2c 100644 --- a/SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization/Streams/ClrMamePro.Serializer.cs @@ -9,26 +9,26 @@ namespace SabreTools.Serialization.Streams { public partial class ClrMamePro : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new ClrMamePro(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public static Stream? Serialize(MetadataFile? obj, bool quotes) + /// + public static Stream? SerializeStream(MetadataFile? obj, bool quotes) { var serializer = new ClrMamePro(); - return serializer.SerializeImpl(obj, quotes); + return serializer.Serialize(obj, quotes); } /// - public Stream? SerializeImpl(MetadataFile? obj) - => SerializeImpl(obj, true); + public Stream? Serialize(MetadataFile? obj) + => Serialize(obj, true); - /// - public Stream? SerializeImpl(MetadataFile? obj, bool quotes) + /// + public Stream? Serialize(MetadataFile? obj, bool quotes) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/CueSheet.Deserializer.cs b/SabreTools.Serialization/Streams/CueSheet.Deserializer.cs index 4920d690..452bf9ca 100644 --- a/SabreTools.Serialization/Streams/CueSheet.Deserializer.cs +++ b/SabreTools.Serialization/Streams/CueSheet.Deserializer.cs @@ -11,15 +11,15 @@ namespace SabreTools.Serialization.Streams { public partial class CueSheet : IStreamSerializer { - /// - public static Models.CueSheets.CueSheet? Deserialize(Stream? data) + /// + public static Models.CueSheets.CueSheet? DeserializeStream(Stream? data) { var deserializer = new CueSheet(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.CueSheets.CueSheet? DeserializeImpl(Stream? data) + public Models.CueSheets.CueSheet? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/CueSheet.Serializer.cs b/SabreTools.Serialization/Streams/CueSheet.Serializer.cs index 648d7e27..2b45b4fb 100644 --- a/SabreTools.Serialization/Streams/CueSheet.Serializer.cs +++ b/SabreTools.Serialization/Streams/CueSheet.Serializer.cs @@ -8,15 +8,15 @@ namespace SabreTools.Serialization.Streams { public partial class CueSheet : IStreamSerializer { - /// - public static Stream? Serialize(Models.CueSheets.CueSheet? obj) + /// + public static Stream? SerializeStream(Models.CueSheets.CueSheet? obj) { var serializer = new CueSheet(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.CueSheets.CueSheet? obj) + public Stream? Serialize(Models.CueSheets.CueSheet? obj) { // If the cuesheet is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/DosCenter.Deserializer.cs b/SabreTools.Serialization/Streams/DosCenter.Deserializer.cs index cd15d1f9..86af7a17 100644 --- a/SabreTools.Serialization/Streams/DosCenter.Deserializer.cs +++ b/SabreTools.Serialization/Streams/DosCenter.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class DosCenter : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data) + /// + public static MetadataFile? DeserializeStream(Stream? data) { var deserializer = new DosCenter(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/DosCenter.Serializer.cs b/SabreTools.Serialization/Streams/DosCenter.Serializer.cs index 14be2c55..ef7ab720 100644 --- a/SabreTools.Serialization/Streams/DosCenter.Serializer.cs +++ b/SabreTools.Serialization/Streams/DosCenter.Serializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class DosCenter : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new DosCenter(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MetadataFile? obj) + public Stream? Serialize(MetadataFile? obj) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs index 5069ec57..0b513552 100644 --- a/SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs +++ b/SabreTools.Serialization/Streams/EverdriveSMDB.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class EverdriveSMDB : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data) + /// + public static MetadataFile? DeserializeStream(Stream? data) { var deserializer = new EverdriveSMDB(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs index 6e1d0761..0af1de7c 100644 --- a/SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs +++ b/SabreTools.Serialization/Streams/EverdriveSMDB.Serializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class EverdriveSMDB : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new EverdriveSMDB(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MetadataFile? obj) + public Stream? Serialize(MetadataFile? obj) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/GCF.Deserializer.cs b/SabreTools.Serialization/Streams/GCF.Deserializer.cs index 0d9e428b..caf2f310 100644 --- a/SabreTools.Serialization/Streams/GCF.Deserializer.cs +++ b/SabreTools.Serialization/Streams/GCF.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class GCF : IStreamSerializer { - /// - public static Models.GCF.File? Deserialize(Stream? data) + /// + public static Models.GCF.File? DeserializeStream(Stream? data) { var deserializer = new GCF(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.GCF.File? DeserializeImpl(Stream? data) + public Models.GCF.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/GCF.Serializer.cs b/SabreTools.Serialization/Streams/GCF.Serializer.cs index 14e898a4..82a0af6c 100644 --- a/SabreTools.Serialization/Streams/GCF.Serializer.cs +++ b/SabreTools.Serialization/Streams/GCF.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class GCF : IStreamSerializer { - /// - public static Stream? Serialize(Models.GCF.File? obj) + /// + public static Stream? SerializeStream(Models.GCF.File? obj) { var serializer = new GCF(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.GCF.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.GCF.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/HashFile.Deserializer.cs b/SabreTools.Serialization/Streams/HashFile.Deserializer.cs index 41174b07..23b4053b 100644 --- a/SabreTools.Serialization/Streams/HashFile.Deserializer.cs +++ b/SabreTools.Serialization/Streams/HashFile.Deserializer.cs @@ -9,19 +9,19 @@ namespace SabreTools.Serialization.Streams { public partial class Hashfile : IStreamSerializer { - /// - public static Models.Hashfile.Hashfile? Deserialize(Stream? data, Hash hash = Hash.CRC) + /// + public static Models.Hashfile.Hashfile? DeserializeStream(Stream? data, Hash hash = Hash.CRC) { var deserializer = new Hashfile(); - return deserializer.DeserializeImpl(data, hash); + return deserializer.Deserialize(data, hash); } /// - public Models.Hashfile.Hashfile? DeserializeImpl(Stream? data) - => DeserializeImpl(data, Hash.CRC); + public Models.Hashfile.Hashfile? Deserialize(Stream? data) + => Deserialize(data, Hash.CRC); - /// - public Models.Hashfile.Hashfile? DeserializeImpl(Stream? data, Hash hash) + /// + public Models.Hashfile.Hashfile? Deserialize(Stream? data, Hash hash) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/Hashfile.Serializer.cs b/SabreTools.Serialization/Streams/Hashfile.Serializer.cs index dfbc8811..511c45bc 100644 --- a/SabreTools.Serialization/Streams/Hashfile.Serializer.cs +++ b/SabreTools.Serialization/Streams/Hashfile.Serializer.cs @@ -10,26 +10,26 @@ namespace SabreTools.Serialization.Streams { public partial class Hashfile : IStreamSerializer { - /// - public static Stream? Serialize(Models.Hashfile.Hashfile? obj) + /// + public static Stream? SerializeStream(Models.Hashfile.Hashfile? obj) { var serializer = new Hashfile(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public static Stream? Serialize(Models.Hashfile.Hashfile? obj, Hash hash) + /// + public static Stream? SerializeStream(Models.Hashfile.Hashfile? obj, Hash hash) { var serializer = new Hashfile(); - return serializer.SerializeImpl(obj, hash); + return serializer.Serialize(obj, hash); } /// - public Stream? SerializeImpl(Models.Hashfile.Hashfile? obj) - => SerializeImpl(obj, Hash.CRC); + public Stream? Serialize(Models.Hashfile.Hashfile? obj) + => Serialize(obj, Hash.CRC); /// - public Stream? SerializeImpl(Models.Hashfile.Hashfile? obj, Hash hash) + public Stream? Serialize(Models.Hashfile.Hashfile? obj, Hash hash) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/IRD.Deserializer.cs b/SabreTools.Serialization/Streams/IRD.Deserializer.cs index 938e4da5..9ec68b9d 100644 --- a/SabreTools.Serialization/Streams/IRD.Deserializer.cs +++ b/SabreTools.Serialization/Streams/IRD.Deserializer.cs @@ -7,15 +7,15 @@ namespace SabreTools.Serialization.Streams { public partial class IRD : IStreamSerializer { - /// - public static Models.IRD.File? Deserialize(Stream? data) + /// + public static Models.IRD.File? DeserializeStream(Stream? data) { var deserializer = new IRD(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.IRD.File? DeserializeImpl(Stream? data) + public Models.IRD.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/IRD.Serializer.cs b/SabreTools.Serialization/Streams/IRD.Serializer.cs index dcc80ff8..058b0e7c 100644 --- a/SabreTools.Serialization/Streams/IRD.Serializer.cs +++ b/SabreTools.Serialization/Streams/IRD.Serializer.cs @@ -8,15 +8,15 @@ namespace SabreTools.Serialization.Streams { public partial class IRD : IStreamSerializer { - /// - public static Stream? Serialize(Models.IRD.File? obj) + /// + public static Stream? SerializeStream(Models.IRD.File? obj) { var serializer = new IRD(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.IRD.File? obj) + public Stream? Serialize(Models.IRD.File? obj) { // If the data is invalid if (obj?.Magic == null) diff --git a/SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs b/SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs index e18d4b27..00845da9 100644 --- a/SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Streams/InstallShieldCabinet.Deserializer.cs @@ -11,15 +11,15 @@ namespace SabreTools.Serialization.Streams // TODO: Add multi-cabinet reading public partial class InstallShieldCabinet : IStreamSerializer { - /// - public static Cabinet? Deserialize(Stream? data) + /// + public static Cabinet? DeserializeStream(Stream? data) { var deserializer = new InstallShieldCabinet(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Cabinet? DeserializeImpl(Stream? data) + public Cabinet? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs b/SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs index f6665948..9e45decb 100644 --- a/SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs +++ b/SabreTools.Serialization/Streams/InstallShieldCabinet.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class InstallShieldCabinet : IStreamSerializer { - /// - public static Stream? Serialize(Cabinet? obj) + /// + public static Stream? SerializeStream(Cabinet? obj) { var serializer = new InstallShieldCabinet(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Cabinet? obj) => throw new NotImplementedException(); + public Stream? Serialize(Cabinet? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/JsonFile.Deserializer.cs b/SabreTools.Serialization/Streams/JsonFile.Deserializer.cs index b3017c55..ab6fb6bc 100644 --- a/SabreTools.Serialization/Streams/JsonFile.Deserializer.cs +++ b/SabreTools.Serialization/Streams/JsonFile.Deserializer.cs @@ -12,8 +12,8 @@ namespace SabreTools.Serialization.Streams public partial class JsonFile : IStreamSerializer { /// - public virtual T? DeserializeImpl(Stream? data) - => DeserializeImpl(data, new UTF8Encoding(false)); + public virtual T? Deserialize(Stream? data) + => Deserialize(data, new UTF8Encoding(false)); /// /// Deserialize a Stream into @@ -22,7 +22,7 @@ namespace SabreTools.Serialization.Streams /// Stream to parse /// Text encoding to use /// Filled object on success, null on error - public T? DeserializeImpl(Stream? data, Encoding encoding) + public T? Deserialize(Stream? data, Encoding encoding) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/JsonFile.Serializer.cs b/SabreTools.Serialization/Streams/JsonFile.Serializer.cs index 76634151..1cca3310 100644 --- a/SabreTools.Serialization/Streams/JsonFile.Serializer.cs +++ b/SabreTools.Serialization/Streams/JsonFile.Serializer.cs @@ -12,8 +12,8 @@ namespace SabreTools.Serialization.Streams public partial class JsonFile : IStreamSerializer { /// - public virtual Stream? SerializeImpl(T? obj) - => SerializeImpl(obj, new UTF8Encoding(false)); + public virtual Stream? Serialize(T? obj) + => Serialize(obj, new UTF8Encoding(false)); /// /// Serialize a into a Stream @@ -22,7 +22,7 @@ namespace SabreTools.Serialization.Streams /// Data to serialize /// /// Filled object on success, null on error - public Stream? SerializeImpl(T? obj, Encoding encoding) + public Stream? Serialize(T? obj, Encoding encoding) { // If the object is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs index b8fb454b..54b99b6d 100644 --- a/SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Streams/LinearExecutable.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class LinearExecutable : IStreamSerializer { - /// - public static Executable? Deserialize(Stream? data) + /// + public static Executable? DeserializeStream(Stream? data) { var deserializer = new LinearExecutable(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Executable? DeserializeImpl(Stream? data) + public Executable? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) @@ -37,7 +37,7 @@ namespace SabreTools.Serialization.Streams #region MS-DOS Stub // Parse the MS-DOS stub - var stub = new MSDOS().DeserializeImpl(data); + var stub = new MSDOS().Deserialize(data); if (stub?.Header == null || stub.Header.NewExeHeaderAddr == 0) return null; diff --git a/SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs b/SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs index f9fa6e0a..3e1bb2fc 100644 --- a/SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs +++ b/SabreTools.Serialization/Streams/LinearExecutable.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class LinearExecutable : IStreamSerializer { - /// - public static Stream? Serialize(Executable? obj) + /// + public static Stream? SerializeStream(Executable? obj) { var serializer = new LinearExecutable(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Executable? obj) => throw new NotImplementedException(); + public Stream? Serialize(Executable? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Listrom.Deserializer.cs b/SabreTools.Serialization/Streams/Listrom.Deserializer.cs index 3ee9d612..391b5b06 100644 --- a/SabreTools.Serialization/Streams/Listrom.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Listrom.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class Listrom : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data) + /// + public static MetadataFile? DeserializeStream(Stream? data) { var deserializer = new Listrom(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/Listrom.Serializer.cs b/SabreTools.Serialization/Streams/Listrom.Serializer.cs index 60727a5d..c0e25370 100644 --- a/SabreTools.Serialization/Streams/Listrom.Serializer.cs +++ b/SabreTools.Serialization/Streams/Listrom.Serializer.cs @@ -8,15 +8,15 @@ namespace SabreTools.Serialization.Streams { public partial class Listrom : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new Listrom(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MetadataFile? obj) + public Stream? Serialize(MetadataFile? obj) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/Listxml.Deserializer.cs b/SabreTools.Serialization/Streams/Listxml.Deserializer.cs index 6db2cce2..dfddaf2f 100644 --- a/SabreTools.Serialization/Streams/Listxml.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Listxml.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class Listxml : XmlFile { - /// - public static Models.Listxml.Mame? Deserialize(System.IO.Stream? data) + /// + public static Models.Listxml.Mame? DeserializeStream(System.IO.Stream? data) { var deserializer = new Listxml(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Listxml.Serializer.cs b/SabreTools.Serialization/Streams/Listxml.Serializer.cs index 24572097..70a27d93 100644 --- a/SabreTools.Serialization/Streams/Listxml.Serializer.cs +++ b/SabreTools.Serialization/Streams/Listxml.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class Listxml : XmlFile { - /// - public static System.IO.Stream? Serialize(Models.Listxml.Mame? obj) + /// + public static System.IO.Stream? SerializeStream(Models.Listxml.Mame? obj) { var serializer = new Listxml(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Logiqx.Deserializer.cs b/SabreTools.Serialization/Streams/Logiqx.Deserializer.cs index 6a4d2a91..b11f3565 100644 --- a/SabreTools.Serialization/Streams/Logiqx.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Logiqx.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class Logiqx : XmlFile { - /// - public static Models.Logiqx.Datafile? Deserialize(System.IO.Stream? data) + /// + public static Models.Logiqx.Datafile? DeserializeStream(System.IO.Stream? data) { var deserializer = new Logiqx(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Logiqx.Serializer.cs b/SabreTools.Serialization/Streams/Logiqx.Serializer.cs index 57a74d44..1ba58620 100644 --- a/SabreTools.Serialization/Streams/Logiqx.Serializer.cs +++ b/SabreTools.Serialization/Streams/Logiqx.Serializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Streams { public partial class Logiqx : XmlFile { - /// - public static Stream? Serialize(Datafile? obj) + /// + public static Stream? SerializeStream(Datafile? obj) { var serializer = new Logiqx(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public override Stream? SerializeImpl(Datafile? obj) - => SerializeImpl(obj, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId); + /// + public override Stream? Serialize(Datafile? obj) + => Serialize(obj, Serialization.Logiqx.DocTypeName, Serialization.Logiqx.DocTypePubId, Serialization.Logiqx.DocTypeSysId, Serialization.Logiqx.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/M1.Deserializer.cs b/SabreTools.Serialization/Streams/M1.Deserializer.cs index 803fd38e..c1d1a24a 100644 --- a/SabreTools.Serialization/Streams/M1.Deserializer.cs +++ b/SabreTools.Serialization/Streams/M1.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class M1 : XmlFile { - /// - public static Models.Listxml.M1? Deserialize(System.IO.Stream? data) + /// + public static Models.Listxml.M1? DeserializeStream(System.IO.Stream? data) { var deserializer = new M1(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/M1.Serializer.cs b/SabreTools.Serialization/Streams/M1.Serializer.cs index a82b8494..a22550a8 100644 --- a/SabreTools.Serialization/Streams/M1.Serializer.cs +++ b/SabreTools.Serialization/Streams/M1.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class M1 : XmlFile { - /// - public static System.IO.Stream? Serialize(Models.Listxml.M1? obj) + /// + public static System.IO.Stream? SerializeStream(Models.Listxml.M1? obj) { var serializer = new M1(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/MSDOS.Deserializer.cs b/SabreTools.Serialization/Streams/MSDOS.Deserializer.cs index 2c565aeb..a6f923ee 100644 --- a/SabreTools.Serialization/Streams/MSDOS.Deserializer.cs +++ b/SabreTools.Serialization/Streams/MSDOS.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class MSDOS : IStreamSerializer { - /// - public static Executable? Deserialize(Stream? data) + /// + public static Executable? DeserializeStream(Stream? data) { var deserializer = new MSDOS(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Executable? DeserializeImpl(Stream? data) + public Executable? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/MSDOS.Serializer.cs b/SabreTools.Serialization/Streams/MSDOS.Serializer.cs index 2ce5e491..255f35d1 100644 --- a/SabreTools.Serialization/Streams/MSDOS.Serializer.cs +++ b/SabreTools.Serialization/Streams/MSDOS.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class MSDOS : IStreamSerializer { - /// - public static Stream? Serialize(Executable? obj) + /// + public static Stream? SerializeStream(Executable? obj) { var serializer = new MSDOS(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Executable? obj) => throw new NotImplementedException(); + public Stream? Serialize(Executable? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs b/SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs index f668a306..b026e66e 100644 --- a/SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs +++ b/SabreTools.Serialization/Streams/MicrosoftCabinet.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams // TODO: Add multi-cabinet reading public partial class MicrosoftCabinet : IStreamSerializer { - /// - public static Cabinet? Deserialize(Stream? data) + /// + public static Cabinet? DeserializeStream(Stream? data) { var deserializer = new MicrosoftCabinet(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Cabinet? DeserializeImpl(Stream? data) + public Cabinet? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs b/SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs index 738c2759..b54058dc 100644 --- a/SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs +++ b/SabreTools.Serialization/Streams/MicrosoftCabinet.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class MicrosoftCabinet : IStreamSerializer { - /// - public static Stream? Serialize(Cabinet? obj) + /// + public static Stream? SerializeStream(Cabinet? obj) { var serializer = new MicrosoftCabinet(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Cabinet? obj) => throw new NotImplementedException(); + public Stream? Serialize(Cabinet? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs b/SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs index ef6cdb3e..a72d305c 100644 --- a/SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs +++ b/SabreTools.Serialization/Streams/MoPaQ.Deserializer.cs @@ -11,15 +11,15 @@ namespace SabreTools.Serialization.Streams { public partial class MoPaQ : IStreamSerializer { - /// - public static Archive? Deserialize(Stream? data) + /// + public static Archive? DeserializeStream(Stream? data) { var deserializer = new MoPaQ(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Archive? DeserializeImpl(Stream? data) + public Archive? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/MoPaQ.Serializer.cs b/SabreTools.Serialization/Streams/MoPaQ.Serializer.cs index 84bde743..3a23d595 100644 --- a/SabreTools.Serialization/Streams/MoPaQ.Serializer.cs +++ b/SabreTools.Serialization/Streams/MoPaQ.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class MoPaQ : IStreamSerializer { - /// - public static Stream? Serialize(Archive? obj) + /// + public static Stream? SerializeStream(Archive? obj) { var serializer = new MoPaQ(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Archive? obj) => throw new NotImplementedException(); + public Stream? Serialize(Archive? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/N3DS.Deserializer.cs b/SabreTools.Serialization/Streams/N3DS.Deserializer.cs index 1426c1b6..21703247 100644 --- a/SabreTools.Serialization/Streams/N3DS.Deserializer.cs +++ b/SabreTools.Serialization/Streams/N3DS.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class N3DS : IStreamSerializer { - /// - public static Cart? Deserialize(Stream? data) + /// + public static Cart? DeserializeStream(Stream? data) { var deserializer = new N3DS(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Cart? DeserializeImpl(Stream? data) + public Cart? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/N3DS.Serializer.cs b/SabreTools.Serialization/Streams/N3DS.Serializer.cs index c2ba16d3..88766ba3 100644 --- a/SabreTools.Serialization/Streams/N3DS.Serializer.cs +++ b/SabreTools.Serialization/Streams/N3DS.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class N3DS : IStreamSerializer { - /// - public static Stream? Serialize(Cart? obj) + /// + public static Stream? SerializeStream(Cart? obj) { var serializer = new N3DS(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Cart? obj) => throw new NotImplementedException(); + public Stream? Serialize(Cart? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/NCF.Deserialization.cs b/SabreTools.Serialization/Streams/NCF.Deserialization.cs index ff293c66..03f1d548 100644 --- a/SabreTools.Serialization/Streams/NCF.Deserialization.cs +++ b/SabreTools.Serialization/Streams/NCF.Deserialization.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class NCF : IStreamSerializer { - /// - public static Models.NCF.File? Deserialize(Stream? data) + /// + public static Models.NCF.File? DeserializeStream(Stream? data) { var deserializer = new NCF(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.NCF.File? DeserializeImpl(Stream? data) + public Models.NCF.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/NCF.Serialization.cs b/SabreTools.Serialization/Streams/NCF.Serialization.cs index c3c34488..7d503f7a 100644 --- a/SabreTools.Serialization/Streams/NCF.Serialization.cs +++ b/SabreTools.Serialization/Streams/NCF.Serialization.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class NCF : IStreamSerializer { - /// - public static Stream? Serialize(Models.NCF.File? obj) + /// + public static Stream? SerializeStream(Models.NCF.File? obj) { var serializer = new NCF(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.NCF.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.NCF.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs index b8c641f4..ddc056c1 100644 --- a/SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Streams/NewExecutable.Deserializer.cs @@ -11,15 +11,15 @@ namespace SabreTools.Serialization.Streams { public partial class NewExecutable : IStreamSerializer { - /// - public static Executable? Deserialize(Stream? data) + /// + public static Executable? DeserializeStream(Stream? data) { var deserializer = new NewExecutable(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Executable? DeserializeImpl(Stream? data) + public Executable? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) @@ -38,7 +38,7 @@ namespace SabreTools.Serialization.Streams #region MS-DOS Stub // Parse the MS-DOS stub - var stub = new MSDOS().DeserializeImpl(data); + var stub = new MSDOS().Deserialize(data); if (stub?.Header == null || stub.Header.NewExeHeaderAddr == 0) return null; diff --git a/SabreTools.Serialization/Streams/NewExecutable.Serializer.cs b/SabreTools.Serialization/Streams/NewExecutable.Serializer.cs index bf5a3491..9ddc2c01 100644 --- a/SabreTools.Serialization/Streams/NewExecutable.Serializer.cs +++ b/SabreTools.Serialization/Streams/NewExecutable.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class NewExecutable : IStreamSerializer { - /// - public static Stream? Serialize(Executable? obj) + /// + public static Stream? SerializeStream(Executable? obj) { var serializer = new NewExecutable(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Executable? obj) => throw new NotImplementedException(); + public Stream? Serialize(Executable? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Nitro.Deserializer.cs b/SabreTools.Serialization/Streams/Nitro.Deserializer.cs index b4e90075..3c19cb8a 100644 --- a/SabreTools.Serialization/Streams/Nitro.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Nitro.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class Nitro : IStreamSerializer { - /// - public static Cart? Deserialize(Stream? data) + /// + public static Cart? DeserializeStream(Stream? data) { var deserializer = new Nitro(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Cart? DeserializeImpl(Stream? data) + public Cart? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/Nitro.Serializer.cs b/SabreTools.Serialization/Streams/Nitro.Serializer.cs index 5952c81a..09884687 100644 --- a/SabreTools.Serialization/Streams/Nitro.Serializer.cs +++ b/SabreTools.Serialization/Streams/Nitro.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class Nitro : IStreamSerializer { - /// - public static Stream? Serialize(Cart? obj) + /// + public static Stream? SerializeStream(Cart? obj) { var serializer = new Nitro(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Cart? obj) => throw new NotImplementedException(); + public Stream? Serialize(Cart? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/OfflineList.Deserializer.cs b/SabreTools.Serialization/Streams/OfflineList.Deserializer.cs index daf2fe09..66fcf659 100644 --- a/SabreTools.Serialization/Streams/OfflineList.Deserializer.cs +++ b/SabreTools.Serialization/Streams/OfflineList.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class OfflineList : XmlFile { - /// - public static Models.OfflineList.Dat? Deserialize(System.IO.Stream? data) + /// + public static Models.OfflineList.Dat? DeserializeStream(System.IO.Stream? data) { var deserializer = new OfflineList(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/OfflineList.Serializer.cs b/SabreTools.Serialization/Streams/OfflineList.Serializer.cs index 3e027e28..65b71eb1 100644 --- a/SabreTools.Serialization/Streams/OfflineList.Serializer.cs +++ b/SabreTools.Serialization/Streams/OfflineList.Serializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class OfflineList : XmlFile { - /// - public static System.IO.Stream? Serialize(Models.OfflineList.Dat? obj) + /// + public static System.IO.Stream? SerializeStream(Models.OfflineList.Dat? obj) { var serializer = new OfflineList(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs b/SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs index 5b9ba2fb..0e48d427 100644 --- a/SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs +++ b/SabreTools.Serialization/Streams/OpenMSX.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class OpenMSX : XmlFile { - /// - public static Models.OpenMSX.SoftwareDb? Deserialize(System.IO.Stream? data) + /// + public static Models.OpenMSX.SoftwareDb? DeserializeStream(System.IO.Stream? data) { var deserializer = new OpenMSX(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/OpenMSX.Serializer.cs b/SabreTools.Serialization/Streams/OpenMSX.Serializer.cs index 98030966..047b1b47 100644 --- a/SabreTools.Serialization/Streams/OpenMSX.Serializer.cs +++ b/SabreTools.Serialization/Streams/OpenMSX.Serializer.cs @@ -5,15 +5,15 @@ namespace SabreTools.Serialization.Streams { public partial class OpenMSX : XmlFile { - /// - public static Stream? Serialize(SoftwareDb? obj) + /// + public static Stream? SerializeStream(SoftwareDb? obj) { var serializer = new OpenMSX(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public override Stream? SerializeImpl(SoftwareDb? obj) - => SerializeImpl(obj, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId); + /// + public override Stream? Serialize(SoftwareDb? obj) + => Serialize(obj, Serialization.OpenMSX.DocTypeName, Serialization.OpenMSX.DocTypePubId, Serialization.OpenMSX.DocTypeSysId, Serialization.OpenMSX.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PAK.Deserializer.cs b/SabreTools.Serialization/Streams/PAK.Deserializer.cs index 92260479..335f670a 100644 --- a/SabreTools.Serialization/Streams/PAK.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PAK.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class PAK : IStreamSerializer { - /// - public static Models.PAK.File? Deserialize(Stream? data) + /// + public static Models.PAK.File? DeserializeStream(Stream? data) { var deserializer = new PAK(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.PAK.File? DeserializeImpl(Stream? data) + public Models.PAK.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/PAK.Serializer.cs b/SabreTools.Serialization/Streams/PAK.Serializer.cs index 21900a57..460b4856 100644 --- a/SabreTools.Serialization/Streams/PAK.Serializer.cs +++ b/SabreTools.Serialization/Streams/PAK.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class PAK : IStreamSerializer { - /// - public static Stream? Serialize(Models.PAK.File? obj) + /// + public static Stream? SerializeStream(Models.PAK.File? obj) { var serializer = new PAK(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.PAK.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.PAK.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PFF.Deserializer.cs b/SabreTools.Serialization/Streams/PFF.Deserializer.cs index 69f5e93b..69608f6b 100644 --- a/SabreTools.Serialization/Streams/PFF.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PFF.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class PFF : IStreamSerializer { - /// - public static Archive? Deserialize(Stream? data) + /// + public static Archive? DeserializeStream(Stream? data) { var deserializer = new PFF(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Archive? DeserializeImpl(Stream? data) + public Archive? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/PFF.Serializer.cs b/SabreTools.Serialization/Streams/PFF.Serializer.cs index cd35f994..9bd2b5d7 100644 --- a/SabreTools.Serialization/Streams/PFF.Serializer.cs +++ b/SabreTools.Serialization/Streams/PFF.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class PFF : IStreamSerializer { - /// - public static Stream? Serialize(Archive? obj) + /// + public static Stream? SerializeStream(Archive? obj) { var serializer = new PFF(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Archive? obj) => throw new NotImplementedException(); + public Stream? Serialize(Archive? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PIC.Deserializer.cs b/SabreTools.Serialization/Streams/PIC.Deserializer.cs index eb66d543..a2a056de 100644 --- a/SabreTools.Serialization/Streams/PIC.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PIC.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class PIC : IStreamSerializer { - /// - public static DiscInformation? Deserialize(Stream? data) + /// + public static DiscInformation? DeserializeStream(Stream? data) { var deserializer = new PIC(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public DiscInformation? DeserializeImpl(Stream? data) + public DiscInformation? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/PIC.Serializer.cs b/SabreTools.Serialization/Streams/PIC.Serializer.cs index a69ec6d5..b154d79d 100644 --- a/SabreTools.Serialization/Streams/PIC.Serializer.cs +++ b/SabreTools.Serialization/Streams/PIC.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class PIC : IStreamSerializer { - /// - public static Stream? Serialize(DiscInformation? obj) + /// + public static Stream? SerializeStream(DiscInformation? obj) { var serializer = new PIC(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(DiscInformation? obj) => throw new NotImplementedException(); + public Stream? Serialize(DiscInformation? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs b/SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs index c1fc0cad..1e3110bc 100644 --- a/SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PlayJAudio.Deserializer.cs @@ -9,27 +9,20 @@ namespace SabreTools.Serialization.Streams { public partial class PlayJAudio : IStreamSerializer { - /// - public static AudioFile? Deserialize(Stream? data) + /// + public static AudioFile? DeserializeStream(Stream? data, long adjust = 0) { var deserializer = new PlayJAudio(); - return deserializer.DeserializeImpl(data); - } - - /// - public static AudioFile? Deserialize(Stream? data, long adjust) - { - var deserializer = new PlayJAudio(); - return deserializer.DeserializeImpl(data, adjust); + return deserializer.Deserialize(data, adjust); } /// - public AudioFile? DeserializeImpl(Stream? data) - => DeserializeImpl(data, 0); + public AudioFile? Deserialize(Stream? data) + => Deserialize(data, 0); - /// + /// /// Offset to adjust all seeking by - public AudioFile? DeserializeImpl(Stream? data, long adjust) + public AudioFile? Deserialize(Stream? data, long adjust) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs b/SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs index 493a0f58..30ebcb32 100644 --- a/SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs +++ b/SabreTools.Serialization/Streams/PlayJAudio.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class PlayJAudio : IStreamSerializer { - /// - public static Stream? Serialize(AudioFile? obj) + /// + public static Stream? SerializeStream(AudioFile? obj) { var serializer = new PlayJAudio(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(AudioFile? obj) => throw new NotImplementedException(); + public Stream? Serialize(AudioFile? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs index 02824036..167e5143 100644 --- a/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs @@ -7,15 +7,15 @@ namespace SabreTools.Serialization.Streams { public partial class PlayJPlaylist : IStreamSerializer { - /// - public static Playlist? Deserialize(Stream? data) + /// + public static Playlist? DeserializeStream(Stream? data) { var deserializer = new PlayJPlaylist(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Playlist? DeserializeImpl(Stream? data) + public Playlist? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) @@ -52,7 +52,7 @@ namespace SabreTools.Serialization.Streams for (int i = 0; i < playlist.AudioFiles.Length; i++) { long currentOffset = data.Position; - var entryHeader = PlayJAudio.Deserialize(data, currentOffset); + var entryHeader = PlayJAudio.DeserializeStream(data, currentOffset); if (entryHeader == null) return null; diff --git a/SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs b/SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs index 495dd9a9..653a2ea3 100644 --- a/SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs +++ b/SabreTools.Serialization/Streams/PlayJPlaylist.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class PlayJPlaylist : IStreamSerializer { - /// - public static Stream? Serialize(Playlist? obj) + /// + public static Stream? SerializeStream(Playlist? obj) { var serializer = new PlayJPlaylist(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Playlist? obj) => throw new NotImplementedException(); + public Stream? Serialize(Playlist? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs b/SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs index 35817afe..f09d1a3f 100644 --- a/SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PortableExecutable.Deserializer.cs @@ -12,15 +12,15 @@ namespace SabreTools.Serialization.Streams { public partial class PortableExecutable : IStreamSerializer { - /// - public static Executable? Deserialize(Stream? data) + /// + public static Executable? DeserializeStream(Stream? data) { var deserializer = new PortableExecutable(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Executable? DeserializeImpl(Stream? data) + public Executable? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) @@ -39,7 +39,7 @@ namespace SabreTools.Serialization.Streams #region MS-DOS Stub // Parse the MS-DOS stub - var stub = new MSDOS().DeserializeImpl(data); + var stub = new MSDOS().Deserialize(data); if (stub?.Header == null || stub.Header.NewExeHeaderAddr == 0) return null; diff --git a/SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs b/SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs index 4deb0d0b..4668c3d6 100644 --- a/SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs +++ b/SabreTools.Serialization/Streams/PortableExecutable.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class PortableExecutable : IStreamSerializer { - /// - public static Stream? Serialize(Executable? obj) + /// + public static Stream? SerializeStream(Executable? obj) { var serializer = new PortableExecutable(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Executable? obj) => throw new NotImplementedException(); + public Stream? Serialize(Executable? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/Quantum.Deserializer.cs b/SabreTools.Serialization/Streams/Quantum.Deserializer.cs index 97e0315d..d32c2c7a 100644 --- a/SabreTools.Serialization/Streams/Quantum.Deserializer.cs +++ b/SabreTools.Serialization/Streams/Quantum.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class Quantum : IStreamSerializer { - /// - public static Archive? Deserialize(Stream? data) + /// + public static Archive? DeserializeStream(Stream? data) { var deserializer = new Quantum(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Archive? DeserializeImpl(Stream? data) + public Archive? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/Quantum.Serializer.cs b/SabreTools.Serialization/Streams/Quantum.Serializer.cs index 98637343..7d24480a 100644 --- a/SabreTools.Serialization/Streams/Quantum.Serializer.cs +++ b/SabreTools.Serialization/Streams/Quantum.Serializer.cs @@ -7,14 +7,14 @@ namespace SabreTools.Serialization.Streams { public partial class Quantum : IStreamSerializer { - /// - public static Stream? Serialize(Archive? obj) + /// + public static Stream? SerializeStream(Archive? obj) { var serializer = new Quantum(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Archive? obj) => throw new NotImplementedException(); + public Stream? Serialize(Archive? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/RomCenter.Deserializer.cs b/SabreTools.Serialization/Streams/RomCenter.Deserializer.cs index bdf988b7..87320dce 100644 --- a/SabreTools.Serialization/Streams/RomCenter.Deserializer.cs +++ b/SabreTools.Serialization/Streams/RomCenter.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class RomCenter : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data) + /// + public static MetadataFile? DeserializeStream(Stream? data) { var deserializer = new RomCenter(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/RomCenter.Serializer.cs b/SabreTools.Serialization/Streams/RomCenter.Serializer.cs index e65930e9..91f61d04 100644 --- a/SabreTools.Serialization/Streams/RomCenter.Serializer.cs +++ b/SabreTools.Serialization/Streams/RomCenter.Serializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class RomCenter : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new RomCenter(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(MetadataFile? obj) + public Stream? Serialize(MetadataFile? obj) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/SGA.Deserializer.cs b/SabreTools.Serialization/Streams/SGA.Deserializer.cs index 54d99371..5f2f0bb2 100644 --- a/SabreTools.Serialization/Streams/SGA.Deserializer.cs +++ b/SabreTools.Serialization/Streams/SGA.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class SGA : IStreamSerializer { - /// - public static Models.SGA.File? Deserialize(Stream? data) + /// + public static Models.SGA.File? DeserializeStream(Stream? data) { var deserializer = new SGA(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.SGA.File? DeserializeImpl(Stream? data) + public Models.SGA.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/SGA.Serializer.cs b/SabreTools.Serialization/Streams/SGA.Serializer.cs index 4c7dcc83..c1b50c3d 100644 --- a/SabreTools.Serialization/Streams/SGA.Serializer.cs +++ b/SabreTools.Serialization/Streams/SGA.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class SGA : IStreamSerializer { - /// - public static Stream? Serialize(Models.SGA.File? obj) + /// + public static Stream? SerializeStream(Models.SGA.File? obj) { var serializer = new SGA(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.SGA.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.SGA.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs index 407a03e1..11671e0f 100644 --- a/SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization/Streams/SeparatedValue.Deserializer.cs @@ -10,19 +10,19 @@ namespace SabreTools.Serialization.Streams { public partial class SeparatedValue : IStreamSerializer { - /// - public static MetadataFile? Deserialize(Stream? data, char delim = ',') + /// + public static MetadataFile? DeserializeStream(Stream? data, char delim = ',') { var deserializer = new SeparatedValue(); - return deserializer.DeserializeImpl(data, delim); + return deserializer.Deserialize(data, delim); } /// - public MetadataFile? DeserializeImpl(Stream? data) + public MetadataFile? Deserialize(Stream? data) => Deserialize(data, ','); - /// - public MetadataFile? DeserializeImpl(Stream? data, char delim) + /// + public MetadataFile? Deserialize(Stream? data, char delim) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs b/SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs index 0caf259d..ce5822ec 100644 --- a/SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization/Streams/SeparatedValue.Serializer.cs @@ -9,26 +9,26 @@ namespace SabreTools.Serialization.Streams { public partial class SeparatedValue : IStreamSerializer { - /// - public static Stream? Serialize(MetadataFile? obj) + /// + public static Stream? SerializeStream(MetadataFile? obj) { var serializer = new SeparatedValue(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public static Stream? Serialize(MetadataFile? obj, char delim) + /// + public static Stream? SerializeStream(MetadataFile? obj, char delim) { var serializer = new SeparatedValue(); - return serializer.SerializeImpl(obj, delim); + return serializer.Serialize(obj, delim); } /// - public Stream? SerializeImpl(MetadataFile? obj) - => SerializeImpl(obj, ','); + public Stream? Serialize(MetadataFile? obj) + => Serialize(obj, ','); - /// - public Stream? SerializeImpl(MetadataFile? obj, char delim) + /// + public Stream? Serialize(MetadataFile? obj, char delim) { // If the metadata file is null if (obj == null) diff --git a/SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs b/SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs index 68e7328e..c2255830 100644 --- a/SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs +++ b/SabreTools.Serialization/Streams/SoftwareList.Deserializer.cs @@ -2,11 +2,11 @@ namespace SabreTools.Serialization.Streams { public partial class SoftwareList : XmlFile { - /// - public static Models.SoftwareList.SoftwareList? Deserialize(System.IO.Stream? data) + /// + public static Models.SoftwareList.SoftwareList? DeserializeStream(System.IO.Stream? data) { var deserializer = new SoftwareList(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/SoftwareList.Serializer.cs b/SabreTools.Serialization/Streams/SoftwareList.Serializer.cs index 98cd1360..5aece31f 100644 --- a/SabreTools.Serialization/Streams/SoftwareList.Serializer.cs +++ b/SabreTools.Serialization/Streams/SoftwareList.Serializer.cs @@ -4,15 +4,15 @@ namespace SabreTools.Serialization.Streams { public partial class SoftwareList : XmlFile { - /// - public static Stream? Serialize(Models.SoftwareList.SoftwareList? obj) + /// + public static Stream? SerializeStream(Models.SoftwareList.SoftwareList? obj) { var serializer = new SoftwareList(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } - /// - public override Stream? SerializeImpl(Models.SoftwareList.SoftwareList? obj) - => SerializeImpl(obj, SoftawreList.DocTypeName, SoftawreList.DocTypePubId, SoftawreList.DocTypeSysId, SoftawreList.DocTypeSysId); + /// + public override Stream? Serialize(Models.SoftwareList.SoftwareList? obj) + => Serialize(obj, SoftawreList.DocTypeName, SoftawreList.DocTypePubId, SoftawreList.DocTypeSysId, SoftawreList.DocTypeSysId); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/VBSP.Deserializer.cs b/SabreTools.Serialization/Streams/VBSP.Deserializer.cs index b9218734..4bd0a83c 100644 --- a/SabreTools.Serialization/Streams/VBSP.Deserializer.cs +++ b/SabreTools.Serialization/Streams/VBSP.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class VBSP : IStreamSerializer { - /// - public static Models.VBSP.File? Deserialize(Stream? data) + /// + public static Models.VBSP.File? DeserializeStream(Stream? data) { var deserializer = new VBSP(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.VBSP.File? DeserializeImpl(Stream? data) + public Models.VBSP.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/VBSP.Serializer.cs b/SabreTools.Serialization/Streams/VBSP.Serializer.cs index c66341e1..e9d10a04 100644 --- a/SabreTools.Serialization/Streams/VBSP.Serializer.cs +++ b/SabreTools.Serialization/Streams/VBSP.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class VBSP : IStreamSerializer { - /// - public static Stream? Serialize(Models.VBSP.File? obj) + /// + public static Stream? SerializeStream(Models.VBSP.File? obj) { var serializer = new VBSP(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.VBSP.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.VBSP.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/VPK.Deserializer.cs b/SabreTools.Serialization/Streams/VPK.Deserializer.cs index 4bb4b61e..e6301bae 100644 --- a/SabreTools.Serialization/Streams/VPK.Deserializer.cs +++ b/SabreTools.Serialization/Streams/VPK.Deserializer.cs @@ -10,15 +10,15 @@ namespace SabreTools.Serialization.Streams { public partial class VPK : IStreamSerializer { - /// - public static Models.VPK.File? Deserialize(Stream? data) + /// + public static Models.VPK.File? DeserializeStream(Stream? data) { var deserializer = new VPK(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.VPK.File? DeserializeImpl(Stream? data) + public Models.VPK.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/VPK.Serializer.cs b/SabreTools.Serialization/Streams/VPK.Serializer.cs index db52fb6b..fbb6e676 100644 --- a/SabreTools.Serialization/Streams/VPK.Serializer.cs +++ b/SabreTools.Serialization/Streams/VPK.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class VPK : IStreamSerializer { - /// - public static Stream? Serialize(Models.VPK.File? obj) + /// + public static Stream? SerializeStream(Models.VPK.File? obj) { var serializer = new VPK(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.VPK.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.VPK.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/WAD.Deserializer.cs b/SabreTools.Serialization/Streams/WAD.Deserializer.cs index 5fdd3ae2..d8fdf154 100644 --- a/SabreTools.Serialization/Streams/WAD.Deserializer.cs +++ b/SabreTools.Serialization/Streams/WAD.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class WAD : IStreamSerializer { - /// - public static Models.WAD.File? Deserialize(Stream? data) + /// + public static Models.WAD.File? DeserializeStream(Stream? data) { var deserializer = new WAD(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.WAD.File? DeserializeImpl(Stream? data) + public Models.WAD.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/WAD.Serializer.cs b/SabreTools.Serialization/Streams/WAD.Serializer.cs index c3afd72c..e50bc95e 100644 --- a/SabreTools.Serialization/Streams/WAD.Serializer.cs +++ b/SabreTools.Serialization/Streams/WAD.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class WAD : IStreamSerializer { - /// - public static Stream? Serialize(Models.WAD.File? obj) + /// + public static Stream? SerializeStream(Models.WAD.File? obj) { var serializer = new WAD(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.WAD.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.WAD.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/XZP.Deserializer.cs b/SabreTools.Serialization/Streams/XZP.Deserializer.cs index b2ca5d9c..20c42003 100644 --- a/SabreTools.Serialization/Streams/XZP.Deserializer.cs +++ b/SabreTools.Serialization/Streams/XZP.Deserializer.cs @@ -9,15 +9,15 @@ namespace SabreTools.Serialization.Streams { public partial class XZP : IStreamSerializer { - /// - public static Models.XZP.File? Deserialize(Stream? data) + /// + public static Models.XZP.File? DeserializeStream(Stream? data) { var deserializer = new XZP(); - return deserializer.DeserializeImpl(data); + return deserializer.Deserialize(data); } /// - public Models.XZP.File? DeserializeImpl(Stream? data) + public Models.XZP.File? Deserialize(Stream? data) { // If the data is invalid if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) diff --git a/SabreTools.Serialization/Streams/XZP.Serializer.cs b/SabreTools.Serialization/Streams/XZP.Serializer.cs index 4d5f7e1e..e3e80cf1 100644 --- a/SabreTools.Serialization/Streams/XZP.Serializer.cs +++ b/SabreTools.Serialization/Streams/XZP.Serializer.cs @@ -6,14 +6,14 @@ namespace SabreTools.Serialization.Streams { public partial class XZP : IStreamSerializer { - /// - public static Stream? Serialize(Models.XZP.File? obj) + /// + public static Stream? SerializeStream(Models.XZP.File? obj) { var serializer = new XZP(); - return serializer.SerializeImpl(obj); + return serializer.Serialize(obj); } /// - public Stream? SerializeImpl(Models.XZP.File? obj) => throw new NotImplementedException(); + public Stream? Serialize(Models.XZP.File? obj) => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/SabreTools.Serialization/Streams/XmlFile.Deserializer.cs b/SabreTools.Serialization/Streams/XmlFile.Deserializer.cs index cfc351ae..d47b3e92 100644 --- a/SabreTools.Serialization/Streams/XmlFile.Deserializer.cs +++ b/SabreTools.Serialization/Streams/XmlFile.Deserializer.cs @@ -13,7 +13,7 @@ namespace SabreTools.Serialization.Streams public partial class XmlFile : IStreamSerializer { /// - public T? DeserializeImpl(Stream? data) + public T? Deserialize(Stream? data) { // If the stream is null if (data == null) diff --git a/SabreTools.Serialization/Streams/XmlFile.Serializer.cs b/SabreTools.Serialization/Streams/XmlFile.Serializer.cs index 1fc97779..415498eb 100644 --- a/SabreTools.Serialization/Streams/XmlFile.Serializer.cs +++ b/SabreTools.Serialization/Streams/XmlFile.Serializer.cs @@ -17,8 +17,8 @@ namespace SabreTools.Serialization.Streams /// /// Data to serialize /// Stream containing serialized data on success, null otherwise - public virtual Stream? SerializeImpl(T? obj) - => SerializeImpl(obj, null, null, null, null); + public virtual Stream? Serialize(T? obj) + => Serialize(obj, null, null, null, null); /// /// Serializes the defined type to a stream @@ -29,7 +29,7 @@ namespace SabreTools.Serialization.Streams /// Optional DOCTYPE sysid /// Optional DOCTYPE name /// Stream containing serialized data on success, null otherwise - public Stream? SerializeImpl(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) + public Stream? Serialize(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) { // If the object is null if (obj == null) diff --git a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs index a0e00084..15f76f14 100644 --- a/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs +++ b/SabreTools.Serialization/Wrappers/AACSMediaKeyBlock.cs @@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var mediaKeyBlock = Streams.AACS.Deserialize(data); + var mediaKeyBlock = Streams.AACS.DeserializeStream(data); if (mediaKeyBlock == null) return null; diff --git a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs index 2e6845f9..87c5936b 100644 --- a/SabreTools.Serialization/Wrappers/BDPlusSVM.cs +++ b/SabreTools.Serialization/Wrappers/BDPlusSVM.cs @@ -60,11 +60,11 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var svm = Streams.BDPlus.Deserialize(data); + var svm = Streams.BDPlus.DeserializeStream(data); if (svm == null) return null; - try + try { return new BDPlusSVM(svm, data); } diff --git a/SabreTools.Serialization/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs index 73a1e101..bd9e4575 100644 --- a/SabreTools.Serialization/Wrappers/BFPK.cs +++ b/SabreTools.Serialization/Wrappers/BFPK.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.BFPK.Deserialize(data); + var archive = Streams.BFPK.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/BSP.cs b/SabreTools.Serialization/Wrappers/BSP.cs index e7dec199..ad5fdbfd 100644 --- a/SabreTools.Serialization/Wrappers/BSP.cs +++ b/SabreTools.Serialization/Wrappers/BSP.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.BSP.Deserialize(data); + var file = Streams.BSP.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/CFB.cs b/SabreTools.Serialization/Wrappers/CFB.cs index c1635483..6aeeef29 100644 --- a/SabreTools.Serialization/Wrappers/CFB.cs +++ b/SabreTools.Serialization/Wrappers/CFB.cs @@ -75,7 +75,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var binary = Streams.CFB.Deserialize(data); + var binary = Streams.CFB.DeserializeStream(data); if (binary == null) return null; diff --git a/SabreTools.Serialization/Wrappers/CIA.cs b/SabreTools.Serialization/Wrappers/CIA.cs index b757a6b5..ed9c2d92 100644 --- a/SabreTools.Serialization/Wrappers/CIA.cs +++ b/SabreTools.Serialization/Wrappers/CIA.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.CIA.Deserialize(data); + var archive = Streams.CIA.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/GCF.cs b/SabreTools.Serialization/Wrappers/GCF.cs index 10ac8742..a7664412 100644 --- a/SabreTools.Serialization/Wrappers/GCF.cs +++ b/SabreTools.Serialization/Wrappers/GCF.cs @@ -216,7 +216,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.GCF.Deserialize(data); + var file = Streams.GCF.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/IRD.cs b/SabreTools.Serialization/Wrappers/IRD.cs index 80a5aaab..6ebbf00f 100644 --- a/SabreTools.Serialization/Wrappers/IRD.cs +++ b/SabreTools.Serialization/Wrappers/IRD.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var ird = Streams.IRD.Deserialize(data); + var ird = Streams.IRD.DeserializeStream(data); if (ird == null) return null; diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs index 6b9dca2c..d44208e5 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs @@ -86,7 +86,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var cabinet = Streams.InstallShieldCabinet.Deserialize(data); + var cabinet = Streams.InstallShieldCabinet.DeserializeStream(data); if (cabinet == null) return null; diff --git a/SabreTools.Serialization/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs index e004831f..709a6a6d 100644 --- a/SabreTools.Serialization/Wrappers/LinearExecutable.cs +++ b/SabreTools.Serialization/Wrappers/LinearExecutable.cs @@ -58,7 +58,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var executable = Streams.LinearExecutable.Deserialize(data); + var executable = Streams.LinearExecutable.DeserializeStream(data); if (executable == null) return null; diff --git a/SabreTools.Serialization/Wrappers/MSDOS.cs b/SabreTools.Serialization/Wrappers/MSDOS.cs index 817a875d..15eca764 100644 --- a/SabreTools.Serialization/Wrappers/MSDOS.cs +++ b/SabreTools.Serialization/Wrappers/MSDOS.cs @@ -57,7 +57,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var executable = Streams.MSDOS.Deserialize(data); + var executable = Streams.MSDOS.DeserializeStream(data); if (executable == null) return null; diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs index e1c6ed46..371b2a11 100644 --- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs +++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs @@ -58,7 +58,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var cabinet = Streams.MicrosoftCabinet.Deserialize(data); + var cabinet = Streams.MicrosoftCabinet.DeserializeStream(data); if (cabinet == null) return null; diff --git a/SabreTools.Serialization/Wrappers/N3DS.cs b/SabreTools.Serialization/Wrappers/N3DS.cs index f66964b5..2f389a80 100644 --- a/SabreTools.Serialization/Wrappers/N3DS.cs +++ b/SabreTools.Serialization/Wrappers/N3DS.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.N3DS.Deserialize(data); + var archive = Streams.N3DS.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/NCF.cs b/SabreTools.Serialization/Wrappers/NCF.cs index a6d24028..c8fa1425 100644 --- a/SabreTools.Serialization/Wrappers/NCF.cs +++ b/SabreTools.Serialization/Wrappers/NCF.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.NCF.Deserialize(data); + var file = Streams.NCF.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs index 1fe48cf3..0b5ead5c 100644 --- a/SabreTools.Serialization/Wrappers/NewExecutable.cs +++ b/SabreTools.Serialization/Wrappers/NewExecutable.cs @@ -60,7 +60,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var executable = Streams.NewExecutable.Deserialize(data); + var executable = Streams.NewExecutable.DeserializeStream(data); if (executable == null) return null; diff --git a/SabreTools.Serialization/Wrappers/Nitro.cs b/SabreTools.Serialization/Wrappers/Nitro.cs index c2a68144..066f877b 100644 --- a/SabreTools.Serialization/Wrappers/Nitro.cs +++ b/SabreTools.Serialization/Wrappers/Nitro.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.Nitro.Deserialize(data); + var archive = Streams.Nitro.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/PAK.cs b/SabreTools.Serialization/Wrappers/PAK.cs index dbf708d6..458458ee 100644 --- a/SabreTools.Serialization/Wrappers/PAK.cs +++ b/SabreTools.Serialization/Wrappers/PAK.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.PAK.Deserialize(data); + var file = Streams.PAK.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/PFF.cs b/SabreTools.Serialization/Wrappers/PFF.cs index 2c571cb9..0d212460 100644 --- a/SabreTools.Serialization/Wrappers/PFF.cs +++ b/SabreTools.Serialization/Wrappers/PFF.cs @@ -58,7 +58,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.PFF.Deserialize(data); + var archive = Streams.PFF.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs index b608c379..910f3732 100644 --- a/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs +++ b/SabreTools.Serialization/Wrappers/PlayJAudioFile.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var audioFile = Streams.PlayJAudio.Deserialize(data); + var audioFile = Streams.PlayJAudio.DeserializeStream(data); if (audioFile == null) return null; diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs index 79039469..b803b4e4 100644 --- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs +++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs @@ -779,7 +779,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var executable = Streams.PortableExecutable.Deserialize(data); + var executable = Streams.PortableExecutable.DeserializeStream(data); if (executable == null) return null; diff --git a/SabreTools.Serialization/Wrappers/Quantum.cs b/SabreTools.Serialization/Wrappers/Quantum.cs index 83407126..ad4171dd 100644 --- a/SabreTools.Serialization/Wrappers/Quantum.cs +++ b/SabreTools.Serialization/Wrappers/Quantum.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var archive = Streams.Quantum.Deserialize(data); + var archive = Streams.Quantum.DeserializeStream(data); if (archive == null) return null; diff --git a/SabreTools.Serialization/Wrappers/SGA.cs b/SabreTools.Serialization/Wrappers/SGA.cs index 5395e456..3048acf8 100644 --- a/SabreTools.Serialization/Wrappers/SGA.cs +++ b/SabreTools.Serialization/Wrappers/SGA.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.SGA.Deserialize(data); + var file = Streams.SGA.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/VBSP.cs b/SabreTools.Serialization/Wrappers/VBSP.cs index eb77ab1a..233397d5 100644 --- a/SabreTools.Serialization/Wrappers/VBSP.cs +++ b/SabreTools.Serialization/Wrappers/VBSP.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.VBSP.Deserialize(data); + var file = Streams.VBSP.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs index ef1d7f76..b81fe595 100644 --- a/SabreTools.Serialization/Wrappers/VPK.cs +++ b/SabreTools.Serialization/Wrappers/VPK.cs @@ -126,7 +126,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.VPK.Deserialize(data); + var file = Streams.VPK.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/WAD.cs b/SabreTools.Serialization/Wrappers/WAD.cs index e3e32ec7..f91d34b4 100644 --- a/SabreTools.Serialization/Wrappers/WAD.cs +++ b/SabreTools.Serialization/Wrappers/WAD.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.WAD.Deserialize(data); + var file = Streams.WAD.DeserializeStream(data); if (file == null) return null; diff --git a/SabreTools.Serialization/Wrappers/XZP.cs b/SabreTools.Serialization/Wrappers/XZP.cs index 9c180af9..6640784a 100644 --- a/SabreTools.Serialization/Wrappers/XZP.cs +++ b/SabreTools.Serialization/Wrappers/XZP.cs @@ -59,7 +59,7 @@ namespace SabreTools.Serialization.Wrappers if (data == null || data.Length == 0 || !data.CanSeek || !data.CanRead) return null; - var file = Streams.XZP.Deserialize(data); + var file = Streams.XZP.DeserializeStream(data); if (file == null) return null;