Merge tag '0.41.3' into develop

CenterForOpenScience · Aug 27, 2018 · eb96dfc · eb96dfc
2 parents 2d647dc + f863547
commit eb96dfc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.41.3 (2018-08-27)
+===================
+- Feature: Make download-as-zip compression level a tunable configuration parameter.
+
 0.41.2 (2018-08-27)
 ===================
 - Fix: Brown-paper-bag release: Check in settings file needed for last fix.

diff --git a/waterbutler/core/streams/settings.py b/waterbutler/core/streams/settings.py
@@ -1,7 +1,15 @@
+import zlib
+
 from waterbutler import settings
 
 
 config = settings.child('STREAMS_CONFIG')
 
 
 ZIP_EXTENSIONS = config.get('ZIP_EXTENSIONS', '.zip .gz .bzip .bzip2 .rar .xz .bz2 .7z').split(' ')
+
+# Compression level to apply to zipped files. Value must be an integer from 0 to 9, where
+# lower values represent less compression.  -1 is also allowed, meaning the default level
+# (approximately equivalent to a 6).  See the zlib docs for more:
+# https://docs.python.org/3/library/zlib.html#zlib.compressobj
+ZIP_COMPRESSION_LEVEL = int(config.get('ZIP_COMPRESSION_LEVEL', zlib.Z_DEFAULT_COMPRESSION))
diff --git a/waterbutler/core/streams/zip.py b/waterbutler/core/streams/zip.py
@@ -160,7 +160,7 @@ def __init__(self, file_tuple):
             self.zinfo.external_attr = 0o600 << 16      # -rw-------
             self.zinfo.compress_type = zipfile.ZIP_DEFLATED
             self.compressor = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION,
+                settings.ZIP_COMPRESSION_LEVEL,
                 zlib.DEFLATED,
                 -15,
             )

diff --git a/waterbutler/version.py b/waterbutler/version.py
@@ -1 +1 @@
-__version__ = '0.41.2'
+__version__ = '0.41.3'