X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/36d7c6cbf03d4096480d14d1b03aa758722251f6..110416af543da9bffe1d02fa31885b5731a22aef:/tyshell?ds=inline diff --git a/tyshell b/tyshell index c35ec0e..f30b9d7 100755 --- a/tyshell +++ b/tyshell @@ -21,7 +21,11 @@ atexit.register(readline.write_history_file, histfile) # 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])))[1]) + 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): @@ -32,7 +36,7 @@ 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) @@ -57,11 +61,11 @@ def alias (cmds, aliases): return cmds commands = alias({ - 'exit': exitcmd, - 'help': helpcmd, - 'open': sendcmd(tuerSock, 'unlock'), - 'buzz': sendcmd(tuerSock, 'buzz'), - 'who': whocmd, + 'exit': (exitcmd, 'Quits this shell'), + 'help': (helpcmd, 'Helps you getting to know the available commands'), + 'open': (sendcmd(tuerSock, 'unlock'), 'Will try to unlock the apartment door'), + 'buzz': (sendcmd(tuerSock, 'buzz'), 'Will buzz the buzzer for the street door'), + 'who': (whocmd, 'Shows the list of people, who are allowed to control this system'), },{ # aliases 'unlock': 'open', @@ -93,7 +97,7 @@ while True: print("Command %s not found. Use help." % command[0]) elif len(cmdoptions) == 1: # exactly one command fits (prefix) try: - res = commands[cmdoptions[0]](command) + res = commands[cmdoptions[0]][0](command) if res: break except Exception as e: print("Error while executing %s: %s" % (command[0], str(e)))