From 00a850500d30b788f5bbe4501baebd393c4b93ff Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 17 Sep 2021 01:15:12 -0300 Subject: [PATCH] empty stream name error for user input --- lbry/error/README.md | 1 + lbry/error/__init__.py | 6 ++++++ lbry/extras/daemon/daemon.py | 5 ++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lbry/error/README.md b/lbry/error/README.md index 4c70813d9..b59311b27 100644 --- a/lbry/error/README.md +++ b/lbry/error/README.md @@ -25,6 +25,7 @@ Message | User friendly error message explaining the exceptional event. Supports Code | Name | Message ---:|---|--- **1xx** | UserInput | User input errors. +111 | EmptyStreamName | Stream name cannot be blank. **10x** | Command | Errors preparing to execute commands. 101 | CommandDoesNotExist | Command '{command}' does not exist. 102 | CommandDeprecated | Command '{command}' is deprecated. diff --git a/lbry/error/__init__.py b/lbry/error/__init__.py index db56fbe06..a47057a51 100644 --- a/lbry/error/__init__.py +++ b/lbry/error/__init__.py @@ -7,6 +7,12 @@ class UserInputError(BaseError): """ +class EmptyStreamNameError(UserInputError): + + def __init__(self): + super().__init__("Stream name cannot be blank.") + + class CommandError(UserInputError): """ Errors preparing to execute commands. diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index d87b402c6..c16d8b0c2 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -38,7 +38,7 @@ from lbry.dht.peer import make_kademlia_peer from lbry.error import ( DownloadSDTimeoutError, ComponentsNotStartedError, ComponentStartConditionNotMetError, CommandDoesNotExistError, BaseError, WalletNotFoundError, WalletAlreadyLoadedError, WalletAlreadyExistsError, - ConflictingInputValueError, AlreadyPurchasedError, PrivateKeyNotFoundError + ConflictingInputValueError, AlreadyPurchasedError, PrivateKeyNotFoundError, EmptyStreamNameError ) from lbry.extras import system_info from lbry.extras.daemon import analytics @@ -5242,8 +5242,7 @@ class Daemon(metaclass=JSONRPCServerType): def valid_stream_name_or_error(name: str): try: if not name: - # TODO: use error from lbry.error - raise Exception('Stream name cannot be blank.') + raise EmptyStreamNameError() parsed = URL.parse(name) if parsed.has_channel: # TODO: use error from lbry.error