LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

fix get_blob calls with upload_allowed arguments

Browse source
This commit is contained in:
Job Evers-Meltzer 2017-01-18 21:08:02 -06:00 committed by jobevers
parent 439a840700
commit 2a45c91175
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/core/server/BlobRequestHandler.py
View file

@ -138,7 +138,7 @@ class BlobRequestHandler(object):
return self._send_blob(response, query) return self._send_blob(response, query)
def _send_blob(self, response, query): def _send_blob(self, response, query):
d = self.blob_manager.get_blob(query, True) d = self.blob_manager.get_blob(query)
d.addCallback(self.open_blob_for_reading, response) d.addCallback(self.open_blob_for_reading, response)
return d return d
@ -177,7 +177,7 @@ class BlobRequestHandler(object):
return defer.succeed(response) return defer.succeed(response)
else: else:
log.debug("Requested blob: %s", str(incoming)) log.debug("Requested blob: %s", str(incoming))
d = self.blob_manager.get_blob(incoming, True) d = self.blob_manager.get_blob(incoming)
d.addCallback(lambda blob: self.open_blob_for_reading(blob, response)) d.addCallback(lambda blob: self.open_blob_for_reading(blob, response))
return d return d

2
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -858,7 +858,7 @@ class Daemon(AuthJSONRPCServer):
def _get_or_download_sd_blob(self, blob, sd_hash): def _get_or_download_sd_blob(self, blob, sd_hash):
if blob: if blob:
return self.session.blob_manager.get_blob(blob[0], True) return self.session.blob_manager.get_blob(blob[0])
def _check_est(downloader): def _check_est(downloader):
if downloader.result is not None: if downloader.result is not None:

2
lbrynet/reflector/client/blob.py
View file

@ -164,7 +164,7 @@ class BlobReflectorClient(Protocol):
blob_hash = self.blob_hashes_to_send[0] blob_hash = self.blob_hashes_to_send[0]
log.debug('No current blob, sending the next one: %s', blob_hash) log.debug('No current blob, sending the next one: %s', blob_hash)
self.blob_hashes_to_send = self.blob_hashes_to_send[1:] self.blob_hashes_to_send = self.blob_hashes_to_send[1:]
d = self.blob_manager.get_blob(blob_hash, True) d = self.blob_manager.get_blob(blob_hash)
d.addCallback(self.open_blob_for_reading) d.addCallback(self.open_blob_for_reading)
# send the server the next blob hash + length # send the server the next blob hash + length
d.addCallbacks( d.addCallbacks(