Move actual installation to PackageManager

3 files changed, 91 insertions, 65 deletions

diff --git a/MediaBrowser.Common.Implementations/Updates/PackageManager.cs b/MediaBrowser.Common.Implementations/Updates/PackageManager.cs
index 3f09615e7..a9335dce0 100644
--- a/MediaBrowser.Common.Implementations/Updates/PackageManager.cs
+++ b/MediaBrowser.Common.Implementations/Updates/PackageManager.cs
@@ -1,12 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
 using MediaBrowser.Common.Updates;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
 
@@ -39,9 +43,62 @@ namespace MediaBrowser.Common.Implementations.Updates
 
         }
 
-        public Task InstallPackage(PackageVersionInfo package, CancellationToken cancellationToken)
+        public async Task InstallPackage(IHttpClient client, ILogger logger, ResourcePool resourcePool, IProgress<double> progress, IZipClient zipClient, IApplicationPaths appPaths, PackageVersionInfo package, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            // Target based on if it is an archive or single assembly
+            //  zip archives are assumed to contain directory structures relative to our ProgramDataPath
+            var isArchive = string.Equals(Path.GetExtension(package.sourceUrl), ".zip", StringComparison.OrdinalIgnoreCase);
+            var target = isArchive ? appPaths.ProgramDataPath : Path.Combine(appPaths.PluginsPath, package.targetFilename);
+
+            // Download to temporary file so that, if interrupted, it won't destroy the existing installation
+            var tempFile = await client.GetTempFile(package.sourceUrl, resourcePool.Mb, cancellationToken, progress).ConfigureAwait(false);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Validate with a checksum
+            if (package.checksum != Guid.Empty) // support for legacy uploads for now
+            {
+                using (var crypto = new MD5CryptoServiceProvider())
+                using (var stream = new BufferedStream(File.OpenRead(tempFile), 100000))
+                {
+                    var check = Guid.Parse(BitConverter.ToString(crypto.ComputeHash(stream)).Replace("-", String.Empty));
+                    if (check != package.checksum)
+                    {
+                        throw new ApplicationException(string.Format("Download validation failed for {0}.  Probably corrupted during transfer.", package.name));
+                    }
+                }
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Success - move it to the real target based on type
+            if (isArchive)
+            {
+                try
+                {
+                    zipClient.ExtractAll(tempFile, target, true);
+                }
+                catch (IOException e)
+                {
+                    logger.ErrorException("Error attempting to extract archive from {0} to {1}", e, tempFile, target);
+                    throw;
+                }
+
+            }
+            else
+            {
+                try
+                {
+                    File.Copy(tempFile, target, true);
+                    File.Delete(tempFile);
+                }
+                catch (IOException e)
+                {
+                    logger.ErrorException("Error attempting to move file from {0} to {1}", e, tempFile, target);
+                    throw;
+                }
+            }
+
         }
     }
 }
diff --git a/MediaBrowser.Common/Updates/IPackageManager.cs b/MediaBrowser.Common/Updates/IPackageManager.cs
index d5a8a59b1..f3ca1d8cf 100644
--- a/MediaBrowser.Common/Updates/IPackageManager.cs
+++ b/MediaBrowser.Common/Updates/IPackageManager.cs
@@ -7,6 +7,8 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Security;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Updates;
 
@@ -34,9 +36,22 @@ namespace MediaBrowser.Common.Updates
         /// <summary>
         /// Installs a package.
         /// </summary>
+        /// <param name="client"></param>
+        /// <param name="logger"></param>
+        /// <param name="resourcePool"></param>
+        /// <param name="progress"></param>
+        /// <param name="zipClient"></param>
+        /// <param name="appPaths"></param>
         /// <param name="package">The package.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task InstallPackage(PackageVersionInfo package, CancellationToken cancellationToken);
+        Task InstallPackage(IHttpClient client,
+                            ILogger logger,
+                            ResourcePool resourcePool,
+                            IProgress<double> progress,
+                            IZipClient zipClient,
+                            IApplicationPaths appPaths,
+                            PackageVersionInfo package,
+                            CancellationToken cancellationToken);
     }
 }
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index ebd644a82..7765b8aef 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -429,77 +429,31 @@ namespace MediaBrowser.Controller.Updates
         /// <returns>Task.</returns>
         private async Task InstallPackageInternal(PackageVersionInfo package, IProgress<double> progress, CancellationToken cancellationToken)
         {
-            // Target based on if it is an archive or single assembly
-            //  zip archives are assumed to contain directory structures relative to our ProgramDataPath
-            var isArchive = string.Equals(Path.GetExtension(package.sourceUrl), ".zip", StringComparison.OrdinalIgnoreCase);
-            var target = isArchive ? Kernel.ApplicationPaths.ProgramDataPath : Path.Combine(Kernel.ApplicationPaths.PluginsPath, package.targetFilename);
+            // Do the install
+            await _packageManager.InstallPackage(HttpClient, _logger, Kernel.ResourcePools, progress, ZipClient, Kernel.ApplicationPaths, package, cancellationToken).ConfigureAwait(false);
 
-            // Download to temporary file so that, if interrupted, it won't destroy the existing installation
-            var tempFile = await HttpClient.GetTempFile(package.sourceUrl, Kernel.ResourcePools.Mb, cancellationToken, progress).ConfigureAwait(false);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // Validate with a checksum
-            if (package.checksum != Guid.Empty) // support for legacy uploads for now
+            // Do plugin-specific processing
+            if (!(Path.GetExtension(package.targetFilename) ?? "").Equals(".zip", StringComparison.OrdinalIgnoreCase))
             {
-                using (var crypto = new MD5CryptoServiceProvider())
-                using (var stream = new BufferedStream(File.OpenRead(tempFile), 100000))
+                // Set last update time if we were installed before
+                var plugin = Kernel.Plugins.FirstOrDefault(p => p.Name.Equals(package.name, StringComparison.OrdinalIgnoreCase));
+
+                if (plugin != null)
                 {
-                    var check = Guid.Parse(BitConverter.ToString(crypto.ComputeHash(stream)).Replace("-", String.Empty));
-                    if (check != package.checksum)
+                    // Synchronize the UpdateClass value
+                    if (plugin.Configuration.UpdateClass != package.classification)
                     {
-                        throw new ApplicationException(string.Format("Download validation failed for {0}.  Probably corrupted during transfer.", package.name));
+                        plugin.Configuration.UpdateClass = package.classification;
+                        plugin.SaveConfiguration();
                     }
-                }
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // Success - move it to the real target based on type
-            if (isArchive)
-            {
-                try
-                {
-                    ZipClient.ExtractAll(tempFile, target, true);
-                }
-                catch (IOException e)
-                {
-                    _logger.ErrorException("Error attempting to extract archive from {0} to {1}", e, tempFile, target);
-                    throw;
-                }
 
-            }
-            else
-            {
-                try
-                {
-                    File.Copy(tempFile, target, true);
-                    File.Delete(tempFile);
+                    OnPluginUpdated(plugin, package);
                 }
-                catch (IOException e)
-                {
-                    _logger.ErrorException("Error attempting to move file from {0} to {1}", e, tempFile, target);
-                    throw;
-                }
-            }
-
-            // Set last update time if we were installed before
-            var plugin = Kernel.Plugins.FirstOrDefault(p => p.Name.Equals(package.name, StringComparison.OrdinalIgnoreCase));
-
-            if (plugin != null)
-            {
-                // Synchronize the UpdateClass value
-                if (plugin.Configuration.UpdateClass != package.classification)
+                else
                 {
-                    plugin.Configuration.UpdateClass = package.classification;
-                    plugin.SaveConfiguration();
+                    OnPluginInstalled(package);
                 }
-
-                OnPluginUpdated(plugin, package);
-            }
-            else
-            {
-                OnPluginInstalled(package);
+                
             }
         }