X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=track-presence.py;h=716b34cdc189e8bf08fb4567f39a98b186060318;hb=0515535ca45f18e584c4748d34e942f5d7b7d048;hp=91b01239cdb1e794dee446417bd4545707c16edf;hpb=c1d893877efb1c5edd24dbd5bb8fc41379c01ebf;p=svn42.git

diff --git a/track-presence.py b/track-presence.py
index 91b0123..716b34c 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -47,9 +47,9 @@ class UWSConfig:
     self.config_parser.set('sensors','remote_shell',"usocket")
     self.config_parser.add_section('tracker')
     self.config_parser.set('tracker','sec_wait_after_close_using_cardphone',"4.2")
-    self.config_parser.set('tracker','sec_wait_for_movement_before_warning',"30")
-    self.config_parser.set('tracker','sec_wait_after_close_using_manualswitch',"25.0")
-    self.config_parser.set('tracker','sec_movement_before_manual_switch',"-1.0")  #neg duration means: movement has to occur _after_ door was closed manually
+    self.config_parser.set('tracker','sec_wait_for_movement_before_warning',"60")
+    self.config_parser.set('tracker','sec_wait_after_close_using_manualswitch',"22.0")
+    self.config_parser.set('tracker','sec_movement_before_manual_switch',"-3.0")  #neg duration means: movement has to occur _after_ door was closed manually
     self.config_parser.set('tracker','sec_general_movement_timeout',"3600")
     self.config_parser.set('tracker','server_socket',"/var/run/tuer/presence.socket")
     self.config_parser.set('tracker','photo_flashlight',"1020")
@@ -149,9 +149,9 @@ threads_running=True
 def trackSensorStatusThread(uwscfg,status_tracker,connection_listener):
   global sshp, threads_running
   #RE_TEMP = re.compile(r'temp\d: (\d+\.\d+)')
-  RE_PHOTO = re.compile(r'photo\d: [^0-9]*?(\d+)')
-  RE_MOVEMENT = re.compile(r'movement|button\d?|PanicButton')
-  RE_ERROR = re.compile(r'Error: (.+)')
+  RE_PHOTO = re.compile(r'photo\d: [^0-9]*?(\d+)',re.I)
+  RE_MOVEMENT = re.compile(r'movement|button\d?|PanicButton',re.I)
+  RE_ERROR = re.compile(r'Error: (.+)',re.I)
   while threads_running:
     uwscfg.checkConfigUpdates()
     sshp = None
@@ -213,9 +213,9 @@ door_socklock=threading.Lock()
 def trackDoorStatusThread(uwscfg, status_tracker,connection_listener):
   global door_sockhandle, door_socklock, threads_running
   #socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well)
-  RE_STATUS = re.compile(r'Status: (\w+), idle')
-  RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)')
-  RE_ERROR = re.compile(r'Error: (.+)')
+  RE_STATUS = re.compile(r'Status: (\w+), idle',re.I)
+  RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)',re.I)
+  RE_ERROR = re.compile(r'Error: (.+)',re.I)
   while threads_running:
     uwscfg.checkConfigUpdates()
     with door_socklock:
@@ -296,12 +296,13 @@ class StatusTracker: #(threading.Thread):
     self.last_movement_unixts=0
     self.last_light_value=0
     self.last_light_unixts=0
-    self.lock=threading.Lock()
+    self.lock=threading.RLock()
     #Notify State locked by self.presence_notify_lock
     self.last_somebody_present_result=False
     self.last_warning=None
     self.count_same_warning=0
-    self.presence_notify_lock=threading.Lock()
+    self.who_might_be_here=None
+    self.presence_notify_lock=threading.RLock()
     #timer
     self.timer=None
     self.timer_timeout=0
@@ -312,8 +313,11 @@ class StatusTracker: #(threading.Thread):
     self.door_open=True
     if self.door_open != self.door_open_previously:
       self.door_who=who
+      self.lock.release()
+      self.updateWhoMightBeHere(who)
+      self.lock.acquire()
       self.door_manual_switch_used=(who is None or len(who) == 0)
-      self.door_physically_present=(self.door_manual_switch_used or how == "Card")      
+      self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
       if not self.door_open_previously is None:
         self.last_door_operation_unixts=time.time()
       self.lock.release()
@@ -321,7 +325,7 @@ class StatusTracker: #(threading.Thread):
       self.lock.acquire()
       self.door_open_previously = self.door_open
     self.lock.release()
-    loggin.debug("doorOpen: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_manual_switch_used));
+    logging.debug("doorOpen: open: %s, who: %s, how: %s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present))
     
   def doorClosed(self,who,how):
     self.uwscfg.checkConfigUpdates()
@@ -329,8 +333,11 @@ class StatusTracker: #(threading.Thread):
     self.door_open=False
     if self.door_open != self.door_open_previously:
       self.door_who=who
+      self.lock.release()
+      self.updateWhoMightBeHere(who)
+      self.lock.acquire()
       self.door_manual_switch_used=(who is None or len(who) == 0)
-      self.door_physically_present=(self.door_manual_switch_used or how == "Card")      
+      self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
       if not self.door_open_previously is None:
         self.last_door_operation_unixts=time.time()
       self.lock.release()
@@ -338,6 +345,7 @@ class StatusTracker: #(threading.Thread):
       self.lock.acquire()
       self.door_open_previously = self.door_open
     self.lock.release()
+    logging.debug("doorClosed: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present))
 
   def movementDetected(self):
     self.uwscfg.checkConfigUpdates()
@@ -349,7 +357,7 @@ class StatusTracker: #(threading.Thread):
   def currentLightLevel(self, value):
     self.uwscfg.checkConfigUpdates()
     self.last_light_unixts=time.time()
-    self.last_light_value=value;
+    self.last_light_value=value
     self.checkPresenceStateChangeAndNotify()
   
   def checkLight(self, somebody_present=None):
@@ -366,8 +374,9 @@ class StatusTracker: #(threading.Thread):
     else:
       return "Light: off"
 
-
   def checkAgainIn(self, sec):
+    if sec <= 0.0:
+        return
     if self.timer_timeout < time.time():
       logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
       self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
@@ -391,7 +400,7 @@ class StatusTracker: #(threading.Thread):
       elif not self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone):
         self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
         return self.last_somebody_present_result
-      elif self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch) and self.door_manual_switch_used:
+      elif self.door_manual_switch_used and self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch):
         return True
       elif self.last_movement_unixts > self.last_door_operation_unixts and time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout):
         return True
@@ -411,14 +420,25 @@ class StatusTracker: #(threading.Thread):
       else:
         return None
  
+  def updateWhoMightBeHere(self, who):
+    with self.presence_notify_lock:
+      self.who_might_be_here = who
+
+  def forgetWhoMightBeHere(self, somebody_present):
+    with self.presence_notify_lock:
+      if not somebody_present:
+        self.who_might_be_here = None
+
   def checkPresenceStateChangeAndNotify(self):
+    #no acquiring of self.lock, "just" reading. chance wrong reads in favour of avoiding race conditions (is python var _read_ threadsafe ?)
     with self.presence_notify_lock:
       somebody_present = self.somebodyPresent()
-      logging.debug("checkPresenceStateChangeAndNotify: somebody_present=%s, door_open=%s, who=%s, light=%s" % (somebody_present,self.door_open,self.door_who, str(self.last_light_value)))
+      logging.debug("checkPresenceStateChangeAndNotify: somebody_present=%s, door_open=%s, door_who=%s, who=%s, light=%s" % (somebody_present,self.door_open,self.door_who,self.who_might_be_here, str(self.last_light_value)))
       if somebody_present != self.last_somebody_present_result:
         self.last_somebody_present_result = somebody_present
         if not self.status_change_handler is None:
-          self.status_change_handler(somebody_present, door_open=self.door_open, who=self.door_who)
+          self.status_change_handler(somebody_present, door_open=self.door_open, who=self.who_might_be_here)
+        self.forgetWhoMightBeHere(somebody_present)
       warning = self.getPossibleWarning()
       if warning == self.last_warning:
         self.count_same_warning+=1
@@ -428,8 +448,7 @@ class StatusTracker: #(threading.Thread):
       if not warning is None and self.count_same_warning < 3:
         logging.debug("checkPresenceStateChangeAndNotify: warning: " + str(warning))
         if not self.status_change_handler is None:
-          self.status_change_handler(somebody_present=None, door_open=self.door_open, who=self.door_who, warning=warning)
-        
+          self.status_change_handler(somebody_present=None, door_open=self.door_open, who=self.who_might_be_here, warning=warning)
  
 ############ Connection Listener ############
 class ConnectionListener: