fix FIXMEs

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 22809262fd4598b150428e7d8a4ea0fe1aef54e2..1b90bd0ed0cb306b28988f88b5282e997ac7ad70 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -47,11 +47,17 @@ def exitcmd(c):
 commands = {
        'exit': exitcmd,
        'help': helpcmd,
 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'),
 }
 
        '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.")
 while True:
 # input loop
 print("Welcome to tyshell. Use help to see what you can do.")
 while True:


@@ -66,7 +72,7 @@ while True:
        if command[0] in commands: # needed in case a complete command is a prefix of another one
                cmdoptions = [command[0]]
        else:
        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])
        # check how many we found
        if len(cmdoptions) == 0: # no commands fit prefix
                print("Command %s not found. Use help." % command[0])