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

Renamed 'file_in_storage' to 'blob'

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-03-21 15:46:15 +01:00
parent ec1db0a725
commit 47eba6786a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pillar/api/file_storage/__init__.py
View File

@ -702,25 +702,25 @@ def stream_to_storage(project_id):
file_id, internal_fname, status = create_file_doc_for_upload(project_oid, file_id, internal_fname, status = create_file_doc_for_upload(project_oid,
uploaded_file) uploaded_file)
storage_backend = None storage_backend = None
file_in_storage = None blob = None
if current_app.config['TESTING']: if current_app.config['TESTING']:
log.warning('NOT streaming to GCS because TESTING=%r', log.warning('NOT streaming to GCS because TESTING=%r',
current_app.config['TESTING']) current_app.config['TESTING'])
# Fake a Blob object. # Fake a Blob object.
file_in_storage = type('Blob', (), {'size': file_size}) blob = type('Blob', (), {'size': file_size})
else: else:
bucket = default_storage_backend(project_id) bucket = default_storage_backend(project_id)
blob = bucket.blob(internal_fname) blob = bucket.blob(internal_fname)
blob.create_from_file(stream_for_gcs, file_size) blob.create_from_file(stream_for_gcs, file_size)
# if current_app.config['STORAGE_BACKEND'] == 'gcs': # if current_app.config['STORAGE_BACKEND'] == 'gcs':
# file_in_storage, storage_backend = stream_to_gcs( # blob, storage_backend = stream_to_gcs(
# file_id, file_size, internal_fname, project_id, # file_id, file_size, internal_fname, project_id,
# stream_for_gcs, uploaded_file.mimetype) # stream_for_gcs, uploaded_file.mimetype)
# elif current_app.config['STORAGE_BACKEND'] == 'local': # elif current_app.config['STORAGE_BACKEND'] == 'local':
# storage_backend = LocalBucket(project_id) # storage_backend = LocalBucket(project_id)
# file_in_storage = LocalBlob(project_id, internal_fname) # blob = LocalBlob(project_id, internal_fname)
# file_in_storage.create_from_file(stream_for_gcs, file_size) # blob.create_from_file(stream_for_gcs, file_size)
log.debug('Marking uploaded file id=%s, fname=%s, ' log.debug('Marking uploaded file id=%s, fname=%s, '
'size=%i as "queued_for_processing"', 'size=%i as "queued_for_processing"',
@ -881,4 +881,4 @@ def update_file_doc(file_id, **updates):
{'$set': updates}) {'$set': updates})
log.debug('update_file_doc(%s, %s): %i matched, %i updated.', log.debug('update_file_doc(%s, %s): %i matched, %i updated.',
file_id, updates, res.matched_count, res.modified_count) file_id, updates, res.matched_count, res.modified_count)
return res return res