diff --git a/CHANGELOG.md b/CHANGELOG.md index 3362a43d8..ca7ad5e00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,13 +27,14 @@ at anytime. * Check claim schema in `publish` before trying to make the claim, return better error messages * Renamed `channel_list_mine` to `channel_list` * Changed `channel_list` to include channels where the certificate info has been imported but the claim is not in the wallet - * Changed file objects returned by `file_list` and `get` to no longer contain `name`, `claim_id`, or `metadata` + * Changed file objects returned by `file_list` and `get` to no longer contain `name`, `claim_id`, `message`, or `metadata` * Increased assumption for time it takes to announce single hash from 1 second to 5 seconds * Don't set HTTP error codes for failed api requests, conform to http://www.jsonrpc.org/specification#error_object * Return less verbose tracebacks for api requests resulting in errors * Don't include file names when logging information about streams, only include sd hashes ### Added + * Added `status`, `blobs_completed`, and `blobs_in_stream` fields to file objects returned by `file_list` and `get` * Added `channel_import` and `channel_export` commands * Added `is_mine` field to `channel_list` results * Added `claim_renew` command diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py index 3da3a993a..52d2c0498 100644 --- a/lbrynet/daemon/Daemon.py +++ b/lbrynet/daemon/Daemon.py @@ -867,13 +867,14 @@ class Daemon(AuthJSONRPCServer): else: written_bytes = 0 - size = message = outpoint = None + size = outpoint = num_completed = num_known = status = None if full_status: size = yield lbry_file.get_total_bytes() file_status = yield lbry_file.status() - message = STREAM_STAGES[2][1] % (file_status.name, file_status.num_completed, - file_status.num_known, file_status.running_status) + num_completed = file_status.num_completed + num_known = file_status.num_known + status = file_status.running_status outpoint = yield self.stream_info_manager.get_file_outpoint(lbry_file.rowid) result = { @@ -891,7 +892,9 @@ class Daemon(AuthJSONRPCServer): 'key': key, 'total_bytes': size, 'written_bytes': written_bytes, - 'message': message, + 'blobs_completed': num_completed, + 'blobs_in_stream': num_known, + 'status': status, 'outpoint': outpoint } defer.returnValue(result) @@ -1290,7 +1293,9 @@ class Daemon(AuthJSONRPCServer): 'key': (str) key attached to file, 'total_bytes': (int) file size in bytes, None if full_status is false, 'written_bytes': (int) written size in bytes, - 'message': (str), status message, None if full_status is false + 'blobs_completed': (int) num_completed, None if full_status is false, + 'blobs_in_stream': (int) None if full_status is false, + 'status': (str) downloader status, None if full_status is false, 'outpoint': (str), None if full_status is false or if claim is not found }, ] @@ -1491,8 +1496,10 @@ class Daemon(AuthJSONRPCServer): 'key': (str) key attached to file, 'total_bytes': (int) file size in bytes, None if full_status is false, 'written_bytes': (int) written size in bytes, - 'message': (str) status message, - 'outpoint': (str) claim outpoint + 'blobs_completed': (int) num_completed, None if full_status is false, + 'blobs_in_stream': (int) None if full_status is false, + 'status': (str) downloader status, None if full_status is false, + 'outpoint': (str), None if full_status is false or if claim is not found } """