X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/97df5941b08cd53aa66937ded412fa58aac531aa..7a99a7eb3b2f2c539836875d2cc8ea15a42ea49f:/tyshell

diff --git a/tyshell b/tyshell
index c9a0927..2df0a22 100755
--- a/tyshell
+++ b/tyshell
@@ -6,6 +6,9 @@ import sys
 import subprocess
 import socket
 import pwd
+import grp
+import traceback
+from collections import namedtuple
 
 tuerSock = "/run/tuer.sock"
 
@@ -20,7 +23,11 @@ atexit.register(readline.write_history_file, histfile)
 
 # available commands
 def helpcmd(c):
-	print("Available commands: %s" % ", ".join(sorted(commands.keys())))
+	if (len(c) > 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'")
 
 def extcmd(cmd):
 	def run(c):
@@ -31,14 +38,16 @@ def extcmd(cmd):
 
 def sendcmd(addr, cmd):
 	def run(c):
-		print("Running %s..." % (cmd))
+		print("206 Sending command %s..." % (cmd))
 		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 		s.connect(addr)
-		s.settimeout(10.0)
+		s.settimeout(60.0)
 		s.send(cmd.encode())
-		data = s.recv(4)
+		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):
@@ -46,17 +55,27 @@ def exitcmd(c):
 	return True
 
 def whocmd(c):
-	for p in filter(lambda x:x.pw_shell=="/opt/tuer/tyshell",pwd.getpwall()):
+	for n in grp.getgrnam("tuer").gr_mem:
+		p = pwd.getpwnam(n)
 		print (p.pw_name, " - ", p.pw_gecos)
 
-commands = {
-	'exit': exitcmd,
-	'help': helpcmd,
-	'open': sendcmd(tuerSock, 'unlock'),
-	'unlock': sendcmd(tuerSock, 'unlock'),
-	'buzz': sendcmd(tuerSock, 'buzz'),
-	'who': whocmd,
-}
+def alias (cmds, aliases):
+	for newname, oldname in aliases.items():
+		cmds[newname] = cmds[oldname]
+	return cmds
+
+CmdEntry = namedtuple('CmdEntry','function helpstring')
+
+commands = alias({
+	'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
+	'open': 'unlock',
+})
 
 def complete_command(cmd):
 	'''returns a list of commands (as strings) starting with cmd'''
@@ -84,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]](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))