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

re-add outpoint to file dictionary returned from file_ commands

Browse source
This commit is contained in:
Jack Robison 2017-12-06 17:22:47 -05:00
parent 1594c6a831
commit 90aa89dcae
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
2 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbrynet/core/Wallet.py
View file

@ -756,8 +756,6 @@ class Wallet(object):
defer.returnValue(claim) defer.returnValue(claim)
@defer.inlineCallbacks @defer.inlineCallbacks
def _handle_claim_result(self, results, update_caches=True): def _handle_claim_result(self, results, update_caches=True):
if not results: if not results:

55
lbrynet/daemon/Daemon.py
View file

@ -890,15 +890,17 @@ class Daemon(AuthJSONRPCServer):
else: else:
written_bytes = 0 written_bytes = 0
size = message = outpoint = None
if full_status: if full_status:
size = yield lbry_file.get_total_bytes() size = yield lbry_file.get_total_bytes()
file_status = yield lbry_file.status() file_status = yield lbry_file.status()
message = STREAM_STAGES[2][1] % (file_status.name, file_status.num_completed, message = STREAM_STAGES[2][1] % (file_status.name, file_status.num_completed,
file_status.num_known, file_status.running_status) file_status.num_known, file_status.running_status)
else: info = yield self.session.wallet.get_claim_metadata_for_sd_hash(lbry_file.sd_hash)
size = None if info:
message = None name, txid, nout = info
outpoint = "%s:%i" % (txid, nout)
result = { result = {
'completed': lbry_file.completed, 'completed': lbry_file.completed,
@ -916,6 +918,7 @@ class Daemon(AuthJSONRPCServer):
'total_bytes': size, 'total_bytes': size,
'written_bytes': written_bytes, 'written_bytes': written_bytes,
'message': message, 'message': message,
'outpoint': outpoint
} }
defer.returnValue(result) defer.returnValue(result)
@ -1311,9 +1314,10 @@ class Daemon(AuthJSONRPCServer):
'download_path': (str) download path of file, 'download_path': (str) download path of file,
'mime_type': (str) mime type of file, 'mime_type': (str) mime type of file,
'key': (str) key attached to file, 'key': (str) key attached to file,
'total_bytes': (int) file size in bytes, None if full_status is false 'total_bytes': (int) file size in bytes, None if full_status is false,
'written_bytes': (int) written size in bytes 'written_bytes': (int) written size in bytes,
'message': (str), None if full_status is false 'message': (str), status message, None if full_status is false
'outpoint': (str), None if full_status is false or if claim is not found
}, },
] ]
""" """
@ -1499,25 +1503,22 @@ class Daemon(AuthJSONRPCServer):
Returns: Returns:
(dict) Dictionary containing information about the stream (dict) Dictionary containing information about the stream
{ {
'completed': (bool) true if download is completed, 'completed': (bool) true if download is completed,
'file_name': (str) name of file, 'file_name': (str) name of file,
'download_directory': (str) download directory, 'download_directory': (str) download directory,
'points_paid': (float) credit paid to download file, 'points_paid': (float) credit paid to download file,
'stopped': (bool) true if download is stopped, 'stopped': (bool) true if download is stopped,
'stream_hash': (str) stream hash of file, 'stream_hash': (str) stream hash of file,
'stream_name': (str) stream name, 'stream_name': (str) stream name ,
'suggested_file_name': (str) suggested file name, 'suggested_file_name': (str) suggested file name,
'sd_hash': (str) sd hash of file, 'sd_hash': (str) sd hash of file,
'name': (str) name claim attached to file 'download_path': (str) download path of file,
'outpoint': (str) claim outpoint attached to file 'mime_type': (str) mime type of file,
'claim_id': (str) claim ID attached to file, 'key': (str) key attached to file,
'download_path': (str) download path of file, 'total_bytes': (int) file size in bytes, None if full_status is false,
'mime_type': (str) mime type of file, 'written_bytes': (int) written size in bytes,
'key': (str) key attached to file, 'message': (str) status message,
'total_bytes': (int) file size in bytes, None if full_status is false 'outpoint': (str) claim outpoint
'written_bytes': (int) written size in bytes
'message': (str), None if full_status is false
'metadata': (dict) Metadata dictionary
} }
""" """
@ -1668,7 +1669,7 @@ class Daemon(AuthJSONRPCServer):
Returns: Returns:
(float) Estimated cost in lbry credits, returns None if uri is not (float) Estimated cost in lbry credits, returns None if uri is not
resolveable resolvable
""" """
cost = yield self.get_est_cost(uri, size) cost = yield self.get_est_cost(uri, size)
defer.returnValue(cost) defer.returnValue(cost)