Adds SWIFT_CONTENT_LENGTH_FROM_FD (#100)

* Bumps version to 1.2.19

Author: pomegranited

README.rst

@@ -186,6 +186,11 @@ Troubleshooting
    discussion <http://support.rc.nectar.org.au/forum/viewtopic.php?f=6&t=272>`__.
    If you are using temporary URLs, verify that your key is set
    correctly.
+-  **I'm getting empty or truncated file uploads**: Issues with some content
+   types may cause an incorrect `content_length` header to be sent with file
+   uploads, resulting in 0 byte or truncated files.  To avoid this, set
+   `SWIFT_CONTENT_LENGTH_FROM_FD: True`.
+
 
 Quickstart
 ----------

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='django-storage-swift',
-    version='1.2.18',
+    version='1.2.19',
     description='OpenStack Swift storage backend for Django',
     long_description=open('README.rst').read(),
     url='https://github.com/dennisv/django-storage-swift',

swift/storage.py

@@ -142,6 +142,7 @@ class SwiftStorage(Storage):
     auto_overwrite = setting('SWIFT_AUTO_OVERWRITE', False)
     lazy_connect = setting('SWIFT_LAZY_CONNECT', False)
     content_type_from_fd = setting('SWIFT_CONTENT_TYPE_FROM_FD', False)
+    content_length_from_fd = setting('SWIFT_CONTENT_LENGTH_FROM_FD', True)
     _token_creation_time = 0
     _token = ''
     _swift_conn = None
@@ -265,7 +266,12 @@ def _save(self, name, content, headers=None):
             content.seek(0)
         else:
             content_type = mimetypes.guess_type(name)[0]
-        content_length = content.size
+
+        if self.content_length_from_fd:
+            content_length = content.size
+        else:
+            content_length = None
+
         self.swift_conn.put_object(self.container_name,
                                    name,
                                    content,

tests/tests.py

@@ -288,12 +288,31 @@ def test_save_non_rewound(self):
         content_file.seek(5)
 
         def mocked_put_object(cls, url, token, container, name=None,
-                              contents=None, *args, **kwargs):
+                              contents=None, content_length=None, *args, **kwargs):
             content['saved'] = contents.read()
+            content['size'] = content_length
 
         with patch('tests.utils.FakeSwift.put_object', new=classmethod(mocked_put_object)):
             self.backend.save('test.txt', content_file)
         self.assertEqual(content['saved'], content['orig'])
+        self.assertEqual(content['size'], len(content['orig']))
+
+    def test_no_content_length_from_fd(self):
+        """Test disabling content_length_from_fd on save"""
+        backend = self.default_storage('v3', content_length_from_fd=False)
+        content = dict(orig="Hello world!")
+        content_file = ContentFile("")
+        content_file.write(content['orig'])
+
+        def mocked_put_object(cls, url, token, container, name=None,
+                              contents=None, content_length=None, *args, **kwargs):
+            content['saved'] = contents.read()
+            content['size'] = content_length
+
+        with patch('tests.utils.FakeSwift.put_object', new=classmethod(mocked_put_object)):
+            backend.save('test.txt', content_file)
+        self.assertEqual(content['saved'], content['orig'])
+        self.assertIsNone(content['size'])
 
     def test_open(self):
         """Attempt to open a object"""