chore: modernize entire repo

Author: Nenkai

PDTools.Compression/PDIZIP.cs

@@ -8,65 +8,64 @@
 
 using ICSharpCode.SharpZipLib.Zip.Compression;
 
-namespace PDTools.Compression
-{
-    public class PDIZIP
-    {
-        public const uint PDIZIP_MAGIC = 0xFF_F7_F3_2F;
+namespace PDTools.Compression;
 
-        public static bool Inflate(Stream input, Stream output, bool skipMagic = false)
-        {
-            if (!skipMagic && input.ReadUInt32() == PDIZIP_MAGIC)
-                return false;
+public class PDIZIP
+{
+    public const uint PDIZIP_MAGIC = 0xFF_F7_F3_2F;
 
-            // Read PDIZIP Header
-            uint expand_size = input.ReadUInt32();
-            uint compressed_size = input.ReadUInt32();
-            uint fragment_size = input.ReadUInt32();
-            int method = input.ReadInt32();
-            input.ReadInt32s(3);
+    public static bool Inflate(Stream input, Stream output, bool skipMagic = false)
+    {
+        if (!skipMagic && input.ReadUInt32() == PDIZIP_MAGIC)
+            return false;
 
-            // Calculate the fragment (or chunk) count for the file
-            uint fragmentCount = (compressed_size + fragment_size - 1) / fragment_size;
+        // Read PDIZIP Header
+        uint expand_size = input.ReadUInt32();
+        uint compressed_size = input.ReadUInt32();
+        uint fragment_size = input.ReadUInt32();
+        int method = input.ReadInt32();
+        input.ReadInt32s(3);
 
-            // Set up inflater and buffers
-            Inflater inflater = new Inflater(true);
-            byte[] fragment_buffer = ArrayPool<byte>.Shared.Rent((int)fragment_size);
-            byte[] expand_buffer = ArrayPool<byte>.Shared.Rent(0x20000);
+        // Calculate the fragment (or chunk) count for the file
+        uint fragmentCount = (compressed_size + fragment_size - 1) / fragment_size;
 
-            for (uint i = 0; i < fragmentCount; i++)
-            {
-                if (input.ReadUInt32() != PDIZIP_MAGIC)
-                    throw new Exception("PDIZip Fragment magic did not match expected magic.");
+        // Set up inflater and buffers
+        Inflater inflater = new Inflater(true);
+        byte[] fragment_buffer = ArrayPool<byte>.Shared.Rent((int)fragment_size);
+        byte[] expand_buffer = ArrayPool<byte>.Shared.Rent(0x20000);
 
-                // Read Fragment header
-                uint fragmentExpandSize = input.ReadUInt32();
-                uint fragmentCompressedSize = input.ReadUInt32();
-                uint Unk = input.ReadUInt32();
-
-                // Only way to do it properly apparently, inflate streams read too much data
-                input.Read(fragment_buffer, 0, (int)fragmentCompressedSize);
-                inflater.SetInput(fragment_buffer, 0, (int)fragmentCompressedSize);
+        for (uint i = 0; i < fragmentCount; i++)
+        {
+            if (input.ReadUInt32() != PDIZIP_MAGIC)
+                throw new Exception("PDIZip Fragment magic did not match expected magic.");
 
-                while (!inflater.IsFinished)
-                {
-                    int inflated = inflater.Inflate(expand_buffer);
-                    output.Write(expand_buffer, 0, inflated);
-                }
+            // Read Fragment header
+            uint fragmentExpandSize = input.ReadUInt32();
+            uint fragmentCompressedSize = input.ReadUInt32();
+            uint Unk = input.ReadUInt32();
 
-                // Crypto stream can't seek, so just manually move..
-                int left = (int)(fragment_size - fragmentCompressedSize) - 0x10;
-                if (i == 0)
-                    left -= 0x20;
-                while (left-- > 0) input.ReadByte();
+            // Only way to do it properly apparently, inflate streams read too much data
+            input.ReadExactly(fragment_buffer, 0, (int)fragmentCompressedSize);
+            inflater.SetInput(fragment_buffer, 0, (int)fragmentCompressedSize);
 
-                inflater.Reset(); // Prepare for next chunk
+            while (!inflater.IsFinished)
+            {
+                int inflated = inflater.Inflate(expand_buffer);
+                output.Write(expand_buffer, 0, inflated);
             }
 
-            ArrayPool<byte>.Shared.Return(fragment_buffer);
-            ArrayPool<byte>.Shared.Return(expand_buffer);
+            // Crypto stream can't seek, so just manually move..
+            int left = (int)(fragment_size - fragmentCompressedSize) - 0x10;
+            if (i == 0)
+                left -= 0x20;
+            while (left-- > 0) input.ReadByte();
 
-            return output.Length == expand_size;
+            inflater.Reset(); // Prepare for next chunk
         }
+
+        ArrayPool<byte>.Shared.Return(fragment_buffer);
+        ArrayPool<byte>.Shared.Return(expand_buffer);
+
+        return output.Length == expand_size;
     }
 }

PDTools.Compression/PDTools.Compression.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="ImpromptuNinjas.ZStd" Version="1.4.5.5" />
-    <PackageReference Include="SharpZipLib" Version="1.3.2" />
+    <PackageReference Include="SharpZipLib" Version="1.4.2" />
     <PackageReference Include="Syroot.BinaryData" Version="5.2.2" />
     <PackageReference Include="Syroot.BinaryData.Memory" Version="5.2.2" />
   </ItemGroup>