X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/83d646a505bed8c75eef15855da7046e5854106d..d72b6eb3b787ea31c165de06a996dfca93d10146:/tyshell diff --git a/tyshell b/tyshell index 9350e12..37873bc 100755 --- a/tyshell +++ b/tyshell @@ -5,6 +5,10 @@ import shlex import sys import subprocess import socket +import pwd +import grp +import traceback +from collections import namedtuple tuerSock = "/run/tuer.sock" @@ -16,11 +20,14 @@ except IOError: pass import atexit atexit.register(readline.write_history_file, histfile) -atexit.register(print, "Bye") # available commands def helpcmd(c): - print("Available commands: %s" % ", ".join(sorted(commands.keys()))) + if (len(c) > 1): + print(commands.get(c[1],(None,'Can\'t find help for command %s'%(c[1]))).helpstring) + else: + print("Available commands: %s" % ", ".join(sorted(commands.keys()))) + print("Use 'help command' to get more information on the command 'command'") def extcmd(cmd): def run(c): @@ -31,27 +38,48 @@ 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(60.0) s.send(cmd.encode()) - data = s.recv(4) + data = s.recv(256) 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 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 + +CmdEntry = namedtuple('CmdEntry','function helpstring') + +commands = alias({ + 'exit': CmdEntry(exitcmd, 'Quits this shell'), + 'help': CmdEntry(helpcmd, 'Helps you getting to know the available commands'), + 'unlock': CmdEntry(sendcmd(tuerSock, 'unlock'), 'Will try to unlock the apartment door'), + 'buzz': CmdEntry(sendcmd(tuerSock, 'buzz'), 'Will buzz the buzzer for the street door'), + 'who': CmdEntry(whocmd, 'Shows the list of people, who are allowed to control this system'), +},{ + # aliases + 'open': 'unlock', +}) -commands = { - 'exit': exitcmd, - 'help': helpcmd, - 'open': sendcmd(tuerSock, 'open'), - 'close': sendcmd(tuerSock, 'close'), - 'buzz': sendcmd(tuerSock, 'buzz'), -} +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.") @@ -63,12 +91,23 @@ while True: break command = shlex.split(command) if not len(command): continue - # execute command - if command[0] in commands: + # find suiting commands + if command[0] in commands: # needed in case a complete command is a prefix of another one + cmdoptions = [command[0]] + else: + 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[command[0]](command) + res = commands[cmdoptions[0]].function(command) + if res: break except Exception as e: print("Error while executing %s: %s" % (command[0], str(e))) - else: - print("Command %s not found. Use help." % command[0]) + #print(traceback.format_exc()) + 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