X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/27ea44f35684aeab9a5677bd64892d6de950fb4e..df7d5268c3bee2e973ca285d97d1a3a77de24743:/tyshell

diff --git a/tyshell b/tyshell
index 090403e..4429c35 100755
--- a/tyshell
+++ b/tyshell
@@ -9,8 +9,7 @@ import socket
 tuerSock = "/run/tuer.sock"
 
 # use a histfile
-# FIXME: Why not ".tyshellhist"?
-histfile = os.path.join(os.path.expanduser("~"), ".pyshellhist")
+histfile = os.path.join(os.path.expanduser("~"), ".tyshellhist")
 try:
     readline.read_history_file(histfile)
 except IOError:
@@ -20,7 +19,7 @@ atexit.register(readline.write_history_file, histfile)
 atexit.register(print, "Bye")
 
 # available commands
-def help(c):
+def helpcmd(c):
 	print("Available commands: %s" % ", ".join(sorted(commands.keys())))
 
 def extcmd(cmd):
@@ -48,7 +47,7 @@ def exitcmd(c):
 
 commands = {
 	'exit': exitcmd,
-	'help': help,
+	'help': helpcmd,
 	'open': sendcmd(tuerSock, 'open'),
 	'close': sendcmd(tuerSock, 'close'),
 	'buzz': sendcmd(tuerSock, 'buzz'),
@@ -64,12 +63,20 @@ while True:
 		break
 	command = shlex.split(command)
 	if not len(command): continue
-	# execute command
-	if 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()))
+	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)
+			commands[cmdoptions[0]](command)
 		except Exception as e:
 			print("Error while executing %s: %s" % (command[0], str(e)))
-	else:
-		print("Command %s not found. Use help." % command[0])
+	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