From 2a45c911756d3a54a4e5f1a010bdadc1dc09850d Mon Sep 17 00:00:00 2001 From: Job Evers-Meltzer Date: Wed, 18 Jan 2017 21:08:02 -0600 Subject: [PATCH] fix get_blob calls with upload_allowed arguments --- lbrynet/core/server/BlobRequestHandler.py | 4 ++-- lbrynet/lbrynet_daemon/Daemon.py | 2 +- lbrynet/reflector/client/blob.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lbrynet/core/server/BlobRequestHandler.py b/lbrynet/core/server/BlobRequestHandler.py index aea8cd276..2d08f25c2 100644 --- a/lbrynet/core/server/BlobRequestHandler.py +++ b/lbrynet/core/server/BlobRequestHandler.py @@ -138,7 +138,7 @@ class BlobRequestHandler(object): return self._send_blob(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) return d @@ -177,7 +177,7 @@ class BlobRequestHandler(object): return defer.succeed(response) else: 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)) return d diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index fdc730a2b..d3224cda4 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -858,7 +858,7 @@ class Daemon(AuthJSONRPCServer): def _get_or_download_sd_blob(self, blob, sd_hash): 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): if downloader.result is not None: diff --git a/lbrynet/reflector/client/blob.py b/lbrynet/reflector/client/blob.py index 2aba7716f..854dc6489 100644 --- a/lbrynet/reflector/client/blob.py +++ b/lbrynet/reflector/client/blob.py @@ -164,7 +164,7 @@ class BlobReflectorClient(Protocol): blob_hash = self.blob_hashes_to_send[0] log.debug('No current blob, sending the next one: %s', blob_hash) 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) # send the server the next blob hash + length d.addCallbacks(