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

Bug fix: correct the check on wait_or_get_stream

Browse source 
I reversed the check on lbry_file. Compare to the original code:
e67f55bd74/lbrynet/lbrynet_daemon/LBRYDaemon.py (L1119)
This commit is contained in:
Job Evers 2016-07-21 11:05:06 -05:00
parent 84dd5c0eca
commit b989d4f6be
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -1713,8 +1713,8 @@ class LBRYDaemon(jsonrpc.JSONRPC):
# can spec what parameters it expects and how to set default values # can spec what parameters it expects and how to set default values
timeout = p.get('timeout', self.download_timeout) timeout = p.get('timeout', self.download_timeout)
download_directory = p.get('download_directory', self.download_directory) download_directory = p.get('download_directory', self.download_directory)
file_name = p.get('file_name', None) file_name = p.get('file_name')
stream_info = p.get('stream_info', None) stream_info = p.get('stream_info')
sd_hash = get_sd_hash(stream_info) sd_hash = get_sd_hash(stream_info)
wait_for_write = p.get('wait_for_write', True) wait_for_write = p.get('wait_for_write', True)
name = p.get('name') name = p.get('name')
@ -1747,14 +1747,13 @@ class LBRYDaemon(jsonrpc.JSONRPC):
return server.failure return server.failure
if params.name in self.waiting_on: if params.name in self.waiting_on:
return server.failure return server.failure
d = self._download_name(name=params.name, d = self._download_name(name=params.name,
timeout=params.timeout, timeout=params.timeout,
download_directory=params.download_directory, download_directory=params.download_directory,
stream_info=params.stream_info, stream_info=params.stream_info,
file_name=params.file_name, file_name=params.file_name,
wait_for_write=params.wait_for_write) wait_for_write=params.wait_for_write)
# d.addCallback(get_output_callback(params)) d.addCallback(get_output_callback(params))
d.addCallback(lambda message: self._render_response(message, OK_CODE)) d.addCallback(lambda message: self._render_response(message, OK_CODE))
return d return d
@ -2400,13 +2399,13 @@ class _DownloadNameHelper(object):
return defer.succeed((stream_info, l)) return defer.succeed((stream_info, l))
return defer.succeed((stream_info, None)) return defer.succeed((stream_info, None))
return add_results return add_results
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:
return self._get_stream(stream_info)
else:
return self._wait_on_lbry_file(lbry_file) return self._wait_on_lbry_file(lbry_file)
else:
return self._get_stream(stream_info)
def _get_stream(self, stream_info): def _get_stream(self, stream_info):
d = self.daemon.add_stream( d = self.daemon.add_stream(
@ -2425,16 +2424,13 @@ class _DownloadNameHelper(object):
return d return d
def _wait_on_lbry_file(self, f): def _wait_on_lbry_file(self, f):
if f is not None: 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) d = defer.succeed(None)
d.addCallback(lambda _: reactor.callLater(1, self._wait_on_lbry_file, f)) d.addCallback(lambda _: reactor.callLater(1, self._wait_on_lbry_file, f))
return d return d
def get_written_bytes(self, file_name): def get_written_bytes(self, file_name):
try: try:
file_path = os.path.join(self.download_directory, file_name) file_path = os.path.join(self.download_directory, file_name)
@ -2451,7 +2447,7 @@ class _DownloadNameHelper(object):
def _disp_file(self, f): def _disp_file(self, f):
file_path = os.path.join(self.download_directory, f.file_name) file_path = os.path.join(self.download_directory, f.file_name)
log.info("[%s] Already downloaded: %s --> %s", datetime.now(), f.sd_hash, file_path) log.info("Already downloaded: %s --> %s", f.sd_hash, file_path)
return f return f
def _remove_from_wait(self, r): def _remove_from_wait(self, r):