Fix watch

I changed the _download_name return type without realizing that
it was also used by the watch endpoint.  This switches the endpoint
to go through get so that watches can be tracked just like downloads
This commit is contained in:
Job Evers 2017-01-03 18:08:31 -06:00
parent 40d4f5a292
commit c2fc15160f

View file

@ -82,8 +82,11 @@ class HostedEncryptedFile(resource.Resource):
request.setHeader("Content-Security-Policy", "sandbox") request.setHeader("Content-Security-Policy", "sandbox")
if 'name' in request.args.keys(): if 'name' in request.args.keys():
if self.is_valid_request_name(request): if self.is_valid_request_name(request):
d = self._api._download_name(request.args['name'][0]) name = request.args['name'][0]
d.addCallback(lambda stream: self._make_stream_producer(request, stream)) d = self._api.jsonrpc_get({'name': name})
d.addCallback(lambda response: response['result']['stream_hash'])
d.addCallback(lambda sd_hash: self._api._get_lbry_file_by_sd_hash(sd_hash))
d.addCallback(lambda lbry_file: self._make_stream_producer(request, lbry_file))
elif request.args['name'][0] in self._api.waiting_on.keys(): elif request.args['name'][0] in self._api.waiting_on.keys():
request.redirect(conf.settings.UI_ADDRESS + "/?watch=" + request.args['name'][0]) request.redirect(conf.settings.UI_ADDRESS + "/?watch=" + request.args['name'][0])
request.finish() request.finish()