X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/110416af543da9bffe1d02fa31885b5731a22aef..97036270b630059dc55e70725fb4b65554bc36ba:/tyshell?ds=sidebyside

diff --git a/tyshell b/tyshell
index f30b9d7..2df0a22 100755
--- a/tyshell
+++ b/tyshell
@@ -7,6 +7,8 @@ import subprocess
 import socket
 import pwd
 import grp
+import traceback
+from collections import namedtuple
 
 tuerSock = "/run/tuer.sock"
 
@@ -22,7 +24,7 @@ atexit.register(readline.write_history_file, histfile)
 # available commands
 def helpcmd(c):
 	if (len(c) > 1):
-		print(commands.get(c[1],(None,'Can\'t find help for command %s'%(c[1])))[1])
+		print(commands.get(c[1],(None,'Can\'t find help for command %s'%(c[1]))).helpstring)
 	else:
 		print("Available commands: %s" % ", ".join(sorted(commands.keys())))
 		print("Use 'help command' to get more information on the command 'command'")
@@ -41,9 +43,11 @@ def sendcmd(addr, cmd):
 		s.connect(addr)
 		s.settimeout(60.0)
 		s.send(cmd.encode())
-		data = s.recv(256)
+		while True:
+			data = s.recv(256)
+			if not len(data): break
+			print(data.decode('utf-8'))
 		s.close()
-		print(data.decode('utf-8'))
 	return run
 
 def exitcmd(c):
@@ -60,15 +64,17 @@ def alias (cmds, aliases):
 		cmds[newname] = cmds[oldname]
 	return cmds
 
+CmdEntry = namedtuple('CmdEntry','function helpstring')
+
 commands = alias({
-	'exit': (exitcmd, 'Quits this shell'),
-	'help': (helpcmd, 'Helps you getting to know the available commands'),
-	'open': (sendcmd(tuerSock, 'unlock'), 'Will try to unlock the apartment door'),
-	'buzz': (sendcmd(tuerSock, 'buzz'), 'Will buzz the buzzer for the street door'),
-	'who': (whocmd, 'Shows the list of people, who are allowed to control this system'),
+	'exit': CmdEntry(exitcmd, 'Quits this shell'),
+	'help': CmdEntry(helpcmd, 'Helps you getting to know the available commands'),
+	'unlock': CmdEntry(sendcmd(tuerSock, 'unlock'), 'Will try to unlock the apartment door'),
+	'buzz': CmdEntry(sendcmd(tuerSock, 'buzz'), 'Will buzz the buzzer for the street door'),
+	'who': CmdEntry(whocmd, 'Shows the list of people, who are allowed to control this system'),
 },{
 	# aliases
-	'unlock': 'open',
+	'open': 'unlock',
 })
 
 def complete_command(cmd):
@@ -97,10 +103,11 @@ while True:
 		print("Command %s not found. Use help." % command[0])
 	elif len(cmdoptions) == 1: # exactly one command fits (prefix)
 		try:
-			res = commands[cmdoptions[0]][0](command)
+			res = commands[cmdoptions[0]].function(command)
 			if res: break
 		except Exception as e:
 			print("Error while executing %s: %s" % (command[0], str(e)))
+			#print(traceback.format_exc())
 	else: # multiple commands fit the prefix
 		print("Ambiguous command prefix, please choose one of the following:")
 		print("\t", " ".join(cmdoptions))