isolated DotNetZip dependancy

5 files changed, 49 insertions, 24 deletions

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index c4d8f3e6c..22c241fd4 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -15,6 +15,7 @@ using MediaBrowser.Controller.ScheduledTasks;
 using MediaBrowser.Controller.Updates;
 using MediaBrowser.Controller.Weather;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.System;
 using System;
 using System.Collections.Generic;
@@ -298,12 +299,19 @@ namespace MediaBrowser.Controller
         }
 
         /// <summary>
+        /// Gets or sets the zip client.
+        /// </summary>
+        /// <value>The zip client.</value>
+        private IZipClient ZipClient { get; set; }
+
+        /// <summary>
         /// Creates a kernel based on a Data path, which is akin to our current programdata path
         /// </summary>
-        public Kernel(IIsoManager isoManager)
+        public Kernel(IIsoManager isoManager, IZipClient zipClient)
             : base(isoManager)
         {
             Instance = this;
+            ZipClient = zipClient;
         }
 
         /// <summary>
@@ -319,10 +327,10 @@ namespace MediaBrowser.Controller
             RootFolder = null;
 
             ReloadResourcePools();
-            InstallationManager = new InstallationManager(this);
+            InstallationManager = new InstallationManager(this, ZipClient);
             LibraryManager = new LibraryManager(this);
             UserManager = new UserManager(this);
-            FFMpegManager = new FFMpegManager(this);
+            FFMpegManager = new FFMpegManager(this, ZipClient);
             ImageManager = new ImageManager(this);
             ProviderManager = new ProviderManager(this);
             UserDataManager = new UserDataManager(this);
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index e15e053be..f911f190d 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -53,9 +53,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="Mediabrowser.PluginSecurity">
       <HintPath>Plugins\Mediabrowser.PluginSecurity.dll</HintPath>
     </Reference>
diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index ee7c87f90..ad0b3a63f 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -1,5 +1,4 @@
-using Ionic.Zip;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Serialization;
@@ -7,6 +6,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -58,14 +58,29 @@ namespace MediaBrowser.Controller.MediaInfo
         /// </summary>
         /// <value>The subtitle cache.</value>
         internal FileSystemRepository SubtitleCache { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the zip client.
+        /// </summary>
+        /// <value>The zip client.</value>
+        private IZipClient ZipClient { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="FFMpegManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public FFMpegManager(Kernel kernel)
+        /// <param name="zipClient">The zip client.</param>
+        /// <exception cref="System.ArgumentNullException">zipClient</exception>
+        public FFMpegManager(Kernel kernel, IZipClient zipClient)
             : base(kernel)
         {
+            if (zipClient == null)
+            {
+                throw new ArgumentNullException("zipClient");
+            }
+
+            ZipClient = zipClient;
+
             // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes
             SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT | ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
 
@@ -352,10 +367,7 @@ namespace MediaBrowser.Controller.MediaInfo
         {
             using (var resourceStream = assembly.GetManifestResourceStream(zipFileResourcePath))
             {
-                using (var zipFile = ZipFile.Read(resourceStream))
-                {
-                    zipFile.ExtractAll(targetPath, ExtractExistingFileAction.DoNotOverwrite);
-                }
+                ZipClient.ExtractAll(resourceStream, targetPath, false);
             }
         }
 
@@ -383,7 +395,7 @@ namespace MediaBrowser.Controller.MediaInfo
             {
                 return "-probesize 1G -analyzeduration 200M";
             }
-            
+
             return string.Empty;
         }
 
@@ -818,7 +830,7 @@ namespace MediaBrowser.Controller.MediaInfo
             {
                 throw new ArgumentException("The given MediaStream is not an external subtitle stream");
             }
-            
+
             var process = new Process
             {
                 StartInfo = new ProcessStartInfo
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index 63afa2ce8..8b4a613b9 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -1,11 +1,11 @@
 using System.Security.Cryptography;
-using Ionic.Zip;
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Common.Serialization;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Updates;
 using System;
 using System.Collections.Concurrent;
@@ -92,13 +92,26 @@ namespace MediaBrowser.Controller.Updates
         #endregion
 
         /// <summary>
+        /// Gets or sets the zip client.
+        /// </summary>
+        /// <value>The zip client.</value>
+        private IZipClient ZipClient { get; set; }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="InstallationManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public InstallationManager(Kernel kernel)
+        /// <param name="zipClient">The zip client.</param>
+        /// <exception cref="System.ArgumentNullException">zipClient</exception>
+        public InstallationManager(Kernel kernel, IZipClient zipClient)
             : base(kernel)
         {
+            if (zipClient == null)
+            {
+                throw new ArgumentNullException("zipClient");
+            }
 
+            ZipClient = zipClient;
         }
 
         /// <summary>
@@ -391,11 +404,7 @@ namespace MediaBrowser.Controller.Updates
             {
                 try
                 {
-                    // Extract to target in full - overwriting
-                    using (var zipFile = ZipFile.Read(tempFile))
-                    {
-                        zipFile.ExtractAll(target, ExtractExistingFileAction.OverwriteSilently);
-                    }
+                    ZipClient.ExtractAll(tempFile, target, true);
                 }
                 catch (IOException e)
                 {
diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config
index 1ba8ce452..e3e4367b7 100644
--- a/MediaBrowser.Controller/packages.config
+++ b/MediaBrowser.Controller/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.9.1.8" targetFramework="net45" />
   <package id="morelinq" version="1.0.15631-beta" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.621" targetFramework="net45" />
 </packages>
\ No newline at end of file