make the actor more multi-threaded and do more logging

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 22809262fd4598b150428e7d8a4ea0fe1aef54e2..f8627d214cf05c29f6d5cad27ee92a1d0d5f76fd 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -5,6 +5,8 @@ import shlex
 import sys
 import subprocess
 import socket
+import pwd
+import grp
 
 tuerSock = "/run/tuer.sock"
 
@@ -30,12 +32,12 @@ def extcmd(cmd):
 
 def sendcmd(addr, cmd):
        def run(c):
-               print("Running %s..." % (cmd))
+               print("206 Sending command %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)
-               s.settimeout(10.0)
+               s.settimeout(60.0)
                s.send(cmd.encode())
-               data = s.recv(4)
+               data = s.recv(256)
                s.close()
                print(data.decode('utf-8'))
        return run
@@ -44,14 +46,26 @@ def exitcmd(c):
        print("Bye")
        return True
 
+def whocmd(c):
+       for n in grp.getgrnam("tuer").gr_mem:
+               p = pwd.getpwnam(n)
+               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:
@@ -66,7 +80,7 @@ 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].startswith(x), 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])