Skip to content

Commit

Permalink
Update "seek of closed file" fix for current django-storages
Browse files Browse the repository at this point in the history
Using this class with the new django-storages gives the error:

  ValueError: seek of closed file

This change should fix that -
jschneier/django-storages#382 (comment)
  • Loading branch information
nikolas committed Jul 16, 2020
1 parent dbdf5c1 commit 8101408
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
5 changes: 4 additions & 1 deletion CHANGES
@@ -1,6 +1,9 @@
0.2.1 (2019-06-20)
0.2.2
==================
* Update the seek of closed file fix to work with django-storages 1.9.x.

0.2.1 (2019-06-20)
==================
* Add boto3 file seek fix

0.2.0 (2019-06-19)
Expand Down
33 changes: 18 additions & 15 deletions cacheds3storage/__init__.py
Expand Up @@ -11,28 +11,31 @@ def __init__(self, *args, **kwargs):
self.local_storage = get_storage_class(
'compressor.storage.CompressorFileStorage')()

# Fix for "ValueError: seek of closed file" problem with boto3
# https://github.com/jschneier/django-storages/issues/382#issuecomment-377174808
def _save_content(self, obj, content, parameters):
# https://github.com/jschneier/django-storages/issues/382
# #issuecomment-592876060
def _save(self, name, content):
"""
We create a clone of the content file as when this is passed to boto3 it wrongly closes
the file upon upload where as the storage backend expects it to still be open
We create a clone of the content file as when this is passed
to boto3 it wrongly closes the file upon upload where as the
storage backend expects it to still be open
"""
# Seek our content back to the start
content.seek(0, os.SEEK_SET)

# Create a temporary file that will write to disk after a specified size
content_autoclose = SpooledTemporaryFile()
# Create a temporary file that will write to disk after a
# specified size. This file will be automatically deleted when
# closed by boto3 or after exiting the `with` statement if the
# boto3 is fixed
with SpooledTemporaryFile() as content_autoclose:

# Write our original content into our copy that will be closed by boto3
content_autoclose.write(content.read())
# Write our original content into our copy that will be
# closed by boto3
content_autoclose.write(content.read())

# Upload the object which will auto close the content_autoclose instance
super(CachedS3BotoStorage, self)._save_content(obj, content_autoclose, parameters)

# Cleanup if this is fixed upstream our duplicate should always close
if not content_autoclose.closed:
content_autoclose.close()
# Upload the object which will auto close the
# content_autoclose instance
return super(CachedS3BotoStorage, self)._save(
name, content_autoclose)

def save(self, name, content):
name = super(CachedS3BotoStorage, self).save(name, content)
Expand Down

0 comments on commit 8101408

Please sign in to comment.