X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/bf408ef82859e90b60f30fd8edf6503c7e88394f..e99d4446af1d2f2419c4de4fe3874f17b0873a48:/tyshell?ds=sidebyside

diff --git a/tyshell b/tyshell
index 0b9b943..1ffccfe 100755
--- a/tyshell
+++ b/tyshell
@@ -16,11 +16,10 @@ except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
-atexit.register(print, "Bye")
 
 # available commands
 def helpcmd(c):
-	print("Available commands: %s" % ", ".join(sorted(longcommands.keys())))
+	print("Available commands: %s" % ", ".join(sorted(commands.keys())))
 
 def extcmd(cmd):
 	def run(c):
@@ -34,58 +33,25 @@ 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'),
 }
 
-# command convenience shortcuts
-def filterCommonPrefix (strings, length):
-	# ignores duplicates in the string list "strings"
-	toremove=[]
-	for a in strings:
-		for b in strings:
-			if a != b:
-				if a[:length] == b[:length]:
-					toremove.append(a)
-					toremove.append(b)
-	ret = list(strings) # copy
-	for x in toremove:
-		try:
-			ret.remove(x)
-		except ValueError:
-			pass
-	return ret
-
-def shortcutify (dic):
-	maxlen = 0
-	for x in dic.keys():
-		if len(x) > maxlen:
-			maxlen = len(x)
-	for i in range(maxlen):
-		shortable = filterCommonPrefix (dic.keys(), i)
-		for x in shortable:
-			dic[x[:i]] = dic[x]
-	return dic # only for convenience, as dic is passed by reference
-
-longcommands = commands.copy()
-shortcutify (commands)
-
-
 # input loop
 print("Welcome to tyshell. Use help to see what you can do.")
 while True:
@@ -96,12 +62,22 @@ 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()))
+	# 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])
+	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