switch to sharp compress to add 7z support

2 files changed, 13 insertions, 9 deletions

diff --git a/MediaBrowser.ServerApplication/Implementations/DotNetZipClient.cs b/MediaBrowser.ServerApplication/Implementations/DotNetZipClient.cs
index 3b174a9b2..4a9afac3f 100644
--- a/MediaBrowser.ServerApplication/Implementations/DotNetZipClient.cs
+++ b/MediaBrowser.ServerApplication/Implementations/DotNetZipClient.cs
@@ -1,5 +1,6 @@
-using Ionic.Zip;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Model.IO;
+using SharpCompress.Common;
+using SharpCompress.Reader;
 using System.IO;
 
 namespace MediaBrowser.ServerApplication.Implementations
@@ -19,10 +20,7 @@ namespace MediaBrowser.ServerApplication.Implementations
         {
             using (var fileStream = File.OpenRead(sourceFile))
             {
-                using (var zipFile = ZipFile.Read(fileStream))
-                {
-                    zipFile.ExtractAll(targetPath, overwriteExistingFiles ? ExtractExistingFileAction.OverwriteSilently : ExtractExistingFileAction.DoNotOverwrite);
-                }
+                ExtractAll(fileStream, targetPath, overwriteExistingFiles);
             }
         }
 
@@ -34,9 +32,16 @@ namespace MediaBrowser.ServerApplication.Implementations
         /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param>
         public void ExtractAll(Stream source, string targetPath, bool overwriteExistingFiles)
         {
-            using (var zipFile = ZipFile.Read(source))
+            using (var reader = ReaderFactory.Open(source))
             {
-                zipFile.ExtractAll(targetPath, overwriteExistingFiles ? ExtractExistingFileAction.OverwriteSilently : ExtractExistingFileAction.DoNotOverwrite);
+                var options = ExtractOptions.ExtractFullPath;
+
+                if (overwriteExistingFiles)
+                {
+                    options = options | ExtractOptions.Overwrite;
+                }
+
+                reader.WriteAllToDirectory(targetPath, options);
             }
         }
     }
diff --git a/MediaBrowser.ServerApplication/Implementations/FFMpegDownloader.cs b/MediaBrowser.ServerApplication/Implementations/FFMpegDownloader.cs
index 861ca7f3b..becb8d8ab 100644
--- a/MediaBrowser.ServerApplication/Implementations/FFMpegDownloader.cs
+++ b/MediaBrowser.ServerApplication/Implementations/FFMpegDownloader.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;