mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

util.py: improve bytespec-parsing algorithm

Browse source
This commit is contained in:
The MMGen Project 2019-02-19 11:20:17 +00:00
commit a2386744e6
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mmgen/seed.py
View file

@ -1022,7 +1022,7 @@ harder to find, you're advised to choose a much larger file size than this.
min_fsize = d.target_data_len + d.hincog_offset
msg(self.msg['choose_file_size'].format(min_fsize))
while True:
fsize = parse_nbytes(my_raw_input('Enter file size: '))
fsize = parse_bytespec(my_raw_input('Enter file size: '))
if fsize >= min_fsize: break
msg('File size must be an integer no less than {}'.format(min_fsize))

4
mmgen/tool.py
View file

@ -476,7 +476,7 @@ class MMGenToolCmd(object):
return True
def rand2file(self,outfile,nbytes,threads=4,silent=False):
nbytes = parse_nbytes(nbytes)
nbytes = parse_bytespec(nbytes)
from Crypto import Random
rh = Random.new()
from queue import Queue
@ -534,7 +534,7 @@ class MMGenToolCmd(object):
return True
def bytespec(self,s):
return str(parse_nbytes(s))
return str(parse_bytespec(s))
def keyaddrlist2monerowallets(self,infile,blockheight=None,addrs=None):
return self.monero_wallet_ops(infile=infile,op='create',blockheight=blockheight,addrs=addrs)

22
mmgen/util.py
View file

@ -101,18 +101,30 @@ def set_for_type(val,refval,desc,invert_bool=False,src=None):
# c=1, w=2, b=512, kB=1000, K=1024, MB=1000*1000, M=1024*1024,
# GB=1000*1000*1000, G=1024*1024*1024, and so on for T, P, E, Z, Y.
def parse_nbytes(nbytes):
def parse_bytespec(nbytes):
smap = (('c', 1),
('w', 2),
('b', 512),
('kB', 1000),
('K', 1024),
('MB', 1000*1000),
('M', 1024*1024),
('GB', 1000*1000*1000),
('G', 1024*1024*1024),
('TB', 1000*1000*1000*1000),
('T', 1024*1024*1024*1024))
import re
m = re.match(r'([0123456789]+)(.*)',nbytes)
smap = ('c',1),('w',2),('b',512),('kB',1000),('K',1024),('MB',1000*1000),\
('M',1024*1024),('GB',1000*1000*1000),('G',1024*1024*1024)
m = re.match(r'([0123456789.]+)(.*)',nbytes)
if m:
if m.group(2):
for k,v in smap:
if k == m.group(2):
return int(m.group(1)) * v
from decimal import Decimal
return int(Decimal(m.group(1)) * v)
else:
msg("Valid byte specifiers: '{}'".format("' '".join([i[0] for i in smap])))
elif '.' in nbytes:
raise ValueError('fractional bytes not allowed')
else:
return int(nbytes)