X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/6e7d90d419547705cb125adc7fe3626d9dc0fd49..c3f869a3599a8d58dd4c6f12031e67eec9654de5:/tyshell?ds=sidebyside

diff --git a/tyshell b/tyshell
index 34ef515..2280926 100755
--- a/tyshell
+++ b/tyshell
@@ -9,7 +9,7 @@ import socket
 tuerSock = "/run/tuer.sock"
 
 # use a histfile
-histfile = os.path.join(os.path.expanduser("~"), ".pyshellhist")
+histfile = os.path.join(os.path.expanduser("~"), ".tyshellhist")
 try:
     readline.read_history_file(histfile)
 except IOError:
@@ -18,7 +18,7 @@ import atexit
 atexit.register(readline.write_history_file, histfile)
 
 # available commands
-def help(c):
+def helpcmd(c):
 	print("Available commands: %s" % ", ".join(sorted(commands.keys())))
 
 def extcmd(cmd):
@@ -33,17 +33,20 @@ 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):
+	print("Bye")
+	return True
+
 commands = {
-	'exit': None, # catched below, quits the loop
-	'help': help,
+	'exit': exitcmd,
+	'help': helpcmd,
 	'open': sendcmd(tuerSock, 'open'),
 	'close': sendcmd(tuerSock, 'close'),
 	'buzz': sendcmd(tuerSock, 'buzz'),
@@ -59,14 +62,22 @@ while True:
 		break
 	command = shlex.split(command)
 	if not len(command): continue
-	# execute command
-	if command[0] == "exit":
-		break
-	elif 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 = list(filter(lambda x: command[0].startswith(x), commands.keys()))
+	# 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]](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("Bye")
+	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
+