text mode improvements
This commit is contained in:
parent
f56622137e
commit
db26c12335
|
@ -625,7 +625,7 @@ if __name__ == '__main__':
|
||||||
except:
|
except:
|
||||||
cmd = "gui"
|
cmd = "gui"
|
||||||
|
|
||||||
known_commands = ['balance', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses', 'gentx']
|
known_commands = ['balance', 'contacts', 'send', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses', 'gentx']
|
||||||
if cmd not in known_commands:
|
if cmd not in known_commands:
|
||||||
print "Known commands:", ', '.join(known_commands)
|
print "Known commands:", ', '.join(known_commands)
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
@ -683,6 +683,17 @@ if __name__ == '__main__':
|
||||||
wallet.update()
|
wallet.update()
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
||||||
|
# check syntax
|
||||||
|
if cmd in ['sendtoaddress', 'sendto', 'gentx']:
|
||||||
|
try:
|
||||||
|
to_address = sys.argv[2]
|
||||||
|
amount = float(sys.argv[3])
|
||||||
|
label = ' '.join(sys.argv[4:])
|
||||||
|
except:
|
||||||
|
print "syntax: send <recipient> <amount> [label]"
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
# password
|
||||||
if cmd in ['sendtoaddress', 'password', 'getnewaddress','gentx']:
|
if cmd in ['sendtoaddress', 'password', 'getnewaddress','gentx']:
|
||||||
password = getpass.getpass('Password:') if wallet.use_encryption else None
|
password = getpass.getpass('Password:') if wallet.use_encryption else None
|
||||||
|
|
||||||
|
@ -693,6 +704,10 @@ if __name__ == '__main__':
|
||||||
else:
|
else:
|
||||||
print c*1e-8
|
print c*1e-8
|
||||||
|
|
||||||
|
elif cmd in [ 'contacts', 'addressbook']:
|
||||||
|
for addr in wallet.addressbook:
|
||||||
|
print addr, " ", wallet.labels.get(addr)
|
||||||
|
|
||||||
elif cmd in [ 'addresses', 'all_addresses']:
|
elif cmd in [ 'addresses', 'all_addresses']:
|
||||||
for addr in wallet.addresses:
|
for addr in wallet.addresses:
|
||||||
if cmd == 'all_addresses' or not wallet.is_change(addr):
|
if cmd == 'all_addresses' or not wallet.is_change(addr):
|
||||||
|
@ -736,13 +751,11 @@ if __name__ == '__main__':
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
||||||
elif cmd in ['sendtoaddress', 'gentx']:
|
elif cmd in ['sendtoaddress', 'gentx']:
|
||||||
try:
|
for k, v in wallet.labels.items():
|
||||||
to_address = sys.argv[2]
|
if v == to_address:
|
||||||
amount = float(sys.argv[3])
|
to_address = k
|
||||||
label = ' '.join(sys.argv[4:])
|
break
|
||||||
except:
|
print "alias", to_address
|
||||||
print "syntax: send <recipient> <amount> [label]"
|
|
||||||
sys.exit(1)
|
|
||||||
r, h = wallet.send( to_address, amount, label, password, cmd=='sendtoaddress' )
|
r, h = wallet.send( to_address, amount, label, password, cmd=='sendtoaddress' )
|
||||||
print h
|
print h
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue