command who

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 0bc3aaeb63e18fed3df141843ed8b2c8cd03d217..c9a09273c96d837f1e3a018320aa8122e961e1b8 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -5,6 +5,7 @@ import shlex
 import sys
 import subprocess
 import socket
+import pwd
 
 tuerSock = "/run/tuer.sock"
 
@@ -16,7 +17,6 @@ except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
-atexit.register(print, "Bye")
 
 # available commands
 def helpcmd(c):
@@ -34,25 +34,36 @@ def sendcmd(addr, cmd):
                print("Running %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)
+               s.settimeout(10.0)
                s.send(cmd.encode())
                data = s.recv(4)
                s.close()
-               print("...done")
-               if data != b'1':
-                       print("Received unexpected answer %s" % str(data))
+               print(data.decode('utf-8'))
        return run
 
 def exitcmd(c):
-       sys.exit(0)
+       print("Bye")
+       return True
+
+def whocmd(c):
+       for p in filter(lambda x:x.pw_shell=="/opt/tuer/tyshell",pwd.getpwall()):
+               print (p.pw_name, " - ", p.pw_gecos)
 
 commands = {
        'exit': exitcmd,
        'help': helpcmd,
-       'open': sendcmd(tuerSock, 'open'),
-       'close': sendcmd(tuerSock, 'close'),
+       'open': sendcmd(tuerSock, 'unlock'),
+       'unlock': sendcmd(tuerSock, 'unlock'),
        'buzz': sendcmd(tuerSock, 'buzz'),
+       'who': whocmd,
 }
 
+def complete_command(cmd):
+       '''returns a list of commands (as strings) starting with cmd'''
+       return list(filter(lambda x: x.startswith(cmd), commands.keys()))
+readline.set_completer(lambda cmd, num: (complete_command(cmd)+[None])[num]) # wrap complete_command for readline's weird completer API
+readline.parse_and_bind("tab: complete") # run completion on tab
+
 # input loop
 print("Welcome to tyshell. Use help to see what you can do.")
 while True:
@@ -67,15 +78,18 @@ while True:
        if command[0] in commands: # needed in case a complete command is a prefix of another one
                cmdoptions = [command[0]]
        else:
-               cmdoptions = list(filter(lambda x: command[0] == x[:len(command[0])],commands.keys()))
+               cmdoptions = complete_command(command[0])
+       # check how many we found
        if len(cmdoptions) == 0: # no commands fit prefix
                print("Command %s not found. Use help." % command[0])
        elif len(cmdoptions) == 1: # exactly one command fits (prefix)
                try:
-                       commands[cmdoptions[0]](command)
+                       res = commands[cmdoptions[0]](command)
+                       if res: break
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix
+               print("Ambiguous command prefix, please choose one of the following:")
                print("\t", " ".join(cmdoptions))
                # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace