From b9257004dd2fb8abec90e35a4d36c0d8f96beecc Mon Sep 17 00:00:00 2001 From: hackrush Date: Tue, 25 Jul 2017 00:53:23 +0530 Subject: [PATCH 1/2] Resolving a channel returns 'channel_claim_count' Since I couldn't get my lbryum server up for testing this, it is a dry fix based on the review. Goes with lbryio/lbryum#138 --- CHANGELOG.md | 1 + docs/cli.md | 2 +- lbrynet/daemon/Daemon.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d7a47888..15ec4614a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ at anytime. * Linux default downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR` * Linux folders moved from the home directory to `~/.local/share/lbry` * Windows folders moved from `%AppData%/Roaming` to `%AppData%/Local/lbry` + * Changed `claim_list_by_channel` to return the `claims_in_channel` count instead of the `claims_in_channel_pages` count ### Added * Add link to instructions on how to change the default peer port diff --git a/docs/cli.md b/docs/cli.md index a838c683d..29ff1a626 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -191,7 +191,7 @@ Returns: If there was an error: 'error': (str) error message - 'claims_in_channel_pages': total number of pages with results, + 'claims_in_channel': the total number of results for the channel, If a page of results was requested: 'returned_page': page number returned, diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py index 96f3968fe..7b1d0b964 100644 --- a/lbrynet/daemon/Daemon.py +++ b/lbrynet/daemon/Daemon.py @@ -2019,7 +2019,7 @@ class Daemon(AuthJSONRPCServer): If there was an error: 'error': (str) error message - 'claims_in_channel_pages': total number of pages with results, + 'claims_in_channel': the total number of results for the channel, If a page of results was requested: 'returned_page': page number returned, @@ -2077,7 +2077,7 @@ class Daemon(AuthJSONRPCServer): results[u] = resolved[u] else: results[u] = { - 'claims_in_channel_pages': resolved[u]['claims_in_channel_pages'] + 'claims_in_channel': resolved[u]['claims_in_channel'] } if page: results[u]['returned_page'] = page From c3a16ad837f05c868168d3ec9cb31c1863df4433 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Thu, 27 Jul 2017 09:53:11 -0400 Subject: [PATCH 2/2] Bump version 0.14.2 --> 0.14.3rc1 Signed-off-by: Jack Robison --- lbrynet/__init__.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index 8c9c80197..072f0ee2c 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,6 +1,6 @@ import logging -__version__ = "0.14.2" +__version__ = "0.14.3rc1" version = tuple(__version__.split('.')) logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/requirements.txt b/requirements.txt index c63ea8492..e55f3fcbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ jsonrpc==1.2 jsonrpclib==0.1.7 jsonschema==2.5.1 git+https://github.com/lbryio/lbryschema.git@v0.0.9#egg=lbryschema -git+https://github.com/lbryio/lbryum.git@v3.1.4#egg=lbryum +git+https://github.com/lbryio/lbryum.git@v3.1.5rc1#egg=lbryum miniupnpc==1.9 pbkdf2==1.3 pycrypto==2.6.1 diff --git a/setup.py b/setup.py index 9e20b8d6b..94cdd8f07 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ requires = [ 'envparse', 'jsonrpc', 'jsonschema', - 'lbryum==3.1.4', + 'lbryum==3.1.5rc1', 'lbryschema==0.0.9', 'miniupnpc', 'pycrypto',