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

Merge branch 'fix-blob-list-keyerror'

Browse source
This commit is contained in:
Jack Robison 2018-06-29 11:49:06 -04:00
parent accf161355 e0ceaba655
commit 8a0d0b44dd
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -13,8 +13,8 @@ at anytime.
* *
### Fixed ### Fixed
* Fixed a scenario where stopping downloads raises `NoneType object has no attribute finished_deferred`. * `blob_list` raising an error when blobs in a stream haven't yet been created
* * stopping a download from raising `NoneType object has no attribute finished_deferred`
### Deprecated ### Deprecated
* *

6
lbrynet/daemon/Daemon.py
View file

@ -3034,8 +3034,10 @@ class Daemon(AuthJSONRPCServer):
sd_hash = yield self.session.storage.get_sd_blob_hash_for_stream(stream_hash) sd_hash = yield self.session.storage.get_sd_blob_hash_for_stream(stream_hash)
if stream_hash: if stream_hash:
crypt_blobs = yield self.session.storage.get_blobs_for_stream(stream_hash) crypt_blobs = yield self.session.storage.get_blobs_for_stream(stream_hash)
blobs = [self.session.blob_manager.blobs[crypt_blob.blob_hash] for crypt_blob in crypt_blobs blobs = yield defer.gatherResults([
if crypt_blob.blob_hash is not None] self.session.blob_manager.get_blob(crypt_blob.blob_hash, crypt_blob.length)
for crypt_blob in crypt_blobs if crypt_blob.blob_hash is not None
])
else: else:
blobs = [] blobs = []
# get_blobs_for_stream does not include the sd blob, so we'll add it manually # get_blobs_for_stream does not include the sd blob, so we'll add it manually