alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-28 11:28:27 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

isolated DotNetZip dependancy

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 00:00:56 -05:00
parent a0ced20d5b
commit acf5b0b6ed
12 changed files with 134 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.Controller/Updates/InstallationManager.cs
View File

@@ -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;
@@ -91,14 +91,27 @@ 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)
{