Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Merge pull request #120 from lbryio/defer-later

Browse source 
replace callLater with deferLater
This commit is contained in:
Job Evers‐Meltzer 2016-08-16 12:36:43 -05:00 • committed by GitHub
commit 96f3390407
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -18,7 +18,7 @@ from appdirs import user_data_dir
from datetime import datetime from datetime import datetime
from decimal import Decimal from decimal import Decimal
from twisted.web import server from twisted.web import server
from twisted.internet import defer, threads, error, reactor from twisted.internet import defer, threads, error, reactor, task
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
from txjsonrpc import jsonrpclib from txjsonrpc import jsonrpclib
from txjsonrpc.web import jsonrpc from txjsonrpc.web import jsonrpc
@ -2412,8 +2412,10 @@ class _DownloadNameHelper(object):
def wait_or_get_stream(self, args): def wait_or_get_stream(self, args):
stream_info, lbry_file = args stream_info, lbry_file = args
if lbry_file: if lbry_file:
log.debug('Wait on lbry_file')
return self._wait_on_lbry_file(lbry_file) return self._wait_on_lbry_file(lbry_file)
else: else:
log.debug('No lbry_file, need to get stream')
return self._get_stream(stream_info) return self._get_stream(stream_info)
def _get_stream(self, stream_info): def _get_stream(self, stream_info):
@ -2440,9 +2442,7 @@ class _DownloadNameHelper(object):
written_bytes = self.get_written_bytes(f.file_name) written_bytes = self.get_written_bytes(f.file_name)
if written_bytes: if written_bytes:
return defer.succeed(self._disp_file(f)) return defer.succeed(self._disp_file(f))
d = defer.succeed(None) return task.deferLater(reactor, 1, self._wait_on_lbry_file, f)
d.addCallback(lambda _: reactor.callLater(1, self._wait_on_lbry_file, f))
return d
def get_written_bytes(self, file_name): def get_written_bytes(self, file_name):
"""Returns the number of bytes written to `file_name`. """Returns the number of bytes written to `file_name`.
@ -2523,4 +2523,3 @@ class _ResolveNameHelper(object):
def is_cached_name_expired(self): def is_cached_name_expired(self):
time_in_cache = self.now() - self.name_data['timestamp'] time_in_cache = self.now() - self.name_data['timestamp']
return time_in_cache >= self.daemon.cache_time return time_in_cache >= self.daemon.cache_time