mehr presence intelligenz, weniger xmpp messages
[svn42.git] / update-xmpp-status.py
index 7671300..06559e3 100755 (executable)
@@ -3,7 +3,6 @@
 import os
 import os.path
 import sys
-#import threading
 import logging
 import logging.handlers
 import urllib
@@ -14,6 +13,7 @@ import socket
 import subprocess
 import types
 import ConfigParser
+import traceback
 
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -34,14 +34,10 @@ class UWSConfig:
     self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org davrieb@jabber.ccc.de')
     self.config_parser.add_section('msg')
     self.config_parser.set('msg','bored',"The Button has been pressed ! Maybe somebody want's company. Go Visit !")
-    self.config_parser.set('msg','format',"${status_msg}${request_msg}${comment_msg}")
-    self.config_parser.set('msg','status_opened_msg',"RealRaum door now open")
-    self.config_parser.set('msg','status_closed_msg',"RealRaum door now closed")
+    self.config_parser.set('msg','present',"Somebodys presence has been detected${door_action_msg}")
+    self.config_parser.set('msg','notpresent',"Nobody seems to be here, guess everybody left${door_action_msg}")
+    self.config_parser.set('msg','door_action_msg',", door ${door_status} ${by_whom}")
     self.config_parser.set('msg','status_error_msg',"ERROR Last Operation took too long !!!")
-    self.config_parser.set('msg','request_msg',"\safter ${request} request")
-    self.config_parser.set('msg','comment_msg',"\s(${comment})")
-    self.config_parser.set('msg','status_still_opened_msg',"Door remains closed")
-    self.config_parser.set('msg','status_still_closed_msg',"Door remains open")
     self.config_parser.add_section('tracker')
     self.config_parser.set('tracker','socket',"/var/run/tuer/presence.socket")        
     self.config_parser.add_section('debug')
@@ -72,13 +68,6 @@ class UWSConfig:
         self.config_mtime=os.path.getmtime(self.configfile)
       except (ConfigParser.ParsingError, IOError), pe_ex:
         logging.error("Error parsing Configfile: "+str(pe_ex))
-      self.config_parser.set('msg','comment_msg', self.config_parser.get('msg','comment_msg').replace("\\s"," "))
-      self.config_parser.set('msg','request_msg', self.config_parser.get('msg','request_msg').replace("\\s"," "))
-      self.config_parser.set('msg','status_error_msg', self.config_parser.get('msg','status_error_msg').replace("\\s"," "))
-      self.config_parser.set('msg','status_closed_msg', self.config_parser.get('msg','status_closed_msg').replace("\\s"," "))
-      self.config_parser.set('msg','status_opened_msg', self.config_parser.get('msg','status_opened_msg').replace("\\s"," "))
-      self.config_parser.set('msg','status_still_closed_msg', self.config_parser.get('msg','status_still_closed_msg').replace("\\s"," "))
-      self.config_parser.set('msg','status_still_opened_msg', self.config_parser.get('msg','status_still_opened_msg').replace("\\s"," "))      
       if self.config_parser.get('debug','enabled') == "True":
         logger.setLevel(logging.DEBUG)
       else:
@@ -137,6 +126,7 @@ def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0
     return False
   
 def popenTimeout2(cmd, pinput, returncode_ok=[0], ptimeout=21):
+  global sppoo
   logging.debug("popenTimeout2: starting: " + cmd)
   try:
     sppoo = subprocess.Popen(cmd, stdin=subprocess.PIPE, shell=True)
@@ -183,7 +173,6 @@ def sendXmppMsg(recipients, msg, resource = "torwaechter", addtimestamp = True,
   
   popenTimeout2(sendxmpp_cmd, msg)
 
-
 def distributeXmppMsg(msg,high_priority=False,debug=False):
   if debug == False:
     sendXmppMsg(uwscfg.xmpp_recipients_normal, msg)
@@ -191,59 +180,44 @@ def distributeXmppMsg(msg,high_priority=False,debug=False):
   else:
     sendXmppMsg(uwscfg.xmpp_recipients_debug, "D: " + msg)
 
-def formatAndDistributePresence(presence):
+def substituteMessageVariables(msg, door_tuple):
+  loop_tokens=3
+  while loop_tokens > 0 and msg.find("${") > -1:
+    #logging.debug("subsMsgVars: loopTok=%d door_tuple=%s msg=%s" % (loop_tokens, str(door_tuple), msg))
+    if not door_tuple is None and type(door_tuple[0]) == types.StringType:
+      msg = msg.replace('${door_action_msg}', uwscfg.msg_door_action_msg)      
+      msg = msg.replace('${door_status}', door_tuple[0]).replace('${by_whom}', "by "+str(door_tuple[1]))
+    else:
+      msg = msg.replace('${door_action_msg}','').replace('${door_status}','').replace('${by_whom}','')
+    loop_tokens-=1
+  return msg
+
+def formatAndDistributePresence(presence, door_tuple=(None,None)):
   if presence == "yes":
-    distributeXmppMsg("Somebody is present right now")
+    distributeXmppMsg(substituteMessageVariables(uwscfg.msg_present, door_tuple))
   else:
-    distributeXmppMsg("Nobody is here, everybody left")
+    distributeXmppMsg(substituteMessageVariables(uwscfg.msg_notpresent, door_tuple))
 
-current_status = (None, None, None) 
+def formatAndDistributeWarning(msg, door_tuple=(None,None)):
+  distributeXmppMsg("Warning: "+msg , high_priority=True)
+
+current_status = (None, None, None, None) 
 def filterAndFormatMessage(new_status):
   global current_status
-  if new_status in [current_status, (current_status[0], None, None)] :
-    distributeXmppMsg("Status recieved but filtered: (%s,%s,%s)" % new_status ,debug=True)
-  elif current_status == (None, None, None):
-    current_status=new_status
-    distributeXmppMsg("Initial Status: (%s,%s,%s)" % new_status ,debug=True)
-  else:
-    (status,req,req_comment) = new_status
-    high_priority_msg = False
-    req_msg=""
-    status_msg=""
-    comment_msg=""
-    if status == "error":
-      status_msg = uwscfg.msg_status_error_msg
-      high_priority_msg=True
-    else:
-      if current_status[0] == status:
-        if status == "opened":
-          status_msg = uwscfg.msg_status_still_opened_msg
-        elif status == "closed":
-          status_msg = uwscfg.msg_status_still_closed_msg
-        else:
-          logging.error("Unknown Status recieved: (%s,%s,%s)" % new_status)
-          distributeXmppMsg("Unknown Status: (%s,%s,%s)" % new_status ,debug=True)
-          return          
-      else:
-        if status == "opened":
-          status_msg = uwscfg.msg_status_opened_msg
-        elif status == "closed":
-          status_msg = uwscfg.msg_status_closed_msg      
-        else:
-          logging.error("Unknown Status recieved: (%s,%s,%s)" % new_status)
-          distributeXmppMsg("Unknown Status: (%s,%s,%s)" % new_status ,debug=True)
-          return
-    if req:
-      req_msg = uwscfg.msg_request_msg.replace("${request}",req)
-    if req_comment:
-      comment_msg = uwscfg.msg_comment_msg.replace("${comment}",req_comment)
-    msg = uwscfg.msg_format.replace("${status_msg}", status_msg).replace("${request_msg}",req_msg).replace("${comment_msg}",comment_msg)
-    distributeXmppMsg(msg, high_priority=high_priority_msg)
-    current_status=new_status
+  if new_status[0] == "error":
+    distributeXmppMsg(uwscfg.msg_status_error_msg, high_priority=True)
+  elif current_status[0] != new_status[0]:
+    distributeXmppMsg("Status: (%s,%s,%s,%s)" % new_status ,debug=True)
+  current_status=new_status
 
 def exitHandler(signum, frame):
+  global sppoo, conn, sockhandle
   logging.info("Door Status Listener stopping")
   try:
+    sppoo.kill()
+  except:
+    pass
+  try:
     conn.close()
   except:
     pass
@@ -267,10 +241,11 @@ else:
 
 distributeXmppMsg("update-xmpp-status.py started", debug=True)
 RE_STATUS = re.compile(r'Status: (\w+), idle')
-RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)')
-RE_PRESENCE = re.compile(r'Presence: (yes|no)')
+RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
 RE_BUTTON = re.compile(r'PanicButton|button\d?')
 RE_ERROR = re.compile(r'Error: (.+)')
+RE_WARNING = re.compile(r'Warning: (.+)')
 while True:
   try:
     if not os.path.exists(uwscfg.tracker_socket):
@@ -282,7 +257,7 @@ while True:
     conn = os.fdopen(sockhandle.fileno())
     #sockhandle.send("listen\n")
     #sockhandle.send("status\n")
-    last_request = (None, None)
+    last_request = (None, None, None)
     not_initial_presence = False
     while True:
       line = conn.readline()
@@ -296,37 +271,49 @@ while True:
       m = RE_BUTTON.match(line)
       if not m is None:
         distributeXmppMsg(uwscfg.msg_bored)
-        continue      
+        continue
+        
       m = RE_PRESENCE.match(line)
       if not m is None:
         if not_initial_presence:
-          formatAndDistributePresence(m.group(1))
+          formatAndDistributePresence(m.group(1), m.group(2,3))
         else:
           not_initial_presence=True
           distributeXmppMsg("Initial Presence received: %s" % m.group(1) ,debug=True)
         continue
+      
+      m = RE_WARNING.match(line)
+      if not m is None:
+        errorstr = m.group(1)
+        logging.error("Recieved Warning: "+errorstr)
+        formatAndDistributeWarning(errorstr)
+        continue
+      
       m = RE_STATUS.match(line)
       if not m is None:
         status = m.group(1)
         filterAndFormatMessage((status,) + last_request)
-        last_request = (None, None)
+        last_request = (None, None, None)
         continue
+      
       m = RE_REQUEST.match(line)
       if not m is None:  
-        last_request = m.group(1,2)
+        last_request = m.group(1,3,2)
         continue
+      
       m = RE_ERROR.match(line)
       if not m is None:
         errorstr = m.group(1)
         if "too long!" in errorstr:
           filterAndFormatMessage(("error",) + last_request)
-          last_request = (None, None)
+          last_request = (None, None, None)
         else:
           logging.error("Recieved Error: "+errorstr)
           distributeXmppMsg("Error: "+errorstr, debug=True)
-          last_request = (None, None)
+          last_request = (None, None, None)
   except Exception, ex:
     logging.error("main: "+str(ex)) 
+    traceback.print_exc(file=sys.stdout)
     try:
       sockhandle.close()
     except: