mehr presence intelligenz, weniger xmpp messages

[svn42.git] / switch-power.py

diff --git a/switch-power.py b/switch-power.py
index 5364de1..287cf76 100755 (executable)
--- a/switch-power.py
+++ b/switch-power.py
@@ -14,6 +14,7 @@ import socket
 import subprocess
 import types
 import ConfigParser
+import datetime
 
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -29,11 +30,13 @@ class UWSConfig:
     self.config_parser=ConfigParser.ConfigParser()
     self.config_parser.add_section('slug')
     self.config_parser.set('slug','cgiuri','http://slug.realraum.at/cgi-bin/switch.cgi?id=%ID%&power=%ONOFF%')
-    self.config_parser.set('slug','ids_present','logo werkzeug')
+    self.config_parser.set('slug','ids_present_day','logo werkzeug')
+    self.config_parser.set('slug','ids_present_night','logo werkzeug schreibtisch idee labor')
     self.config_parser.set('slug','ids_panic','idee schreibtisch labor werkzeug')
     self.config_parser.set('slug','ids_nonpresent_off','idee schreibtisch labor werkzeug stereo logo')
+    #self.config_parser.set('slug','time_day','6:00-17:00')
     self.config_parser.add_section('debug')
-    self.config_parser.set('debug','enabled',"True")
+    self.config_parser.set('debug','enabled',"False")
     self.config_parser.add_section('tracker')
     self.config_parser.set('tracker','socket',"/var/run/tuer/presence.socket")    
     self.config_mtime=0
@@ -107,20 +110,32 @@ def switchPower(powerid,turn_on=False):
     onoff="off"
   touchURL(uwscfg.slug_cgiuri.replace("%ID%",powerid).replace("%ONOFF%",onoff))
   
+######### EVENTS ###############  
+  
 def eventPresent():
-  for id in uwscfg.slug_ids_present.split(" "):
+  hour = datetime.datetime.now().hour
+  if hour > 6 and hour < 18:
+    present_ids=uwscfg.slug_ids_present_day
+  else:
+    present_ids=uwscfg.slug_ids_present_night
+  logging.info("event: someone present, switching on: "+present_ids)
+  for id in present_ids.split(" "):
     switchPower(id,True)
 
 def eventNobodyHere():
-  for id in uwscfg.slug_ids_nonpresent_off.split(" "):
+  present_ids=uwscfg.slug_ids_nonpresent_off
+  logging.info("event: noone here, switching off: "+present_ids)
+  for id in present_ids.split(" "):
+    switchPower(id,False)
     switchPower(id,False)
 
 def eventPanic():
+  logging.info("event: Panic:, switching around: "+uwscfg.slug_ids_panic)
   lst1 = uwscfg.slug_ids_panic.split(" ")
   lst2 = lst1
   lst2.append(lst2.pop(0))
   #guarantee list has even number of elements by multiplying it with a factor of 2
-  lst=zip(lst1,lst2) * 4
+  lst=zip(lst1,lst2) * 8
   lst2=None
   switchPower(lst[0][0],True)
   for (id1,id2) in lst: 
@@ -130,6 +145,9 @@ def eventPanic():
   time.sleep(0.6)
   for id in lst1:
     switchPower(id,False)
+  eventPresent()
+
+########################
 
 def exitHandler(signum, frame):
   logging.info("Power Switch Daemon stopping")
@@ -156,7 +174,7 @@ else:
   uwscfg = UWSConfig()
 
 #socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well)
-RE_PRESENCE = re.compile(r'Presence: (yes|no)')
+RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
 RE_BUTTON = re.compile(r'PanicButton|button\d?')
 while True:
   try: