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

use LoopingCall in SingleProgressManager to simplify it

Browse source
This commit is contained in:
Kay Kurokawa 2017-06-20 15:03:17 -04:00
parent f99995a990
commit 1c1b5096be
2 changed files with 18 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lbrynet/core/client/StandaloneBlobDownloader.py
View file

@ -6,10 +6,10 @@ from lbrynet.core.client.BlobRequester import BlobRequester
from lbrynet.core.client.ConnectionManager import ConnectionManager from lbrynet.core.client.ConnectionManager import ConnectionManager
from lbrynet.core.client.DownloadManager import DownloadManager from lbrynet.core.client.DownloadManager import DownloadManager
from lbrynet.core.Error import InvalidBlobHashError from lbrynet.core.Error import InvalidBlobHashError
from lbrynet.core.utils import is_valid_blobhash from lbrynet.core.utils import is_valid_blobhash, safe_start_looping_call, safe_stop_looping_call
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.internet import defer from twisted.internet import defer
from twisted.internet import LoopingCall
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -34,34 +34,24 @@ class SingleBlobMetadataHandler(object):
class SingleProgressManager(object): class SingleProgressManager(object):
def __init__(self, finished_callback, download_manager): def __init__(self, finished_callback, download_manager):
self.finished_callback = finished_callback self.finished_callback = finished_callback
self.finished = False
self.download_manager = download_manager self.download_manager = download_manager
self._next_check_if_finished = None
self.checker = LoopingCall(self._check_if_finished)
def start(self): def start(self):
safe_start_looping_call(self.checker,1)
from twisted.internet import reactor
assert self._next_check_if_finished is None
self._next_check_if_finished = reactor.callLater(0, self._check_if_finished)
return defer.succeed(True) return defer.succeed(True)
def stop(self): def stop(self):
if self._next_check_if_finished is not None: safe_stop_looping_call(self.checker)
self._next_check_if_finished.cancel()
self._next_check_if_finished = None
return defer.succeed(True) return defer.succeed(True)
def _check_if_finished(self): def _check_if_finished(self):
if self.stream_position() == 1:
from twisted.internet import reactor blob_downloaded = self.download_manager.blobs[0]
log.debug("The blob %s has been downloaded. Calling the finished callback", str(blob_downloaded))
self._next_check_if_finished = None safe_stop_looping_call(self.checker)
if self.finished is False: self.finished_callback(blob_downloaded)
if self.stream_position() == 1:
self.blob_downloaded(self.download_manager.blobs[0], 0)
else:
self._next_check_if_finished = reactor.callLater(1, self._check_if_finished)
def stream_position(self): def stream_position(self):
blobs = self.download_manager.blobs blobs = self.download_manager.blobs
@ -74,15 +64,6 @@ class SingleProgressManager(object):
assert len(blobs) == 1 assert len(blobs) == 1
return [b for b in blobs.itervalues() if not b.is_validated()] return [b for b in blobs.itervalues() if not b.is_validated()]
def blob_downloaded(self, blob, blob_num):
from twisted.internet import reactor
log.debug("The blob %s has been downloaded. Calling the finished callback", str(blob))
if self.finished is False:
self.finished = True
reactor.callLater(0, self.finished_callback, blob)
class DummyBlobHandler(object): class DummyBlobHandler(object):
def __init__(self): def __init__(self):

7
lbrynet/core/utils.py
View file

@ -49,6 +49,13 @@ def call_later(delay, func, *args, **kwargs):
from twisted.internet import reactor from twisted.internet import reactor
return reactor.callLater(delay, func, *args, **kwargs) return reactor.callLater(delay, func, *args, **kwargs)
def safe_start_looping_call(looping_call, interval_sec):
if not looping_call.running:
looping_call.start(interval_sec)
def safe_stop_looping_call(looping_call):
if looping_call.running:
looping_call.stop()
def generate_id(num=None): def generate_id(num=None):
h = get_lbry_hash_obj() h = get_lbry_hash_obj()