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

Fetch the new etag after updating file links.

Browse Source 
It's stupid and goes to MongoDB again, but it works for now.
This commit is contained in:
Sybren A. Stüvel
2016-05-02 15:37:17 +02:00
parent 42ff638b48
commit 24c5936751
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/application/modules/file_storage.py
View File

@@ -331,7 +331,8 @@ def _generate_all_links(response, now):
response['link_expires'] = now + datetime.timedelta(seconds=validity_secs) response['link_expires'] = now + datetime.timedelta(seconds=validity_secs)
patch_info = remove_private_keys(response) patch_info = remove_private_keys(response)
(patch_resp, _, _, _) = patch_internal('files', patch_info, _id=ObjectId(response['_id'])) file_id = ObjectId(response['_id'])
(patch_resp, _, _, _) = patch_internal('files', patch_info, _id=file_id)
if patch_resp.get('_status') == 'ERR': if patch_resp.get('_status') == 'ERR':
log.warning('Unable to save new links for file %s: %r', response['_id'], patch_resp) log.warning('Unable to save new links for file %s: %r', response['_id'], patch_resp)
# TODO: raise a snag. # TODO: raise a snag.
@@ -339,6 +340,10 @@ def _generate_all_links(response, now):
else: else:
response['_updated'] = patch_resp['_updated'] response['_updated'] = patch_resp['_updated']
# Be silly and re-fetch the etag ourselves. TODO: handle this better.
etag_doc = current_app.data.driver.db['files'].find_one({'_id': file_id}, {'_etag': 1})
response['_etag'] = etag_doc['_etag']
def before_deleting_file(item): def before_deleting_file(item):
delete_file(item) delete_file(item)
@@ -497,6 +502,7 @@ def stream_to_gcs(project_id):
log.debug('Handled uploaded file id=%s, fname=%s, size=%i', file_id, internal_fname, blob.size) log.debug('Handled uploaded file id=%s, fname=%s, size=%i', file_id, internal_fname, blob.size)
# Status is 200 if the file already existed, and 201 if it was newly created. # Status is 200 if the file already existed, and 201 if it was newly created.
# TODO: add a link to a thumbnail in the response.
resp = jsonify(status='ok', file_id=str(file_id)) resp = jsonify(status='ok', file_id=str(file_id))
resp.status_code = status resp.status_code = status
add_access_control_headers(resp) add_access_control_headers(resp)