From 6532632da3d43e35caabbfb3d925d6a2d8e65fd2 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Wed, 1 Jan 2020 21:04:32 +0100 Subject: [PATCH] netbank: Allow some fuzzy account-id matching. --- netbank | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/netbank b/netbank index 7129276..4215a3c 100755 --- a/netbank +++ b/netbank @@ -1,19 +1,39 @@ #!/usr/bin/python3 -import sys, os, getopt, pwd +import sys, os, getopt, pwd, operator from fulbank import auth sesstype = None sess = None -def find(seq, *, item=None, match=None, key=None, default=LookupError): +def pfxmatch(pfx, item): + return str(item)[:len(pfx)] == pfx + +class ambiguous(LookupError): + def __init__(self, a, b): + super().__init__("ambigous match: %s and %s" % (a, b)) + self.a = a + self.b = b + +def find(seq, *, item=None, test=None, match=None, key=None, default=LookupError): if key is None: key = lambda o: o if match is None and item is not None: - match = lambda o: o == item + match = lambda o: test(item, o) + if test is None: + test = operator.eq + found = None for thing in seq: if match(key(thing)): - return thing + if found is None: + found = thing + else: + if default is LookupError: + raise ambiguous(key(found), key(thing)) + else: + return default + if found is not None: + return found if default is LookupError: raise LookupError() else: @@ -79,7 +99,10 @@ def cmd_lstxn(cmd, args): sys.stderr.write("usage: lstxn [-n NUM] ACCOUNT\n") sys.exit(1) try: - acct = find(sess.accounts, item=args[0], key=lambda acct: acct.number) + acct = find(sess.accounts, item=args[0], key=lambda acct: acct.number, test=pfxmatch) + except ambiguous as exc: + sys.stderr.write("netbank: %s: ambiguous match between %s and %s\n" % (args[0], exc.a, exc.b)) + sys.exit(1) except LookupError: sys.stderr.write("netbank: %s: no such account\n" % (args[0])) sys.exit(1) -- 2.11.0