starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-21 08:15:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

switch to sharp compress to add 7z support

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-23 12:48:35 -04:00
parent baa5be2157
commit c905051b16
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.ServerApplication/Implementations/DotNetZipClient.cs
View File

@@ -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);
}
}
}