From 0b889fdc065d41343a7f2427ed0f39bf03294f54 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 16 Sep 2025 23:11:14 -0400 Subject: [PATCH] Remove weird holdover property --- .../Deserializers/BaseBinaryDeserializer.cs | 7 +----- .../Deserializers/GZip.cs | 3 --- .../Deserializers/PKZIP.cs | 3 --- .../Deserializers/PathProcessor.cs | 24 ++----------------- .../Deserializers/TapeArchive.cs | 3 --- 5 files changed, 3 insertions(+), 37 deletions(-) diff --git a/SabreTools.Serialization/Deserializers/BaseBinaryDeserializer.cs b/SabreTools.Serialization/Deserializers/BaseBinaryDeserializer.cs index dd9c5c4e..b0b6b336 100644 --- a/SabreTools.Serialization/Deserializers/BaseBinaryDeserializer.cs +++ b/SabreTools.Serialization/Deserializers/BaseBinaryDeserializer.cs @@ -16,11 +16,6 @@ namespace SabreTools.Serialization.Deserializers IFileDeserializer, IStreamDeserializer { - /// - /// Indicates if compressed files should be decompressed before processing - /// - protected virtual bool SkipCompression => false; - #region IByteDeserializer /// @@ -46,7 +41,7 @@ namespace SabreTools.Serialization.Deserializers /// public virtual TModel? Deserialize(string? path) { - using var stream = PathProcessor.OpenStream(path, SkipCompression); + using var stream = PathProcessor.OpenStream(path); return Deserialize(stream); } diff --git a/SabreTools.Serialization/Deserializers/GZip.cs b/SabreTools.Serialization/Deserializers/GZip.cs index 35d810cd..ff793b02 100644 --- a/SabreTools.Serialization/Deserializers/GZip.cs +++ b/SabreTools.Serialization/Deserializers/GZip.cs @@ -8,9 +8,6 @@ namespace SabreTools.Serialization.Deserializers { public class GZip : BaseBinaryDeserializer { - /// - protected override bool SkipCompression => true; - /// public override Archive? Deserialize(Stream? data) { diff --git a/SabreTools.Serialization/Deserializers/PKZIP.cs b/SabreTools.Serialization/Deserializers/PKZIP.cs index a7d5cd07..c9de53ee 100644 --- a/SabreTools.Serialization/Deserializers/PKZIP.cs +++ b/SabreTools.Serialization/Deserializers/PKZIP.cs @@ -10,9 +10,6 @@ namespace SabreTools.Serialization.Deserializers { public class PKZIP : BaseBinaryDeserializer { - /// - protected override bool SkipCompression => true; - /// public override Archive? Deserialize(Stream? data) { diff --git a/SabreTools.Serialization/Deserializers/PathProcessor.cs b/SabreTools.Serialization/Deserializers/PathProcessor.cs index 79bfedb8..09375d87 100644 --- a/SabreTools.Serialization/Deserializers/PathProcessor.cs +++ b/SabreTools.Serialization/Deserializers/PathProcessor.cs @@ -1,6 +1,4 @@ -using System; using System.IO; -using System.IO.Compression; namespace SabreTools.Serialization.Deserializers { @@ -11,7 +9,7 @@ namespace SabreTools.Serialization.Deserializers /// /// Path to open as a stream /// Stream representing the file, null on error - public static Stream? OpenStream(string? path, bool skipCompression = false) + public static Stream? OpenStream(string? path) { try { @@ -20,25 +18,7 @@ namespace SabreTools.Serialization.Deserializers return null; // Open the file for deserialization - var stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - - // Get the extension to determine if additional handling is needed - string ext = Path.GetExtension(path).TrimStart('.'); - - // Determine what we do based on the extension - if (!skipCompression && string.Equals(ext, "gz", StringComparison.OrdinalIgnoreCase)) - { - return new GZipStream(stream, CompressionMode.Decompress); - } - else if (!skipCompression && string.Equals(ext, "zip", StringComparison.OrdinalIgnoreCase)) - { - // TODO: Support zip-compressed files - return null; - } - else - { - return stream; - } + return File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); } catch { diff --git a/SabreTools.Serialization/Deserializers/TapeArchive.cs b/SabreTools.Serialization/Deserializers/TapeArchive.cs index f9f014f0..a04a8c53 100644 --- a/SabreTools.Serialization/Deserializers/TapeArchive.cs +++ b/SabreTools.Serialization/Deserializers/TapeArchive.cs @@ -9,9 +9,6 @@ namespace SabreTools.Serialization.Deserializers { public class TapeArchive : BaseBinaryDeserializer { - /// - protected override bool SkipCompression => true; - /// public override Archive? Deserialize(Stream? data) {