--bug, physically present was not set on manual open/close -> light
[svn42.git] / switch-power.py
index 77e3369..ed838b0 100755 (executable)
@@ -32,6 +32,8 @@ class UWSConfig:
     self.config_parser=ConfigParser.ConfigParser()
     self.config_parser.add_section('powerswitching')
     self.config_parser.set('powerswitching','min_secs_periodical_event','59')
+    self.config_parser.set('powerswitching','secs_movement_before_presence_to_launch_event','1')
+    self.config_parser.set('powerswitching','secs_presence_before_movement_to_launch_event','120')
     self.config_parser.set('powerswitching','max_secs_since_movement','600')
     self.config_parser.add_section('slug')
     self.config_parser.set('slug','cgiuri','http://slug.realraum.at/cgi-bin/switch.cgi?id=%ID%&power=%ONOFF%')
@@ -46,7 +48,7 @@ class UWSConfig:
     self.config_parser.add_section('debug')
     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_parser.set('tracker','socket',"/var/run/tuer/presence.socket")
     self.config_mtime=0
     if not self.configfile is None:
       try:
@@ -56,7 +58,7 @@ class UWSConfig:
         self.writeConfigFile()
       else:
         self.checkConfigUpdates()
-    
+
   def checkConfigUpdates(self):
     global logger
     if self.configfile is None:
@@ -81,7 +83,7 @@ class UWSConfig:
   def writeConfigFile(self):
     if self.configfile is None:
       return
-    logging.debug("Writing Configfile "+self.configfile)      
+    logging.debug("Writing Configfile "+self.configfile)
     try:
       cf_handle = open(self.configfile,"w")
       self.config_parser.write(cf_handle)
@@ -131,9 +133,9 @@ def isWolfHour():
 
 ######### ALGOS ###############
 
-def switchLogo(status_presense):
+def switchLogo(status_presence):
   logo_action=None
-  if status_presense:
+  if status_presence:
     logo_action=True
   else:
     if haveDaylight():
@@ -143,16 +145,18 @@ def switchLogo(status_presense):
           logo_action=False
        else:
           logo_action=True
-  logging.info("switchLogo: presence:%s daylight:%s wolfhour:%s =>action:%s  switching:"+uwscfg.slug_ids_logo % (status_presense,haveDaylight(),isWolfHour(),logo_action))
   if not logo_action is None:
+    logging.info("switchLogo: logo_action:%s" % str(logo_action))
     for id in uwscfg.slug_ids_logo.split(" "):
       switchPower(id,logo_action)
 
 ######### EVENTS ###############
 unixts_last_movement=0
-status_presense=None
+unixts_last_presence=0
+status_presence=None
 room_is_bright=None
 
+
 def eventRoomGotBright():
   global room_is_bright
   logging.debug("eventRoomGotBright()")
@@ -164,34 +168,38 @@ def eventRoomGotDark():
   room_is_bright=False
 
 def eventDaylightStart():
-  global status_presense
+  global status_presence
   logging.debug("eventDaylightStart()")
-  switchLogo(status_presense)
+  switchLogo(status_presence)
 
 def eventDaylightStop():
-  global status_presense
+  global status_presence
   logging.debug("eventDaylightStop()")
-  switchLogo(status_presense)
+  switchLogo(status_presence)
 
 def eventWolfHourStart():
-  global status_presense
+  global status_presence
   logging.debug("eventWolfHourStart()")
-  switchLogo(status_presense)
+  switchLogo(status_presence)
 
 def eventWolfHourStop():
-  global status_presense
+  global status_presence
   logging.debug("eventWolfHourStop()")
-  switchLogo(status_presense)
+  switchLogo(status_presence)
 
 def eventMovement():
-  global unixts_last_movement
+  global unixts_last_movement, unixts_last_presence
   unixts_last_movement=time.time()
+  if (time.time() - unixts_last_presence) <= float(uwscfg.powerswitching_secs_presence_before_movement_to_launch_event):
+    eventPresentAndMoved()
+    unixts_last_presence=0  # so that eventPresentAndMoved will only launch once per presence event (i.e. supress multiple movement events)
+
 
 def eventPeriodical():
   pass
 
 #  global unixts_last_movement
-#  if status_presense is True and unixts_last_movement + int(uwscfg.powerswitching_max_secs_since_movement) >= time.time():
+#  if status_presence is True and unixts_last_movement + int(uwscfg.powerswitching_max_secs_since_movement) >= time.time():
 #    presumed_state=not (haveDaylight() or isWolfHour())
 #    logging.debug("event: periodical event")
 #    for id in uwscfg.slug_ids_logo.split(" "):
@@ -200,9 +208,10 @@ def eventPeriodical():
 #      switchPower(id,presumed_state)
 
 def eventPresent():
-  global status_presense,room_is_bright
+  global status_presence,room_is_bright,unixts_last_movement,uwscfg,unixts_last_presence
+  unixts_last_presence=time.time()
   logging.debug("eventPresent()");
-  status_presense=True
+  status_presence=True
   if haveDaylight():
     if room_is_bright is False:
       present_ids=uwscfg.slug_ids_present_day_dark_room
@@ -213,23 +222,31 @@ def eventPresent():
   logging.info("event: someone present, switching on: "+present_ids)
   for id in present_ids.split(" "):
     switchPower(id,True)
-  switchLogo(status_presense)
+  switchLogo(status_presence)
+  if ( time.time() - unixts_last_movement ) <= float(uwscfg.powerswitching_secs_movement_before_presence_to_launch_event):
+    unixts_last_movement=0
+    eventPresentAndMoved()
+
+def eventPresentAndMoved():
+  global status_presence,room_is_bright
+  pass
 
 def eventNobodyHere():
-  global status_presense
+  global status_presence
   logging.debug("eventNobodyHere()");
-  status_presense=False
+  status_presence=False
   present_ids=uwscfg.slug_ids_nonpresent_off
   logging.info("event: noone here, switching off: "+present_ids)
-  for id in present_ids.split(" "):
-    time.sleep(0.2)
+  present_id_list=present_ids.split(" ")
+  for id in present_id_list:
+    time.sleep(0.15)
     switchPower(id,False)
-  present_ids.reverse()
-  time.sleep(0.2)
-  switchLogo(status_presense)
-  time.sleep(4)
-  for id in present_ids.split(" "):
-    time.sleep(0.3)
+  present_id_list.reverse()
+  time.sleep(0.15)
+  switchLogo(status_presence)
+  time.sleep(2)
+  for id in present_id_list:
+    time.sleep(0.15)
     switchPower(id,False)
 
 ##def eventPanic():
@@ -241,14 +258,14 @@ def eventNobodyHere():
 ##  for delay in map(lambda e: (40-e)/33.0,range(10,33)):
 ##    e = random.choice(lst2)
 ##    e[1]=not e[1]
-##    switchPower(e[0],e[1]) 
+##    switchPower(e[0],e[1])
 ##    time.sleep(delay)
 ##  random.shuffle(lst1)
 ##  for id in lst1:
 ##    switchPower(id,False)
 ##  time.sleep(1.2)
 ##  eventPresent()
-    
+
 def eventPanic():
   logging.info("eventPanic(): switching around: "+uwscfg.slug_ids_panic)
   lst1 = uwscfg.slug_ids_panic.split(" ")
@@ -260,12 +277,12 @@ def eventPanic():
     time.sleep(delay)
     for e in lst2:
       e[1]=not e[1]
-      switchPower(e[0],e[1]) 
+      switchPower(e[0],e[1])
   for id in lst1:
     switchPower(id,False)
   time.sleep(1.2)
   eventPresent()
-    
+
 
 ########################
 
@@ -280,7 +297,7 @@ def exitHandler(signum, frame):
   except:
     pass
   sys.exit(0)
-  
+
 #signals proapbly don't work because of readline
 #signal.signal(signal.SIGTERM, exitHandler)
 signal.signal(signal.SIGINT, exitHandler)
@@ -326,19 +343,19 @@ while True:
           eventWolfHourStart()
         else:
           eventWolfHourStop()
-     
+
       if unixts_last_periodical + int(uwscfg.powerswitching_min_secs_periodical_event) <= time.time():
         unixts_last_periodical = time.time()
         eventPeriodical()
 
       line = conn.readline()
       logging.debug("Got Line: " + line)
-      
+
       uwscfg.checkConfigUpdates()
-      
+
       if line == "":
         raise Exception("EOF on Socket, daemon seems to have quit")
-      
+
       m = RE_PRESENCE.match(line)
       if not m is None:
         status = m.group(1)
@@ -365,7 +382,7 @@ while True:
         else:
           eventRoomGotDark()
         continue
-          
+
   except Exception, ex:
     logging.error("main: "+str(ex))
     traceback.print_exc(file=sys.stdout)
@@ -374,5 +391,5 @@ while True:
     except:
       pass
     conn=None
-    sockhandle=None      
+    sockhandle=None
     time.sleep(5)