starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-24 07:54:39 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

Merge pull request #125 from kenkendk/set_compression_info_on_stream

Browse Source 
Fix setting compressioninfo on Zip streams
This commit is contained in:
Adam Hathcock
2016-02-04 10:00:20 +00:00
parent fe8da55c95 a05b692fc3
commit 0fab1ff976
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SharpCompress/Writer/Zip/ZipWriter.cs
View File

@@ -75,7 +75,7 @@ namespace SharpCompress.Writer.Zip
var headersize = (uint)WriteHeader(entryPath, modificationTime, compressionInfo);
streamPosition += headersize;
return new ZipWritingStream(this, OutputStream, entry);
return new ZipWritingStream(this, OutputStream, entry, compressionInfo);
}
private string NormalizeFilename(string filename)
@@ -154,16 +154,18 @@ namespace SharpCompress.Writer.Zip
private readonly Stream originalStream;
private readonly Stream writeStream;
private readonly ZipWriter writer;
private readonly ZipCompressionInfo compressionInfo;
private CountingWritableSubStream counting;
private uint decompressed;
internal ZipWritingStream(ZipWriter writer, Stream originalStream, ZipCentralDirectoryEntry entry)
internal ZipWritingStream(ZipWriter writer, Stream originalStream, ZipCentralDirectoryEntry entry, CompressionInfo compressionInfo = null)
{
this.writer = writer;
this.originalStream = originalStream;
writeStream = GetWriteStream(originalStream);
this.writer = writer;
this.entry = entry;
this.compressionInfo = compressionInfo == null ? writer.zipCompressionInfo : new ZipCompressionInfo(compressionInfo);
}
public override bool CanRead
@@ -196,7 +198,7 @@ namespace SharpCompress.Writer.Zip
{
counting = new CountingWritableSubStream(writeStream);
Stream output = counting;
switch (writer.zipCompressionInfo.Compression)
switch (compressionInfo.Compression)
{
case ZipCompressionMethod.None:
{
@@ -204,7 +206,7 @@ namespace SharpCompress.Writer.Zip
}
case ZipCompressionMethod.Deflate:
{
return new DeflateStream(counting, CompressionMode.Compress, writer.zipCompressionInfo.DeflateCompressionLevel,
return new DeflateStream(counting, CompressionMode.Compress, compressionInfo.DeflateCompressionLevel,
true);
}
case ZipCompressionMethod.BZip2:
@@ -230,7 +232,7 @@ namespace SharpCompress.Writer.Zip
}
default:
{
throw new NotSupportedException("CompressionMethod: " + writer.zipCompressionInfo.Compression);
throw new NotSupportedException("CompressionMethod: " + compressionInfo.Compression);
}
}
}