tmore json formatting - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f4ac4783698267de82788bd2675eed6fbd71550a
DIR parent e4dc3f37529073d24cb77373c9a82e2f332eab9d
HTML Author: thomasv <thomasv@gitorious>
Date: Wed, 27 Feb 2013 10:24:53 +0100
more json formatting
Diffstat:
M electrum | 8 +++++---
M lib/commands.py | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 15 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -486,10 +486,12 @@ if __name__ == '__main__':
else:
cmd_runner = Commands(wallet, interface)
func = eval('cmd_runner.' + cmd)
- if password:
- cmd_runner.password = password
+ cmd_runner.password = password
result = func(*args[1:])
- util.print_json(result)
+ if type(result) == str:
+ util.print_msg(result)
+ else:
+ util.print_json(result)
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -235,31 +235,31 @@ class Commands:
def balance(self, addresses = []):
if addresses == []:
c, u = self.wallet.get_balance()
- if u:
- print_msg(Decimal( c ) / 100000000 , Decimal( u ) / 100000000)
- else:
- print_msg(Decimal( c ) / 100000000)
else:
+ c = u = 0
for addr in addresses:
- c, u = wallet.get_addr_balance(addr)
- if u:
- print_msg("%s %s, %s" % (addr, str(Decimal(c)/100000000), str(Decimal(u)/100000000)))
- else:
- print_msg("%s %s" % (addr, str(Decimal(c)/100000000)))
+ cc, uu = wallet.get_addr_balance(addr)
+ c += cc
+ u += uu
+
+ out = { "confirmed": str(Decimal(c)/100000000) }
+ if u: out["unconfirmed"] = str(Decimal(u)/100000000)
+ return out
def get_seed(self):
import mnemonic
seed = self.wallet.decode_seed(self.password)
- print_msg(seed + ' "' + ' '.join(mnemonic.mn_encode(seed)) + '"')
+ return { "hex":seed, "mnemonic": ' '.join(mnemonic.mn_encode(seed)) }
def importprivkey(self, sec):
try:
addr = wallet.import_key(sec,self.password)
wallet.save()
- print_msg("Keypair imported: ", addr)
+ out = "Keypair imported: ", addr
except BaseException as e:
- print_msg("Error: Keypair import failed: " + str(e))
+ out = "Error: Keypair import failed: " + str(e)
+ return out
def sign_message(self, address, message):