From c19a4a94f47b97ed068fafbf35177181ec93770a Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 3 Apr 2024 15:50:06 -0400 Subject: [PATCH] Use new static stream serializer --- SabreTools.Serialization/Files/AACS.Serializer.cs | 2 +- SabreTools.Serialization/Files/AttractMode.Serializer.cs | 2 +- SabreTools.Serialization/Files/BDPlus.Serializer.cs | 2 +- SabreTools.Serialization/Files/BFPK.Serializer.cs | 2 +- SabreTools.Serialization/Files/BSP.Serializer.cs | 2 +- SabreTools.Serialization/Files/CFB.Serializer.cs | 2 +- SabreTools.Serialization/Files/CIA.Serializer.cs | 2 +- SabreTools.Serialization/Files/ClrMamePro.Serializer.cs | 2 +- SabreTools.Serialization/Files/CueSheet.Serializer.cs | 2 +- SabreTools.Serialization/Files/DosCenter.Serializer.cs | 2 +- SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs | 2 +- SabreTools.Serialization/Files/GCF.Serializer.cs | 2 +- SabreTools.Serialization/Files/Hashfile.Serializer.cs | 2 +- SabreTools.Serialization/Files/IRD.Serializer.cs | 2 +- .../Files/InstallShieldCabinet.Serializer.cs | 2 +- SabreTools.Serialization/Files/JsonFile.Deserializer.cs | 2 +- SabreTools.Serialization/Files/LinearExecutable.Serializer.cs | 2 +- SabreTools.Serialization/Files/Listrom.Serializer.cs | 2 +- SabreTools.Serialization/Files/MSDOS.Serializer.cs | 2 +- SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs | 2 +- SabreTools.Serialization/Files/MoPaQ.Serializer.cs | 2 +- SabreTools.Serialization/Files/N3DS.Serializer.cs | 2 +- SabreTools.Serialization/Files/NCF.Serializer.cs | 2 +- SabreTools.Serialization/Files/NewExecutable.Serializer.cs | 2 +- SabreTools.Serialization/Files/Nitro.Serializer.cs | 2 +- SabreTools.Serialization/Files/PAK.Serializer.cs | 2 +- SabreTools.Serialization/Files/PFF.Serializer.cs | 2 +- SabreTools.Serialization/Files/PIC.Serializer.cs | 2 +- SabreTools.Serialization/Files/PlayJAudio.Serializer.cs | 2 +- SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs | 2 +- SabreTools.Serialization/Files/PortableExecutable.Serializer.cs | 2 +- SabreTools.Serialization/Files/Quantum.Serializer.cs | 2 +- SabreTools.Serialization/Files/RomCenter.Serializer.cs | 2 +- SabreTools.Serialization/Files/SGA.Serializer.cs | 2 +- SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs | 2 +- SabreTools.Serialization/Files/SeparatedValue.Serializer.cs | 2 +- SabreTools.Serialization/Files/VBSP.Serializer.cs | 2 +- SabreTools.Serialization/Files/VPK.Serializer.cs | 2 +- SabreTools.Serialization/Files/WAD.Serializer.cs | 2 +- SabreTools.Serialization/Files/XZP.Serializer.cs | 2 +- SabreTools.Serialization/Files/XmlFile.Deserializer.cs | 2 +- SabreTools.Serialization/Files/XmlFile.Serializer.cs | 2 +- SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs | 2 +- SabreTools.Serialization/Streams/XmlFile.Serializer.cs | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/SabreTools.Serialization/Files/AACS.Serializer.cs b/SabreTools.Serialization/Files/AACS.Serializer.cs index 873a8ec8..8cb157b7 100644 --- a/SabreTools.Serialization/Files/AACS.Serializer.cs +++ b/SabreTools.Serialization/Files/AACS.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.AACS().Serialize(obj); + using var stream = Streams.AACS.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/AttractMode.Serializer.cs b/SabreTools.Serialization/Files/AttractMode.Serializer.cs index bc04875d..9bd6e3fe 100644 --- a/SabreTools.Serialization/Files/AttractMode.Serializer.cs +++ b/SabreTools.Serialization/Files/AttractMode.Serializer.cs @@ -18,7 +18,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.AttractMode().SerializeImpl(obj); + using var stream = Streams.AttractMode.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BDPlus.Serializer.cs b/SabreTools.Serialization/Files/BDPlus.Serializer.cs index bb7bbe41..2a3ef946 100644 --- a/SabreTools.Serialization/Files/BDPlus.Serializer.cs +++ b/SabreTools.Serialization/Files/BDPlus.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.BDPlus().SerializeImpl(obj); + using var stream = Streams.BDPlus.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BFPK.Serializer.cs b/SabreTools.Serialization/Files/BFPK.Serializer.cs index 0609ab57..b68adceb 100644 --- a/SabreTools.Serialization/Files/BFPK.Serializer.cs +++ b/SabreTools.Serialization/Files/BFPK.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.BFPK().SerializeImpl(obj); + using var stream = Streams.BFPK.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/BSP.Serializer.cs b/SabreTools.Serialization/Files/BSP.Serializer.cs index d0dc58fc..d74dac59 100644 --- a/SabreTools.Serialization/Files/BSP.Serializer.cs +++ b/SabreTools.Serialization/Files/BSP.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.BSP().SerializeImpl(obj); + using var stream = Streams.BSP.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CFB.Serializer.cs b/SabreTools.Serialization/Files/CFB.Serializer.cs index c35c62f1..6530d67b 100644 --- a/SabreTools.Serialization/Files/CFB.Serializer.cs +++ b/SabreTools.Serialization/Files/CFB.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.CFB().SerializeImpl(obj); + using var stream = Streams.CFB.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CIA.Serializer.cs b/SabreTools.Serialization/Files/CIA.Serializer.cs index 623f8a39..d0bbb044 100644 --- a/SabreTools.Serialization/Files/CIA.Serializer.cs +++ b/SabreTools.Serialization/Files/CIA.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.CIA().SerializeImpl(obj); + using var stream = Streams.CIA.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs b/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs index 34a79c25..62bb9f5b 100644 --- a/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs +++ b/SabreTools.Serialization/Files/ClrMamePro.Serializer.cs @@ -29,7 +29,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.ClrMamePro().Serialize(obj, quotes); + using var stream = Streams.ClrMamePro.Serialize(obj, quotes); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/CueSheet.Serializer.cs b/SabreTools.Serialization/Files/CueSheet.Serializer.cs index 1e3f05ac..e0e820e0 100644 --- a/SabreTools.Serialization/Files/CueSheet.Serializer.cs +++ b/SabreTools.Serialization/Files/CueSheet.Serializer.cs @@ -18,7 +18,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.CueSheet().SerializeImpl(obj); + using var stream = Streams.CueSheet.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/DosCenter.Serializer.cs b/SabreTools.Serialization/Files/DosCenter.Serializer.cs index c33a3c43..630c152a 100644 --- a/SabreTools.Serialization/Files/DosCenter.Serializer.cs +++ b/SabreTools.Serialization/Files/DosCenter.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.DosCenter().SerializeImpl(obj); + using var stream = Streams.DosCenter.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs index 8dc402d1..c9dd00c3 100644 --- a/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs +++ b/SabreTools.Serialization/Files/EverdriveSMDB.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.EverdriveSMDB().SerializeImpl(obj); + using var stream = Streams.EverdriveSMDB.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/GCF.Serializer.cs b/SabreTools.Serialization/Files/GCF.Serializer.cs index e4da624b..bf399963 100644 --- a/SabreTools.Serialization/Files/GCF.Serializer.cs +++ b/SabreTools.Serialization/Files/GCF.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.GCF().SerializeImpl(obj); + using var stream = Streams.GCF.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Hashfile.Serializer.cs b/SabreTools.Serialization/Files/Hashfile.Serializer.cs index bfb77b0e..a83cf420 100644 --- a/SabreTools.Serialization/Files/Hashfile.Serializer.cs +++ b/SabreTools.Serialization/Files/Hashfile.Serializer.cs @@ -28,7 +28,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.Hashfile().Serialize(obj, hash); + using var stream = Streams.Hashfile.Serialize(obj, hash); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/IRD.Serializer.cs b/SabreTools.Serialization/Files/IRD.Serializer.cs index 10877b92..0748e733 100644 --- a/SabreTools.Serialization/Files/IRD.Serializer.cs +++ b/SabreTools.Serialization/Files/IRD.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.IRD().SerializeImpl(obj); + using var stream = Streams.IRD.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs b/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs index 9f489a20..37fbd3ae 100644 --- a/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs +++ b/SabreTools.Serialization/Files/InstallShieldCabinet.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.InstallShieldCabinet().SerializeImpl(obj); + using var stream = Streams.InstallShieldCabinet.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/JsonFile.Deserializer.cs b/SabreTools.Serialization/Files/JsonFile.Deserializer.cs index ee9cfd5a..67a41ca4 100644 --- a/SabreTools.Serialization/Files/JsonFile.Deserializer.cs +++ b/SabreTools.Serialization/Files/JsonFile.Deserializer.cs @@ -23,7 +23,7 @@ namespace SabreTools.Serialization.Files public T? DeserializeImpl(string? path, Encoding encoding) { using var data = PathProcessor.OpenStream(path); - return Streams.JsonFile.Deserialize(data, encoding); + return new Streams.JsonFile().DeserializeImpl(data, encoding); } } } diff --git a/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs b/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs index 9d6af149..a1d594bd 100644 --- a/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/LinearExecutable.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.LinearExecutable().SerializeImpl(obj); + using var stream = Streams.LinearExecutable.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Listrom.Serializer.cs b/SabreTools.Serialization/Files/Listrom.Serializer.cs index 87923502..cc3f82fa 100644 --- a/SabreTools.Serialization/Files/Listrom.Serializer.cs +++ b/SabreTools.Serialization/Files/Listrom.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.Listrom().SerializeImpl(obj); + using var stream = Streams.Listrom.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/MSDOS.Serializer.cs b/SabreTools.Serialization/Files/MSDOS.Serializer.cs index 653ea75f..4f6c5e54 100644 --- a/SabreTools.Serialization/Files/MSDOS.Serializer.cs +++ b/SabreTools.Serialization/Files/MSDOS.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.MSDOS().SerializeImpl(obj); + using var stream = Streams.MSDOS.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs b/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs index b21df1fd..5deae101 100644 --- a/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs +++ b/SabreTools.Serialization/Files/MicrosoftCabinet.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.MicrosoftCabinet().SerializeImpl(obj); + using var stream = Streams.MicrosoftCabinet.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/MoPaQ.Serializer.cs b/SabreTools.Serialization/Files/MoPaQ.Serializer.cs index 7e20f218..90d02210 100644 --- a/SabreTools.Serialization/Files/MoPaQ.Serializer.cs +++ b/SabreTools.Serialization/Files/MoPaQ.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.MoPaQ().SerializeImpl(obj); + using var stream = Streams.MoPaQ.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/N3DS.Serializer.cs b/SabreTools.Serialization/Files/N3DS.Serializer.cs index be675e98..272895ac 100644 --- a/SabreTools.Serialization/Files/N3DS.Serializer.cs +++ b/SabreTools.Serialization/Files/N3DS.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.N3DS().SerializeImpl(obj); + using var stream = Streams.N3DS.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/NCF.Serializer.cs b/SabreTools.Serialization/Files/NCF.Serializer.cs index cd99aea2..b82f62f8 100644 --- a/SabreTools.Serialization/Files/NCF.Serializer.cs +++ b/SabreTools.Serialization/Files/NCF.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.NCF().SerializeImpl(obj); + using var stream = Streams.NCF.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/NewExecutable.Serializer.cs b/SabreTools.Serialization/Files/NewExecutable.Serializer.cs index 6899b8db..7f7fd0c4 100644 --- a/SabreTools.Serialization/Files/NewExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/NewExecutable.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.NewExecutable().SerializeImpl(obj); + using var stream = Streams.NewExecutable.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Nitro.Serializer.cs b/SabreTools.Serialization/Files/Nitro.Serializer.cs index 27a102cb..7e2652e6 100644 --- a/SabreTools.Serialization/Files/Nitro.Serializer.cs +++ b/SabreTools.Serialization/Files/Nitro.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.Nitro().SerializeImpl(obj); + using var stream = Streams.Nitro.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PAK.Serializer.cs b/SabreTools.Serialization/Files/PAK.Serializer.cs index fa63347a..5477e646 100644 --- a/SabreTools.Serialization/Files/PAK.Serializer.cs +++ b/SabreTools.Serialization/Files/PAK.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PAK().SerializeImpl(obj); + using var stream = Streams.PAK.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PFF.Serializer.cs b/SabreTools.Serialization/Files/PFF.Serializer.cs index d3cd23ff..f38ea577 100644 --- a/SabreTools.Serialization/Files/PFF.Serializer.cs +++ b/SabreTools.Serialization/Files/PFF.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PFF().SerializeImpl(obj); + using var stream = Streams.PFF.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PIC.Serializer.cs b/SabreTools.Serialization/Files/PIC.Serializer.cs index 48877312..17754f50 100644 --- a/SabreTools.Serialization/Files/PIC.Serializer.cs +++ b/SabreTools.Serialization/Files/PIC.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PIC().SerializeImpl(obj); + using var stream = Streams.PIC.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs b/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs index e35538ab..4ceb796b 100644 --- a/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs +++ b/SabreTools.Serialization/Files/PlayJAudio.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PlayJAudio().SerializeImpl(obj); + using var stream = Streams.PlayJAudio.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs b/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs index 8a8e8d29..e549c2c3 100644 --- a/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs +++ b/SabreTools.Serialization/Files/PlayJPlaylist.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PlayJPlaylist().SerializeImpl(obj); + using var stream = Streams.PlayJPlaylist.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs b/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs index 383780c7..b67bdba9 100644 --- a/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs +++ b/SabreTools.Serialization/Files/PortableExecutable.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.PortableExecutable().SerializeImpl(obj); + using var stream = Streams.PortableExecutable.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/Quantum.Serializer.cs b/SabreTools.Serialization/Files/Quantum.Serializer.cs index 370c84a6..f6c30656 100644 --- a/SabreTools.Serialization/Files/Quantum.Serializer.cs +++ b/SabreTools.Serialization/Files/Quantum.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.Quantum().SerializeImpl(obj); + using var stream = Streams.Quantum.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/RomCenter.Serializer.cs b/SabreTools.Serialization/Files/RomCenter.Serializer.cs index b6aac0ad..fa420ca1 100644 --- a/SabreTools.Serialization/Files/RomCenter.Serializer.cs +++ b/SabreTools.Serialization/Files/RomCenter.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.RomCenter().SerializeImpl(obj); + using var stream = Streams.RomCenter.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/SGA.Serializer.cs b/SabreTools.Serialization/Files/SGA.Serializer.cs index 76fdd376..b120659a 100644 --- a/SabreTools.Serialization/Files/SGA.Serializer.cs +++ b/SabreTools.Serialization/Files/SGA.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.SGA().SerializeImpl(obj); + using var stream = Streams.SGA.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs index b9a60bd0..e5b91e79 100644 --- a/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization/Files/SeparatedValue.Deserializer.cs @@ -26,7 +26,7 @@ namespace SabreTools.Serialization.Files public Models.SeparatedValue.MetadataFile? DeserializeImpl(string? path, char delim) { using var stream = PathProcessor.OpenStream(path); - return new Streams.SeparatedValue().Deserialize(stream, delim); + return Streams.SeparatedValue.Deserialize(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 c4a1e471..01dabd77 100644 --- a/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs +++ b/SabreTools.Serialization/Files/SeparatedValue.Serializer.cs @@ -28,7 +28,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.SeparatedValue().SerializeImpl(obj, delim); + using var stream = Streams.SeparatedValue.Serialize(obj, delim); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/VBSP.Serializer.cs b/SabreTools.Serialization/Files/VBSP.Serializer.cs index d4dda7bb..eb08288f 100644 --- a/SabreTools.Serialization/Files/VBSP.Serializer.cs +++ b/SabreTools.Serialization/Files/VBSP.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.VBSP().SerializeImpl(obj); + using var stream = Streams.VBSP.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/VPK.Serializer.cs b/SabreTools.Serialization/Files/VPK.Serializer.cs index 854c55a1..d8a69a1a 100644 --- a/SabreTools.Serialization/Files/VPK.Serializer.cs +++ b/SabreTools.Serialization/Files/VPK.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.VPK().SerializeImpl(obj); + using var stream = Streams.VPK.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/WAD.Serializer.cs b/SabreTools.Serialization/Files/WAD.Serializer.cs index ae70cfc3..09f924af 100644 --- a/SabreTools.Serialization/Files/WAD.Serializer.cs +++ b/SabreTools.Serialization/Files/WAD.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.WAD().SerializeImpl(obj); + using var stream = Streams.WAD.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/XZP.Serializer.cs b/SabreTools.Serialization/Files/XZP.Serializer.cs index 93751f3d..c42c5fb6 100644 --- a/SabreTools.Serialization/Files/XZP.Serializer.cs +++ b/SabreTools.Serialization/Files/XZP.Serializer.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Files if (string.IsNullOrEmpty(path)) return false; - using var stream = new Streams.XZP().SerializeImpl(obj); + using var stream = Streams.XZP.Serialize(obj); if (stream == null) return false; diff --git a/SabreTools.Serialization/Files/XmlFile.Deserializer.cs b/SabreTools.Serialization/Files/XmlFile.Deserializer.cs index 64064415..b0a8c646 100644 --- a/SabreTools.Serialization/Files/XmlFile.Deserializer.cs +++ b/SabreTools.Serialization/Files/XmlFile.Deserializer.cs @@ -12,7 +12,7 @@ namespace SabreTools.Serialization.Files public T? DeserializeImpl(string? path) { using var data = PathProcessor.OpenStream(path); - return Streams.XmlFile.Deserialize(data); + return new Streams.XmlFile().DeserializeImpl(data); } } } \ No newline at end of file diff --git a/SabreTools.Serialization/Files/XmlFile.Serializer.cs b/SabreTools.Serialization/Files/XmlFile.Serializer.cs index 3a23eb72..8cd63d8a 100644 --- a/SabreTools.Serialization/Files/XmlFile.Serializer.cs +++ b/SabreTools.Serialization/Files/XmlFile.Serializer.cs @@ -23,7 +23,7 @@ namespace SabreTools.Serialization.Files /// Optional DOCTYPE sysid /// Optional DOCTYPE name /// True on successful serialization, false otherwise - protected bool SerializeImpl(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) + public bool SerializeImpl(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) { if (string.IsNullOrEmpty(path)) return false; diff --git a/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs b/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs index 0650655c..02824036 100644 --- a/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs +++ b/SabreTools.Serialization/Streams/PlayJPlaylist.Deserializer.cs @@ -52,7 +52,7 @@ namespace SabreTools.Serialization.Streams for (int i = 0; i < playlist.AudioFiles.Length; i++) { long currentOffset = data.Position; - var entryHeader = new PlayJAudio().Deserialize(data, currentOffset); + var entryHeader = PlayJAudio.Deserialize(data, currentOffset); if (entryHeader == null) return null; diff --git a/SabreTools.Serialization/Streams/XmlFile.Serializer.cs b/SabreTools.Serialization/Streams/XmlFile.Serializer.cs index 9d8e22aa..1fc97779 100644 --- a/SabreTools.Serialization/Streams/XmlFile.Serializer.cs +++ b/SabreTools.Serialization/Streams/XmlFile.Serializer.cs @@ -29,7 +29,7 @@ namespace SabreTools.Serialization.Streams /// Optional DOCTYPE sysid /// Optional DOCTYPE name /// Stream containing serialized data on success, null otherwise - protected Stream? SerializeImpl(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) + public Stream? SerializeImpl(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null) { // If the object is null if (obj == null)