From 44833803523bae532017e3696b8735ac5a771672 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 18 Feb 2019 12:12:14 -0500 Subject: [PATCH 1/2] fix terminator blob hash (None) being included when running blob_list for an sd hash --- lbrynet/extras/daemon/Daemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py index 181214e95..0b02ee431 100644 --- a/lbrynet/extras/daemon/Daemon.py +++ b/lbrynet/extras/daemon/Daemon.py @@ -2718,7 +2718,7 @@ class Daemon(metaclass=JSONRPCServerType): else: blobs = [] if stream_hash: - blobs.extend([b.blob_hash for b in await self.storage.get_blobs_for_stream(stream_hash)]) + blobs.extend([b.blob_hash for b in (await self.storage.get_blobs_for_stream(stream_hash))[:-1]]) else: blobs = list(self.blob_manager.completed_blob_hashes) if needed: From 3f7e466c976e41862a14b33259a734ff7dd1b9da Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 18 Feb 2019 12:14:21 -0500 Subject: [PATCH 2/2] return failure message for invalid blob hash in blob_delete --- lbrynet/extras/daemon/Daemon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py index 0b02ee431..6bb5b8fb4 100644 --- a/lbrynet/extras/daemon/Daemon.py +++ b/lbrynet/extras/daemon/Daemon.py @@ -2588,7 +2588,8 @@ class Daemon(metaclass=JSONRPCServerType): Returns: (str) Success/fail message """ - + if not blob_hash or not is_valid_blobhash(blob_hash): + return f"Invalid blob hash to delete '{blob_hash}'" streams = self.stream_manager.get_filtered_streams(sd_hash=blob_hash) if streams: await self.stream_manager.delete_stream(streams[0])