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

fix get()

Browse source 
-get_file_by_sd_hash raises NoSuchSDHash if there is no file, which
otherwise doesn’t get trapped

-remove unnecessary try/except around _DownloadNameHelper.__init__

-don’t delete self.waiting_on[name]
This commit is contained in:
Jack Robison 2017-02-19 19:17:25 -05:00
parent 76b4b1e939
commit c6e614ebec
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -820,17 +820,13 @@ class Daemon(AuthJSONRPCServer):
""" """
timeout = timeout if timeout is not None else conf.settings['download_timeout'] timeout = timeout if timeout is not None else conf.settings['download_timeout']
try:
helper = _DownloadNameHelper(self, name, timeout, download_directory, file_name, helper = _DownloadNameHelper(self, name, timeout, download_directory, file_name,
wait_for_write) wait_for_write)
except Exception as err:
log.exception(err)
raise err
if not stream_info: if not stream_info:
self.waiting_on[name] = True self.waiting_on[name] = True
stream_info = yield self._resolve_name(name) stream_info = yield self._resolve_name(name)
del self.waiting_on[name]
lbry_file = yield helper.setup_stream(stream_info) lbry_file = yield helper.setup_stream(stream_info)
sd_hash, file_path = yield helper.wait_or_get_stream(stream_info, lbry_file) sd_hash, file_path = yield helper.wait_or_get_stream(stream_info, lbry_file)
defer.returnValue((sd_hash, file_path)) defer.returnValue((sd_hash, file_path))
@ -2562,10 +2558,7 @@ def get_version_from_tag(tag):
def get_sd_hash(stream_info): def get_sd_hash(stream_info):
if not stream_info: if not stream_info:
return None return None
try:
return stream_info['sources']['lbry_sd_hash'] return stream_info['sources']['lbry_sd_hash']
except KeyError:
return stream_info.get('stream_hash')
class _DownloadNameHelper(object): class _DownloadNameHelper(object):
@ -2584,7 +2577,7 @@ class _DownloadNameHelper(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def setup_stream(self, stream_info): def setup_stream(self, stream_info):
sd_hash = get_sd_hash(stream_info) sd_hash = get_sd_hash(stream_info)
lbry_file = yield self.daemon._get_lbry_file_by_sd_hash(sd_hash) lbry_file = yield self.daemon._get_lbry_file(FileID.SD_HASH, sd_hash)
if self._does_lbry_file_exists(lbry_file): if self._does_lbry_file_exists(lbry_file):
defer.returnValue(lbry_file) defer.returnValue(lbry_file)
else: else: