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

diff --git a/tyshell b/tyshell
index 13a5513..2df0a22 100755
--- a/tyshell
+++ b/tyshell
@@ -7,6 +7,7 @@ import subprocess
 import socket
 import pwd
 import grp
+import traceback
 from collections import namedtuple
 
 tuerSock = "/run/tuer.sock"
@@ -42,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):
@@ -66,12 +69,12 @@ CmdEntry = namedtuple('CmdEntry','function helpstring')
 commands = alias({
 	'exit': CmdEntry(exitcmd, 'Quits this shell'),
 	'help': CmdEntry(helpcmd, 'Helps you getting to know the available commands'),
-	'open': CmdEntry(sendcmd(tuerSock, 'unlock'), 'Will try to unlock the apartment door'),
+	'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):
@@ -104,6 +107,7 @@ while True:
 			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))