Support ZipExtFile - fixes kimetrica#2

Signed-off-by: Roger Hunwicks <roger@tonic-solutions.com>

Author: rhunwicks

binary_database_files/storage.py

@@ -2,6 +2,7 @@
 """Custom storage backend that stores files in the database to facilitate scaling."""
 from __future__ import unicode_literals, division
 import os
+from io import UnsupportedOperation
 
 import six
 
@@ -72,12 +73,13 @@ def _open(self, name, mode='rb'):
     def _save(self, name, content):
         """Save file with filename `name` and given content to the database."""
         full_path = self.path(name)
+        # ZipExtFile advertises seek() but can raise UnsupportedOperation
         try:
-            size = content.size
-        except AttributeError:
-            size = os.path.getsize(full_path)
-        content.seek(0)
+            content.seek(0)
+        except UnsupportedOperation:
+            pass
         content = content.read()
+        size = len(content)
         f = models.File.objects.create(
             content=content,
             size=size,

binary_database_files/tests/fixtures/test.zip

@@ -0,0 +1 @@
+This is a text file containing UTF-8 text: áéíóúüñÑ

binary_database_files/tests/fixtures/test_text.txt

@@ -1,14 +1,17 @@
 # -*- coding: utf-8 -*-
 import os
 import shutil
+from io import BytesIO
+from zipfile import ZipFile
 
 import six
 
+from django.conf import settings
 from django.core import files
-from django.test import TestCase
+from django.core.files import File as DjangoFile
 from django.core.files.storage import default_storage
 from django.core.management import call_command
-from django.conf import settings
+from django.test import TestCase
 
 from binary_database_files.models import File
 from binary_database_files.tests.models import Thing
@@ -96,6 +99,19 @@ def test_adding_file(self):
         self.assertEqual(default_storage.exists('i/special/test.txt'), False)
         self.assertEqual(os.path.isfile(test_fqfn), False)
 
+    def test_adding_extzipfile(self):
+        # ZipExtFile advertises seek() but can raise UnsupportedOperation
+        with ZipFile(os.path.join(DIR, 'fixtures/test.zip')) as testzip:
+            for filename in testzip.namelist():
+                with testzip.open(filename) as testfile:
+                    o = Thing()
+                    o.upload = DjangoFile(testfile)
+                    o.save()
+                with testzip.open(filename) as testfile:
+                    uploaded = File.objects.get(name='i/special/' + filename)
+                    self.assertEqual(uploaded.size, testzip.getinfo(filename).file_size)
+                    self.assertEqual(BytesIO(uploaded.content).read(), testfile.read())
+
     def test_hash(self):
         verbose = 1