From f843e1bb0f41405ba00534dc31de7bebe3bea35e Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 15 Sep 2021 19:20:50 +0100
Subject: [PATCH] Use DotNetZip for BZ2 as it's twice as fast.

---
 Aaru.Filters/Aaru.Filters.csproj | 1 +
 Aaru.Filters/BZip2.cs            | 9 ++++-----
 Aaru.Images/UDIF/Read.cs         | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index 5778d8bb2..c035548d7 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -88,6 +88,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DotNetZip" Version="1.15.0" />
     <PackageReference Include="SharpCompress" Version="0.29.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
diff --git a/Aaru.Filters/BZip2.cs b/Aaru.Filters/BZip2.cs
index 54234627a..eab29826d 100644
--- a/Aaru.Filters/BZip2.cs
+++ b/Aaru.Filters/BZip2.cs
@@ -34,8 +34,7 @@ using System;
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
-using SharpCompress.Compressors;
-using SharpCompress.Compressors.BZip2;
+using Ionic.BZip2;
 
 namespace Aaru.Filters
 {
@@ -157,7 +156,7 @@ namespace Aaru.Filters
             BasePath       = null;
             CreationTime   = DateTime.UtcNow;
             LastWriteTime  = CreationTime;
-            _innerStream   = new ForcedSeekStream<BZip2Stream>(_dataStream, CompressionMode.Decompress, false);
+            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
             DataForkLength = _innerStream.Length;
 
             return Errno.NoError;
@@ -170,7 +169,7 @@ namespace Aaru.Filters
             BasePath       = null;
             CreationTime   = DateTime.UtcNow;
             LastWriteTime  = CreationTime;
-            _innerStream   = new ForcedSeekStream<BZip2Stream>(_dataStream, CompressionMode.Decompress, false);
+            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
             DataForkLength = _innerStream.Length;
 
             return Errno.NoError;
@@ -185,7 +184,7 @@ namespace Aaru.Filters
             var fi = new FileInfo(path);
             CreationTime   = fi.CreationTimeUtc;
             LastWriteTime  = fi.LastWriteTimeUtc;
-            _innerStream   = new ForcedSeekStream<BZip2Stream>(_dataStream, CompressionMode.Decompress, false);
+            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
             DataForkLength = _innerStream.Length;
 
             return Errno.NoError;
diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs
index 32d15fc4a..4414bcfa5 100644
--- a/Aaru.Images/UDIF/Read.cs
+++ b/Aaru.Images/UDIF/Read.cs
@@ -45,7 +45,7 @@ using Claunia.PropertyList;
 using Claunia.RsrcFork;
 using Ionic.Zlib;
 using SharpCompress.Compressors.ADC;
-using SharpCompress.Compressors.BZip2;
+using Ionic.BZip2;
 using Version = Resources.Version;
 
 #pragma warning disable 612
@@ -446,8 +446,7 @@ namespace Aaru.DiscImages
 
                             break;
                         case CHUNK_TYPE_BZIP:
-                            decStream = new BZip2Stream(cmpMs, SharpCompress.Compressors.CompressionMode.Decompress,
-                                                        false);
+                            decStream = new BZip2InputStream(cmpMs, false);
 
                             break;
                         case CHUNK_TYPE_RLE: break;