Ticket #15213: Enabled-compression-of-static-files-using-an-external-programs.patch

django/conf/global_settings.py

@@ -579 +579 @@
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
+# Mapping from filename extensions to external programs (e.g. yui-compressor)
+# used to compress static files with that extension.
+STATICFILES_COMPRESSORS = {}
+
 # URL prefix for admin media -- CSS, JavaScript and images.
 # Make sure to use a trailing slash.
 # Examples: "http://foo.com/static/admin/", "/static/admin/".

django/contrib/staticfiles/management/commands/collectstatic.py

@@ -1 +1 @@
 import os
 import sys
 import shutil
+import subprocess
 from optparse import make_option
 
 from django.conf import settings
+from django.core.files.base import File
 from django.core.files.storage import get_storage_class
 from django.core.management.base import CommandError, NoArgsCommand
 
@@ -29 +31 @@
             dest='use_default_ignore_patterns', default=True,
             help="Don't ignore the common private glob-style patterns 'CVS', "
                 "'.*' and '*~'."),
+        make_option('--no-compress', action='store_false',
+            dest='compress', default=True,
+            help="Don't compress files, using the programs configured by the "
+                "STATICFILES_COMPRESSORS setting."),
     )
     help = "Collect static files from apps and other locations in a single location."
 
@@ -36 +42 @@
         super(NoArgsCommand, self).__init__(*args, **kwargs)
         self.copied_files = []
         self.symlinked_files = []
+        self.compressed_files = []
         self.unmodified_files = []
         self.storage = get_storage_class(settings.STATICFILES_STORAGE)()
         try:
@@ -49 +56 @@
 
     def handle_noargs(self, **options):
         symlink = options['link']
+        compress = options['compress']
         ignore_patterns = options['ignore_patterns']
         if options['use_default_ignore_patterns']:
             ignore_patterns += ['CVS', '.*', '*~']
@@ -82 +90 @@
                     prefixed_path = os.path.join(storage.prefix, path)
                 else:
                     prefixed_path = path
+
+                if compress:
+                    ext = os.path.splitext(path)[1][len(os.path.extsep):]
+                    compressor = settings.STATICFILES_COMPRESSORS.get(ext)
+                    if compressor is not None:
+                        self.compress_file(path, prefixed_path, storage, compressor, **options)
+                        continue
+
                 if symlink:
                     self.link_file(path, prefixed_path, storage, **options)
                 else:
@@ -200 +216 @@
                 self.storage.save(prefixed_path, source_file)
         if not prefixed_path in self.copied_files:
             self.copied_files.append(prefixed_path)
+
+    def compress_file(self, path, prefixed_path, source_storage, compressor, **options):
+        """
+        Attempt to put a compressed version to ``path`` with storage
+        """
+        # Skip this file if it was already compressed earlier
+        if prefixed_path in self.compressed_files:
+            return self.log("Skipping '%s' (already compressed earlier)" % path)
+        # Delete the target file if needed or break
+        if not self.delete_file(path, prefixed_path, source_storage, **options):
+            return
+        # The full path of the source file
+        source_path = source_storage.path(path)
+        # Finally compress the file
+        if options['dry_run']:
+            self.log("Pretending to compress '%s'" % source_path, level=1)
+        else:
+            self.log("Compressing '%s'" % source_path, level=1)
+            if self.local:
+                full_path = self.storage.path(prefixed_path)
+                try:
+                    os.makedirs(os.path.dirname(full_path))
+                except OSError:
+                    pass
+                subprocess.Popen(compressor, shell=True,
+                                 stdin=open(source_path, 'rb'),
+                                 stdout=open(full_path, 'wb')).wait()
+                shutil.copystat(source_path, full_path)
+            else:
+                process = subprocess.Popen(compressor, shell=True,
+                                           stdin=open(source_path, 'rb'),
+                                           stdout=subprocess.PIPE)
+                self.storage.save(prefixed_path, File(process.stdout))
+                process.wait()
+        if prefixed_path not in self.compressed_files:
+            self.compressed_files.append(prefixed_path)

django/core/files/base.py

@@ -59 +59 @@
         if not chunk_size:
             chunk_size = self.DEFAULT_CHUNK_SIZE
 
-        if hasattr(self, 'seek'):
+        try:
             self.seek(0)
-        # Assume the pointer is at zero...
-        counter = self.size
-
-        while counter > 0:
-            yield self.read(chunk_size)
-            counter -= chunk_size
+        except (AttributeError, IOError):
+            pass
+
+        while True:
+            data = self.read(chunk_size)
+            if not data:
+                break
+            yield data
 
     def multiple_chunks(self, chunk_size=None):
         """