netbank: Changed login syntax.

[fulbank.git] / netbank

diff --git a/netbank b/netbank
index a1520ca..7f52628 100755 (executable)
--- a/netbank
+++ b/netbank
@@ -1,44 +1,11 @@
 #!/usr/bin/python3
 
-import sys, os, getopt, pwd, operator
-from fulbank import auth, data
+import sys, os, getopt, pwd
+from fulbank import auth, data, util
 
 sessname = data.defaultsess()
 sess = None
 
-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: test(item, o)
-    if test is None:
-        test = operator.eq
-    found = None
-    for thing in seq:
-        if match(key(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:
-        return default
-
 def usage(out):
     out.write("usage: netbank [-h] [-s SESSION-ID] COMMAND [ARGS...]\n")
 
@@ -54,28 +21,23 @@ commands = {}
 
 def cmd_login(cmd, args):
     global sess
-    opts, args = getopt.getopt(args, "t:")
-    typename = sessname
-    for o, a in opts:
-        if o == "-t":
-            typename = a
-    if len(args) < 1:
-        sys.stderr.write("usage: login [-t BANK-ID] TYPE\n")
+    if len(args) < 2:
+        sys.stderr.write("usage: login BANK-ID TYPE [ARGS...]\n")
         sys.exit(1)
-    sess = data.getsessnam(typename).create()
-    if args[0] == "bankid":
+    sess = data.getsessnam(args[0]).create()
+    if args[1] == "bankid":
         authfun = sess.auth_bankid
-    elif args[0] == "token":
+    elif args[1] == "token":
         authfun = sess.auth_token
     else:
-        sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[0]))
+        sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[1]))
         sys.exit(1)
-    if len(args) < 2:
+    if len(args) < 3:
         sys.stderr.write("usage: login bankid USER-ID\n")
         sys.exit(1)
     with auth.ttyconv() as conv:
         try:
-            authfun(args[1], conv)
+            authfun(args[2], conv)
         except auth.autherror as err:
             sys.stderr.write("netbank: authentication failed: %s\n" % err)
             sys.exit(1)
@@ -111,8 +73,8 @@ 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, test=pfxmatch)
-    except ambiguous as exc:
+        acct = util.find(sess.accounts, item=args[0], key=lambda acct: acct.number, test=util.pfxmatch)
+    except util.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: