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

Merge remote-tracking branch 'origin/master' into pullinprivate

Browse source 
Conflicts:
	test/data/test.db
This commit is contained in:
jakedt 2014-04-01 18:28:48 -04:00
commit 3525e383df
14 changed files with 594 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/userfiles.py
View file

@ -55,11 +55,15 @@ class UserRequestFiles(object):
return file_id
def get_file_url(self, file_id, expires_in=300):
def get_file_url(self, file_id, expires_in=300, mime_type=None):
self._initialize_s3()
full_key = os.path.join(self._prefix, file_id)
k = Key(self._bucket, full_key)
return k.generate_url(expires_in)
headers = None
if mime_type:
headers={'Content-Type': mime_type}
return k.generate_url(expires_in, headers=headers)
def get_file_checksum(self, file_id):
self._initialize_s3()