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

remove blob_requester from DownloadManager

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-12-30 00:50:36 -06:00
parent 01cc4f28e0
commit 1256beea96
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lbrynet/core/client/DownloadManager.py
View file

@ -14,7 +14,6 @@ class DownloadManager(object):
def __init__(self, blob_manager, upload_allowed): def __init__(self, blob_manager, upload_allowed):
self.blob_manager = blob_manager self.blob_manager = blob_manager
self.upload_allowed = upload_allowed self.upload_allowed = upload_allowed
self.blob_requester = None
self.blob_info_finder = None self.blob_info_finder = None
self.progress_manager = None self.progress_manager = None
self.blob_handler = None self.blob_handler = None

14
lbrynet/cryptstream/client/CryptStreamDownloader.py
View file

@ -62,19 +62,16 @@ class CryptStreamDownloader(object):
self.payment_rate_manager = payment_rate_manager self.payment_rate_manager = payment_rate_manager
self.wallet = wallet self.wallet = wallet
self.upload_allowed = upload_allowed self.upload_allowed = upload_allowed
self.key = None self.key = None
self.stream_name = None self.stream_name = None
self.completed = False self.completed = False
self.stopped = True self.stopped = True
self.stopping = False self.stopping = False
self.starting = False self.starting = False
self.download_manager = None self.download_manager = None
self.finished_deferred = None self.finished_deferred = None
self.points_paid = 0.0 self.points_paid = 0.0
self.blob_requester = None
def __str__(self): def __str__(self):
return str(self.stream_name) return str(self.stream_name)
@ -155,20 +152,19 @@ class CryptStreamDownloader(object):
return d return d
def _get_download_manager(self): def _get_download_manager(self):
assert self.blob_requester is None
download_manager = DownloadManager(self.blob_manager, self.upload_allowed) download_manager = DownloadManager(self.blob_manager, self.upload_allowed)
download_manager.blob_info_finder = self._get_metadata_handler(download_manager) download_manager.blob_info_finder = self._get_metadata_handler(download_manager)
download_manager.blob_requester = self._get_blob_requester(download_manager)
download_manager.progress_manager = self._get_progress_manager(download_manager) download_manager.progress_manager = self._get_progress_manager(download_manager)
download_manager.blob_handler = self._get_blob_handler(download_manager) download_manager.blob_handler = self._get_blob_handler(download_manager)
download_manager.wallet_info_exchanger = self.wallet.get_info_exchanger() download_manager.wallet_info_exchanger = self.wallet.get_info_exchanger()
# blob_requester needs to be set before the connection manager is setup
self.blob_requester = self._get_blob_requester(download_manager)
download_manager.connection_manager = self._get_connection_manager(download_manager) download_manager.connection_manager = self._get_connection_manager(download_manager)
#return DownloadManager(self.blob_manager, self.blob_requester, self.metadata_handler,
# self.progress_manager, self.blob_handler, self.connection_manager)
return download_manager return download_manager
def _remove_download_manager(self): def _remove_download_manager(self):
self.download_manager.blob_info_finder = None self.download_manager.blob_info_finder = None
self.download_manager.blob_requester = None
self.download_manager.progress_manager = None self.download_manager.progress_manager = None
self.download_manager.blob_handler = None self.download_manager.blob_handler = None
self.download_manager.wallet_info_exchanger = None self.download_manager.wallet_info_exchanger = None
@ -176,7 +172,7 @@ class CryptStreamDownloader(object):
self.download_manager = None self.download_manager = None
def _get_primary_request_creators(self, download_manager): def _get_primary_request_creators(self, download_manager):
return [download_manager.blob_requester] return [self.blob_requester]
def _get_secondary_request_creators(self, download_manager): def _get_secondary_request_creators(self, download_manager):
return [download_manager.wallet_info_exchanger] return [download_manager.wallet_info_exchanger]