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

better loading message

Browse source
This commit is contained in:
Jack 2016-05-05 22:26:25 -04:00
parent b017b63745
commit e32853744a
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -90,7 +90,7 @@ DOWNLOAD_STOPPED_CODE = 'stopped'
STREAM_STAGES = [ STREAM_STAGES = [
(INITIALIZING_CODE, 'Initializing...'), (INITIALIZING_CODE, 'Initializing...'),
(DOWNLOAD_METADATA_CODE, 'Downloading metadata'), (DOWNLOAD_METADATA_CODE, 'Downloading metadata'),
(DOWNLOAD_RUNNING_CODE, 'Started stream'), (DOWNLOAD_RUNNING_CODE, 'Started %s, got %s/%s blobs, stream status: %s'),
(DOWNLOAD_STOPPED_CODE, 'Paused stream'), (DOWNLOAD_STOPPED_CODE, 'Paused stream'),
(DOWNLOAD_TIMEOUT_CODE, 'Stream timed out') (DOWNLOAD_TIMEOUT_CODE, 'Stream timed out')
] ]
@ -1061,6 +1061,10 @@ class LBRYDaemon(jsonrpc.JSONRPC):
return f return f
def _get_json_for_return(f): def _get_json_for_return(f):
def _get_file_status(file_status):
message = STREAM_STAGES[2][1] % (file_status.name, file_status.num_completed, file_status.num_known, file_status.running_status)
return defer.succeed(message)
def _generate_reply(size): def _generate_reply(size):
if f.key: if f.key:
key = binascii.b2a_hex(f.key) key = binascii.b2a_hex(f.key)
@ -1088,12 +1092,26 @@ class LBRYDaemon(jsonrpc.JSONRPC):
else: else:
status = [False, False] status = [False, False]
t = {'completed': f.completed, 'file_name': f.file_name, 'key': key, if status[0] == DOWNLOAD_RUNNING_CODE:
'points_paid': f.points_paid, 'stopped': f.stopped, 'stream_hash': f.stream_hash, d = f.status()
'stream_name': f.stream_name, 'suggested_file_name': f.suggested_file_name, d.addCallback(_get_file_status)
'upload_allowed': f.upload_allowed, 'sd_hash': f.sd_hash, 'total_bytes': size, d.addCallback(lambda message: {'completed': f.completed, 'file_name': f.file_name, 'key': key,
'written_bytes': written_bytes, 'code': status[0], 'message': status[1]} 'points_paid': f.points_paid, 'stopped': f.stopped,
return t 'stream_hash': f.stream_hash,
'stream_name': f.stream_name,
'suggested_file_name': f.suggested_file_name,
'upload_allowed': f.upload_allowed, 'sd_hash': f.sd_hash,
'total_bytes': size,
'written_bytes': written_bytes, 'code': status[0],
'message': message})
else:
d = defer.succeed({'completed': f.completed, 'file_name': f.file_name, 'key': key,
'points_paid': f.points_paid, 'stopped': f.stopped, 'stream_hash': f.stream_hash,
'stream_name': f.stream_name, 'suggested_file_name': f.suggested_file_name,
'upload_allowed': f.upload_allowed, 'sd_hash': f.sd_hash, 'total_bytes': size,
'written_bytes': written_bytes, 'code': status[0], 'message': status[1]})
return d
if f: if f:
d = f.get_total_bytes() d = f.get_total_bytes()