X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/8b136f42bf0c83f8aee52c315f7dbebc371cce1b..58cb71a3e864fbad3e90a9518a367e28ee458467:/tyshell?ds=sidebyside

diff --git a/tyshell b/tyshell
index 2280926..6faaba8 100755
--- a/tyshell
+++ b/tyshell
@@ -33,9 +33,9 @@ def sendcmd(addr, cmd):
 		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())
-		data = s.recv(4)
+		data = s.recv(256)
 		s.close()
 		print(data.decode('utf-8'))
 	return run
@@ -47,11 +47,17 @@ def exitcmd(c):
 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'),
 }
 
+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 +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:
-		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])