X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/07282bc03a4f1dfcd9309f2fa242dfecb2756a3b..6f24ccffd4dc1b8401cddad047296a0c11fedb5f:/tyshell

diff --git a/tyshell b/tyshell
index 0bc3aae..1b90bd0 100755
--- a/tyshell
+++ b/tyshell
@@ -16,7 +16,6 @@ except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
-atexit.register(print, "Bye")
 
 # available commands
 def helpcmd(c):
@@ -34,25 +33,31 @@ 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.send(cmd.encode())
 		data = s.recv(4)
 		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
 
 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:
@@ -67,15 +72,18 @@ 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] == x[:len(command[0])],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])
 	elif len(cmdoptions) == 1: # exactly one command fits (prefix)
 		try:
-			commands[cmdoptions[0]](command)
+			res = commands[cmdoptions[0]](command)
+			if res: break
 		except Exception as e:
 			print("Error while executing %s: %s" % (command[0], str(e)))
 	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