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

Merge branch 'master' into hackrush_max_key

Browse source
This commit is contained in:
Jack Robison 2017-07-27 09:53:47 -04:00
commit 93135f847b
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -52,6 +52,7 @@ at anytime.
* Linux default downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR` * Linux default downloads folder changed from `~/Downloads` to `XDG_DOWNLOAD_DIR`
* Linux folders moved from the home directory to `~/.local/share/lbry` * Linux folders moved from the home directory to `~/.local/share/lbry`
* Windows folders moved from `%AppData%/Roaming` to `%AppData%/Local/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 ### Added
* Add link to instructions on how to change the default peer port * Add link to instructions on how to change the default peer port

2
docs/cli.md
View file

@ -191,7 +191,7 @@ Returns:
If there was an error: If there was an error:
'error': (str) error message 'error': (str) error message
'claims_in_channel_pages': total number of pages with <page_size> results, 'claims_in_channel': the total number of results for the channel,
If a page of results was requested: If a page of results was requested:
'returned_page': page number returned, 'returned_page': page number returned,

2
lbrynet/__init__.py
View file

@ -1,6 +1,6 @@
import logging import logging
__version__ = "0.14.2" __version__ = "0.14.3rc1"
version = tuple(__version__.split('.')) version = tuple(__version__.split('.'))
logging.getLogger(__name__).addHandler(logging.NullHandler()) logging.getLogger(__name__).addHandler(logging.NullHandler())

4
lbrynet/daemon/Daemon.py
View file

@ -2019,7 +2019,7 @@ class Daemon(AuthJSONRPCServer):
If there was an error: If there was an error:
'error': (str) error message 'error': (str) error message
'claims_in_channel_pages': total number of pages with <page_size> results, 'claims_in_channel': the total number of results for the channel,
If a page of results was requested: If a page of results was requested:
'returned_page': page number returned, 'returned_page': page number returned,
@ -2077,7 +2077,7 @@ class Daemon(AuthJSONRPCServer):
results[u] = resolved[u] results[u] = resolved[u]
else: else:
results[u] = { results[u] = {
'claims_in_channel_pages': resolved[u]['claims_in_channel_pages'] 'claims_in_channel': resolved[u]['claims_in_channel']
} }
if page: if page:
results[u]['returned_page'] = page results[u]['returned_page'] = page

2
requirements.txt
View file

@ -14,7 +14,7 @@ jsonrpc==1.2
jsonrpclib==0.1.7 jsonrpclib==0.1.7
jsonschema==2.5.1 jsonschema==2.5.1
git+https://github.com/lbryio/lbryschema.git@v0.0.9#egg=lbryschema 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 miniupnpc==1.9
pbkdf2==1.3 pbkdf2==1.3
pycrypto==2.6.1 pycrypto==2.6.1

2
setup.py
View file

@ -21,7 +21,7 @@ requires = [
'envparse', 'envparse',
'jsonrpc', 'jsonrpc',
'jsonschema', 'jsonschema',
'lbryum==3.1.4', 'lbryum==3.1.5rc1',
'lbryschema==0.0.9', 'lbryschema==0.0.9',
'miniupnpc', 'miniupnpc',
'pycrypto', 'pycrypto',