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

have claim_show no longer handle name argument, do not catch exceptions here as they will be caught in Wallet

Browse source
This commit is contained in:
Kay Kurokawa 2017-06-23 12:00:33 -04:00
parent 21c1786dc6
commit 24035406d6
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/core/Wallet.py
View file

@ -700,11 +700,11 @@ class Wallet(object):
else:
log.debug("Refreshing cached claim: %s", claim_id)
claim = yield self._get_claim_by_claimid(claim_id)
result = None
if claim:
try:
result = yield self._handle_claim_result(claim)
else:
log.warning("Claim does not exist: %s", claim_id)
except (UnknownNameError, UnknownClaimID, UnknownURI) as err:
result = {'error': err.message}
defer.returnValue(result)
@defer.inlineCallbacks

17
lbrynet/daemon/Daemon.py
View file

@ -44,7 +44,7 @@ from lbrynet.core.looping_call_manager import LoopingCallManager
from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
from lbrynet.core.Error import InsufficientFundsError, UnknownNameError, NoSuchSDHash
from lbrynet.core.Error import NoSuchStreamHash, UnknownClaimID, UnknownURI
from lbrynet.core.Error import NoSuchStreamHash
from lbrynet.core.Error import NullFundsError, NegativeFundsError
log = logging.getLogger(__name__)
@ -1315,12 +1315,12 @@ class Daemon(AuthJSONRPCServer):
defer.returnValue(metadata)
@defer.inlineCallbacks
def jsonrpc_claim_show(self, name=None, txid=None, nout=None, claim_id=None):
def jsonrpc_claim_show(self, txid=None, nout=None, claim_id=None):
"""
Resolve claim info from a LBRY name
Usage:
claim_show <name> [<txid> | --txid=<txid>] [<nout> | --nout=<nout>]
claim_show [<txid> | --txid=<txid>] [<nout> | --nout=<nout>]
[<claim_id> | --claim_id=<claim_id>]
Options:
@ -1342,19 +1342,14 @@ class Daemon(AuthJSONRPCServer):
'supports': (list) list of supports associated with claim
}
"""
try:
if claim_id:
if claim_id is not None and txid is None and nout is None:
claim_results = yield self.session.wallet.get_claim_by_claim_id(claim_id)
elif txid and nout is not None:
elif txid is not None and nout is not None and claim_id is None:
outpoint = ClaimOutpoint(txid, nout)
claim_results = yield self.session.wallet.get_claim_by_outpoint(outpoint)
else:
claim_results = yield self.session.wallet.resolve(name)
if claim_results:
claim_results = claim_results[name]
raise Exception("Must specify either txid/nout, or claim_id")
result = format_json_out_amount_as_float(claim_results)
except (TypeError, UnknownNameError, UnknownClaimID, UnknownURI):
result = False
response = yield self._render_response(result)
defer.returnValue(response)