Verified Commit 3fe71d50 authored by Victor's avatar Victor
Browse files

[refactor] use explicit stream direction argument

download was being inferred. It's now being set on each and will raise
an error if node is provided. Also removed a duplication on params
variable.
parent 00583341
......@@ -483,7 +483,8 @@ class BlobManager(BlobsSynchronizer):
@defer.inlineCallbacks
def _downstream(self, blobs_id_list, namespace=''):
uri = urljoin(self.remote_stream, self.user)
params = {'namespace': namespace} if namespace else None
params = {'namespace': namespace} if namespace else {}
params['direction'] = 'download'
data = BytesIO(json.dumps(blobs_id_list))
response = yield self._client.post(uri, params=params, data=data)
deferreds = []
......@@ -501,7 +502,6 @@ class BlobManager(BlobsSynchronizer):
def _upstream(self, blobs_id_list, namespace=''):
local, secret = self.local, self.secret
uri = urljoin(self.remote_stream, self.user)
params = {'namespace': namespace} if namespace else None
sizes = yield self.local.get_size_list(blobs_id_list, namespace)
convert = get_unarmored_ciphertext_size
sizes = map(lambda (blob_id, size): (blob_id, convert(size)), sizes)
......
......@@ -60,7 +60,7 @@ class StreamingResource(Resource):
def render_POST(self, request):
user = request.postpath[0]
namespace = request.args.get('namespace', ['default'])[0]
direction = request.args.get('direction', ['download'])[0]
direction = request.args['direction'][0]
if direction == 'download':
return self._startDownstream(user, namespace, request)
elif direction == 'upload':
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment