fix blob_list
raising an error when blobs in a stream haven't yet been created
This commit is contained in:
parent
a1f3fc9f3c
commit
e0ceaba655
2 changed files with 6 additions and 4 deletions
|
@ -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
|
||||||
*
|
*
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue