nice alias system

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 1b90bd0ed0cb306b28988f88b5282e997ac7ad70..c35ec0ebbe9da65439d6411246ceeecff076ebce 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -5,6 +5,8 @@ import shlex
 import sys
 import subprocess
 import socket
 import sys
 import subprocess
 import socket

+import pwd
+import grp

 
 tuerSock = "/run/tuer.sock"
 
 
 tuerSock = "/run/tuer.sock"
 


@@ -33,9 +35,9 @@ def sendcmd(addr, cmd):
                print("Running %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)
                print("Running %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())
                s.send(cmd.encode())

-               data = s.recv(4)
+               data = s.recv(256)

                s.close()
                print(data.decode('utf-8'))
        return run
                s.close()
                print(data.decode('utf-8'))
        return run


@@ -44,13 +46,26 @@ def exitcmd(c):
        print("Bye")
        return True
 
        print("Bye")
        return True
 

-commands = {
+def whocmd(c):
+       for n in grp.getgrnam("tuer").gr_mem:
+               p = pwd.getpwnam(n)
+               print (p.pw_name, " - ", p.pw_gecos)
+
+def alias (cmds, aliases):
+       for newname, oldname in aliases.items():
+               cmds[newname] = cmds[oldname]
+       return cmds
+
+commands = alias({

        'exit': exitcmd,
        'help': helpcmd,
        'open': sendcmd(tuerSock, 'unlock'),
        'exit': exitcmd,
        'help': helpcmd,
        'open': sendcmd(tuerSock, 'unlock'),

-       'unlock': sendcmd(tuerSock, 'unlock'),

        'buzz': sendcmd(tuerSock, 'buzz'),
        'buzz': sendcmd(tuerSock, 'buzz'),

-}
+       'who': whocmd,
+},{
+       # aliases
+       'unlock': 'open',
+})

 
 def complete_command(cmd):
        '''returns a list of commands (as strings) starting with cmd'''
 
 def complete_command(cmd):
        '''returns a list of commands (as strings) starting with cmd'''