X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=track-presence.py;h=012b222a773026df6fc0cf46b84c38bf4fc91443;hb=a8262dc8575deeac26e4d19a33ee12841d2e9a78;hp=789a75c288cec61a95c0ce6b5d02af734f6676d5;hpb=1ab7e81c6564755b2d3d5f5d446470934659b97e;p=svn42.git

diff --git a/track-presence.py b/track-presence.py
index 789a75c..012b222 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -178,7 +178,8 @@ def trackSensorStatusThread(uwscfg,status_tracker,connection_listener):
         if len(line) < 1:
           raise Exception("EOF on Subprocess, daemon seems to have quit, returncode: %d",sshp.returncode)
         logging.debug("trackSensorStatusThread: Got Line: " + line)
-        connection_listener.distributeData(line)
+        if not line.startswith("Warning: Permanently added"):
+          connection_listener.distributeData(line)
         m = RE_MOVEMENT.match(line)
         if not m is None:
           status_tracker.movementDetected()
@@ -312,7 +313,7 @@ class StatusTracker: #(threading.Thread):
     if self.door_open != self.door_open_previously:
       self.door_who=who
       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 how.startswith("Card"))
       if not self.door_open_previously is None:
         self.last_door_operation_unixts=time.time()
       self.lock.release()
@@ -320,6 +321,7 @@ class StatusTracker: #(threading.Thread):
       self.lock.acquire()
       self.door_open_previously = self.door_open
     self.lock.release()
+    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()
@@ -328,7 +330,7 @@ class StatusTracker: #(threading.Thread):
     if self.door_open != self.door_open_previously:
       self.door_who=who
       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 how.startswith("Card"))
       if not self.door_open_previously is None:
         self.last_door_operation_unixts=time.time()
       self.lock.release()
@@ -336,6 +338,8 @@ 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()
@@ -389,7 +393,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