Update packages

Author: mnadareski

SabreTools.Compression/Quantum/Decompressor.cs

@@ -148,7 +148,7 @@ public byte[] Process()
             // Initialize the coding state
             CS_H = 0xffff;
             CS_L = 0x0000;
-            CS_C = (ushort)(_bitStream.ReadBitsMSB(16) ?? 0);
+            CS_C = (ushort)(_bitStream.ReadBitsBE(16) ?? 0);
 
             // Loop until the end of the stream
             var bytes = new List<byte>();
@@ -187,25 +187,25 @@ public byte[] Process()
                     {
                         case 4:
                             int model4sym = GetSymbol(_model4);
-                            int model4extra = (int)(_bitStream.ReadBitsMSB(PositionExtraBits[model4sym]) ?? 0);
+                            int model4extra = (int)(_bitStream.ReadBitsBE(PositionExtraBits[model4sym]) ?? 0);
                             offset = PositionSlot[model4sym] + model4extra + 1;
                             length = 3;
                             break;
 
                         case 5:
                             int model5sym = GetSymbol(_model5);
-                            int model5extra = (int)(_bitStream.ReadBitsMSB(PositionExtraBits[model5sym]) ?? 0);
+                            int model5extra = (int)(_bitStream.ReadBitsBE(PositionExtraBits[model5sym]) ?? 0);
                             offset = PositionSlot[model5sym] + model5extra + 1;
                             length = 4;
                             break;
 
                         case 6:
                             int lengthSym = GetSymbol(_model6len);
-                            int lengthExtra = (int)(_bitStream.ReadBitsMSB(LengthExtraBits[lengthSym]) ?? 0);
+                            int lengthExtra = (int)(_bitStream.ReadBitsBE(LengthExtraBits[lengthSym]) ?? 0);
                             length = LengthSlot[lengthSym] + lengthExtra + 5;
 
                             int model6sym = GetSymbol(_model6);
-                            int model6extra = (int)(_bitStream.ReadBitsMSB(PositionExtraBits[model6sym]) ?? 0);
+                            int model6extra = (int)(_bitStream.ReadBitsBE(PositionExtraBits[model6sym]) ?? 0);
                             offset = PositionSlot[model6sym] + model6extra + 1;
                             break;
 

SabreTools.Compression/SZDD/Decompressor.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
-using System.Text;
-using SabreTools.IO.Extensions;
+using SabreTools.Models.LZ;
 
 namespace SabreTools.Compression.SZDD
 {
@@ -44,39 +43,27 @@ private Decompressor(Stream source)
         /// <summary>
         /// Create a KWAJ decompressor
         /// </summary>
-        public static Decompressor CreateKWAJ(byte[] source)
-            => CreateKWAJ(new MemoryStream(source));
+        public static Decompressor CreateKWAJ(byte[] source, KWAJCompressionType compressionType)
+            => CreateKWAJ(new MemoryStream(source), compressionType);
 
         /// <summary>
         /// Create a KWAJ decompressor
         /// </summary>
-        /// TODO: Replace validation when Models is updated
-        public static Decompressor CreateKWAJ(Stream source)
+        public static Decompressor CreateKWAJ(Stream source, KWAJCompressionType compressionType)
         {
             // Create the decompressor
             var decompressor = new Decompressor(source);
 
-            // Validate the header
-            byte[] magic = source.ReadBytes(8);
-            if (Encoding.ASCII.GetString(magic) != Encoding.ASCII.GetString([0x4B, 0x57, 0x41, 0x4A, 0x88, 0xF0, 0x27, 0xD1]))
-                throw new InvalidDataException(nameof(source));
-            ushort compressionType = source.ReadUInt16();
+            // Set the format and return
             decompressor._format = compressionType switch
             {
-                0 => Format.KWAJNoCompression,
-                1 => Format.KWAJXor,
-                2 => Format.KWAJQBasic,
-                3 => Format.KWAJLZH,
-                4 => Format.KWAJMSZIP,
+                KWAJCompressionType.NoCompression => Format.KWAJNoCompression,
+                KWAJCompressionType.NoCompressionXor => Format.KWAJXor,
+                KWAJCompressionType.QBasic => Format.KWAJQBasic,
+                KWAJCompressionType.LZH => Format.KWAJLZH,
+                KWAJCompressionType.MSZIP => Format.KWAJMSZIP,
                 _ => throw new IndexOutOfRangeException(nameof(source)),
             };
-
-            // Skip the rest of the header
-            ushort dataOffset = source.ReadUInt16(); // DataOffset
-            _ = source.ReadUInt16(); // HeaderFlags
-
-            // Seek and return
-            source.Seek(dataOffset, SeekOrigin.Begin);
             return decompressor;
         }
 
@@ -89,20 +76,11 @@ public static Decompressor CreateQBasic(byte[] source)
         /// <summary>
         /// Create a QBasic 4.5 installer SZDD decompressor
         /// </summary>
-        /// TODO: Replace validation when Models is updated
         public static Decompressor CreateQBasic(Stream source)
         {
             // Create the decompressor
             var decompressor = new Decompressor(source);
 
-            // Validate the header
-            byte[] magic = source.ReadBytes(8);
-            if (Encoding.ASCII.GetString(magic) != Encoding.ASCII.GetString([0x53, 0x5A, 0x20, 0x88, 0xF0, 0x27, 0x33, 0xD1]))
-                throw new InvalidDataException(nameof(source));
-
-            // Skip the rest of the header
-            _ = source.ReadUInt32(); // RealLength
-
             // Set the format and return
             decompressor._format = Format.QBasic;
             return decompressor;
@@ -117,24 +95,11 @@ public static Decompressor CreateSZDD(byte[] source)
         /// <summary>
         /// Create a standard SZDD decompressor
         /// </summary>
-        /// TODO: Replace validation when Models is updated
         public static Decompressor CreateSZDD(Stream source)
         {
             // Create the decompressor
             var decompressor = new Decompressor(source);
 
-            // Validate the header
-            byte[] magic = source.ReadBytes(8);
-            if (Encoding.ASCII.GetString(magic) != Encoding.ASCII.GetString([0x53, 0x5A, 0x44, 0x44, 0x88, 0xF0, 0x27, 0x33]))
-                throw new InvalidDataException(nameof(source));
-            byte compressionType = source.ReadByteValue();
-            if (compressionType != 0x41)
-                throw new InvalidDataException(nameof(source));
-
-            // Skip the rest of the header
-            _ = source.ReadByteValue(); // LastChar
-            _ = source.ReadUInt32(); // RealLength
-
             // Set the format and return
             decompressor._format = Format.SZDD;
             return decompressor;

SabreTools.Compression/SabreTools.Compression.csproj

@@ -26,8 +26,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.IO" Version="1.5.1" />
-        <PackageReference Include="SabreTools.Models" Version="1.5.1" />
+        <PackageReference Include="SabreTools.IO" Version="1.6.1" />
+        <PackageReference Include="SabreTools.Models" Version="1.5.7" />
     </ItemGroup>
 
 </Project>