vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the content-type for S3 uploads of user data.

Browse source
This commit is contained in:
yackob03 2013-10-25 18:18:06 -04:00
parent 78d2d6cad0
commit 1ff67f688d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/userfiles.py
View file

@ -1,10 +1,14 @@
import boto import boto
import os import os
import logging
from boto.s3.key import Key from boto.s3.key import Key
from uuid import uuid4 from uuid import uuid4
logger = logging.getLogger(__name__)
class S3FileWriteException(Exception): class S3FileWriteException(Exception):
pass pass
@ -20,7 +24,9 @@ class UserRequestFiles(object):
def store_file(self, flask_file): def store_file(self, flask_file):
file_id = str(uuid4()) file_id = str(uuid4())
full_key = os.path.join(self._prefix, file_id) full_key = os.path.join(self._prefix, file_id)
k = Key(full_key) k = Key(self._bucket, full_key)
logger.debug('Setting s3 content type to: %s' % flask_file.content_type)
k.set_metadata('Content-Type', flask_file.content_type)
bytes_written = k.set_contents_from_file(flask_file) bytes_written = k.set_contents_from_file(flask_file)
if bytes_written == 0: if bytes_written == 0:
@ -30,5 +36,5 @@ class UserRequestFiles(object):
def get_file_url(self, file_id, expires_in=300): def get_file_url(self, file_id, expires_in=300):
full_key = os.path.join(self._prefix, file_id) full_key = os.path.join(self._prefix, file_id)
k = Key(full_key) k = Key(self._bucket, full_key)
return k.generate_url(expires_in) return k.generate_url(expires_in)