xmrwallet.ops.wallet: support returning data from main()

This commit is contained in:
The MMGen Project 2025-11-22 09:04:08 +00:00
commit d5e142d475
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 5 additions and 4 deletions

View file

@ -29,6 +29,7 @@ class OpBase:
trust_monerod = False trust_monerod = False
do_umount = True do_umount = True
name = None name = None
return_data = False
def __init__(self, cfg, uarg_tuple): def __init__(self, cfg, uarg_tuple):

View file

@ -207,7 +207,7 @@ class OpWallet(OpBase):
b = len(self.addr_data), b = len(self.addr_data),
c = self.add_wallet_desc, c = self.add_wallet_desc,
d = suf(self.addr_data))) d = suf(self.addr_data)))
processed = 0 data = []
for n, d in enumerate(self.addr_data): # [d.sec,d.addr,d.wallet_passwd,d.viewkey] for n, d in enumerate(self.addr_data): # [d.sec,d.addr,d.wallet_passwd,d.viewkey]
fn = self.get_wallet_fn(d) fn = self.get_wallet_fn(d)
gmsg('\n{a}ing wallet {b}/{c} ({d})'.format( gmsg('\n{a}ing wallet {b}/{c} ({d})'.format(
@ -215,9 +215,9 @@ class OpWallet(OpBase):
b = n + 1, b = n + 1,
c = len(self.addr_data), c = len(self.addr_data),
d = fn.name)) d = fn.name))
processed += await self.process_wallet(d, fn, last=n==len(self.addr_data)-1) data.append(await self.process_wallet(d, fn, last=n == len(self.addr_data) - 1))
gmsg(f'\n{processed} wallet{suf(processed)} {self.stem}ed\n') gmsg(f'\n{len(data)} wallet{suf(len(data))} {self.stem}ed\n')
return processed return data if self.return_data else sum(map(bool, data))
def head_msg(self, wallet_idx, fn): def head_msg(self, wallet_idx, fn):
gmsg('\n{a} {b}wallet #{c} ({d})'.format( gmsg('\n{a} {b}wallet #{c} ({d})'.format(