From e3b42ad59e458cf4df0de5c6055bf484edcda900 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Fri, 1 Mar 2013 15:42:44 -0500 Subject: Remove archive extraction from PackageManager It is no longer needed as the installer does this --- MediaBrowser.Controller/Updates/InstallationManager.cs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs index 7765b8aeff..718c3c64fe 100644 --- a/MediaBrowser.Controller/Updates/InstallationManager.cs +++ b/MediaBrowser.Controller/Updates/InstallationManager.cs @@ -93,12 +93,6 @@ namespace MediaBrowser.Controller.Updates } #endregion - /// - /// Gets or sets the zip client. - /// - /// The zip client. - private IZipClient ZipClient { get; set; } - /// /// The _logger /// @@ -137,20 +131,15 @@ namespace MediaBrowser.Controller.Updates /// /// The kernel. /// The HTTP client. - /// The zip client. /// The network manager. /// The package manager. /// The json serializer. /// The logger. /// The app host. /// zipClient - public InstallationManager(Kernel kernel, IHttpClient httpClient, IZipClient zipClient, INetworkManager networkManager, IPackageManager packageManager, IJsonSerializer jsonSerializer, ILogger logger, IApplicationHost appHost) + public InstallationManager(Kernel kernel, IHttpClient httpClient, INetworkManager networkManager, IPackageManager packageManager, IJsonSerializer jsonSerializer, ILogger logger, IApplicationHost appHost) : base(kernel) { - if (zipClient == null) - { - throw new ArgumentNullException("zipClient"); - } if (networkManager == null) { throw new ArgumentNullException("networkManager"); @@ -180,7 +169,6 @@ namespace MediaBrowser.Controller.Updates _networkManager = networkManager; _packageManager = packageManager; _logger = logger; - ZipClient = zipClient; } /// @@ -430,7 +418,7 @@ namespace MediaBrowser.Controller.Updates private async Task InstallPackageInternal(PackageVersionInfo package, IProgress progress, CancellationToken cancellationToken) { // Do the install - await _packageManager.InstallPackage(HttpClient, _logger, Kernel.ResourcePools, progress, ZipClient, Kernel.ApplicationPaths, package, cancellationToken).ConfigureAwait(false); + await _packageManager.InstallPackage(HttpClient, _logger, Kernel.ResourcePools, progress, Kernel.ApplicationPaths, package, cancellationToken).ConfigureAwait(false); // Do plugin-specific processing if (!(Path.GetExtension(package.targetFilename) ?? "").Equals(".zip", StringComparison.OrdinalIgnoreCase)) -- cgit v1.2.3