mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-27 13:40:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Issue 2137 - Data not compressed on fly when adding to zip archive

Browse source
This commit is contained in:
RazvanN7 2017-08-08 11:49:19 +03:00
parent bdcbb419e9
commit 6b15175610
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
std/zip.d
View file

@ -360,11 +360,37 @@ final class ZipArchive
{
}
/** Add de to the archive.
/** Add de to the archive. The file is compressed on the fly.
*/
@safe void addMember(ArchiveMember de)
{
_directory[de.name] = de;
if (!de._compressedData.length)
{
switch (de.compressionMethod)
{
case CompressionMethod.none:
de._compressedData = de._expandedData;
break;
case CompressionMethod.deflate:
import std.zlib : compress;
() @trusted
{
de._compressedData = cast(ubyte[]) compress(cast(void[]) de._expandedData);
}();
de._compressedData = de._compressedData[2 .. de._compressedData.length - 4];
break;
default:
throw new ZipException("unsupported compression method");
}
de._compressedSize = to!uint(de._compressedData.length);
import std.zlib : crc32;
() @trusted { de._crc32 = crc32(0, cast(void[]) de._expandedData); }();
}
assert(de._compressedData.length == de._compressedSize);
}
/** Delete de from the archive.
@ -399,30 +425,6 @@ final class ZipArchive
auto directory = _directory.values().sort!((x, y) => x.index < y.index).release;
foreach (ArchiveMember de; directory)
{
if (!de._compressedData.length)
{
switch (de.compressionMethod)
{
case CompressionMethod.none:
de._compressedData = de._expandedData;
break;
case CompressionMethod.deflate:
import std.zlib : compress;
de._compressedData = cast(ubyte[]) compress(cast(void[]) de._expandedData);
de._compressedData = de._compressedData[2 .. de._compressedData.length - 4];
break;
default:
throw new ZipException("unsupported compression method");
}
de._compressedSize = to!uint(de._compressedData.length);
import std.zlib : crc32;
de._crc32 = crc32(0, cast(void[]) de._expandedData);
}
assert(de._compressedData.length == de._compressedSize);
if (to!ulong(archiveSize) + 30 + de.name.length + de.extra.length + de.compressedSize
+ directorySize + 46 + de.name.length + de.extra.length + de.comment.length
+ 22 + comment.length + eocd64LocLength + eocd64Length > uint.max)