archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fixed create_from_file(filename) bug (should be file obj, not name)

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-11-09 11:44:16 +01:00 committed by Francesco Siddi
parent e5b4ce0890
commit 647ae0f3d6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/api/utils/storage.py
View File

@ -203,6 +203,8 @@ class LocalBlob(Blob):
current_app.config['STORAGE_DIR'], self.partial_path) current_app.config['STORAGE_DIR'], self.partial_path)
def create_from_file(self, uploaded_file, file_size): def create_from_file(self, uploaded_file, file_size):
assert hasattr(uploaded_file, 'read')
# Ensure path exists before saving # Ensure path exists before saving
directory = os.path.dirname(self.path) directory = os.path.dirname(self.path)
if not os.path.exists(directory): if not os.path.exists(directory):
@ -236,11 +238,11 @@ class LocalBlob(Blob):
if current_app.config['TESTING']: if current_app.config['TESTING']:
log.warning(' - NOT making thumbnails', fname) log.warning(' - NOT making thumbnails', fname)
else: else:
log.debug(' - Sending thumbnail %s to GCS', fname) log.debug(' - Sending thumbnail %s to %s', fname, self.bucket)
blob = self.bucket.blob(fname) blob = self.bucket.blob(fname)
blob.create_from_file(variation['local_path'], with open(variation['local_path'], 'rb') as local_file:
variation['length']) blob.create_from_file(local_file, variation['length'])
try: try:
os.unlink(variation['local_path']) os.unlink(variation['local_path'])