X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=track-presence.py;h=03b14471f38ecfab8de6c45ac25fed85fe206f43;hb=23bca293edd1f88e9bed2930e216ee4d0c38bcb0;hp=f9bdaa4bd36402fece6eb8cfb0ce7ffb70affe9b;hpb=809aab82431c85f2f73f32c5f1f0747ef636f06f;p=svn42.git

diff --git a/track-presence.py b/track-presence.py
index f9bdaa4..03b1447 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -51,6 +51,7 @@ class UWSConfig:
     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','num_movements_req_on_nonpresence_until_present',"3")
     self.config_parser.set('tracker','server_socket',"/var/run/tuer/presence.socket")
     self.config_parser.set('tracker','photo_flashlight',"1020")
     self.config_parser.set('tracker','photo_artif_light',"970")
@@ -149,9 +150,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 +214,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:
@@ -306,6 +307,7 @@ class StatusTracker: #(threading.Thread):
     #timer
     self.timer=None
     self.timer_timeout=0
+    self.num_movements_during_nonpresences = 0
     
   def doorOpen(self,who,how):
     self.uwscfg.checkConfigUpdates()
@@ -387,24 +389,39 @@ class StatusTracker: #(threading.Thread):
   
   def somebodyPresent(self):
     with self.lock:
+      #door open:
       if self.door_open:
+        self.num_movements_during_nonpresences = 0
         if self.door_physically_present:
           return True
         elif self.last_movement_unixts > self.last_door_operation_unixts:
           return True
         else:
           return False
-      elif self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch):
-        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch))
-        return self.last_somebody_present_result
+      # door closed:
+      # door not closed from inside, but with card/phone .. check again in ...
       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.num_movements_during_nonpresences = 0
         self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
+        return self.last_somebody_present_result      
+      # door closed from inside, stay on last status ....
+      elif self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch):
+        self.num_movements_during_nonpresences = 0
+        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch))
         return self.last_somebody_present_result
+      # door closed from inside and movement detected around that time
       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):
+        self.num_movements_during_nonpresences = 0
         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
+      ##door was closed and nobody here But movement is dedected:
+      #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):
+      #  self.num_movements_during_nonpresences += 1
+      #  if self.num_movements_during_nonpresences >= int(self.uwscfg.tracker_num_movements_req_on_nonpresence_until_present):
+      #    return True
+      #  else:
+      #    return False
       else:
+        self.num_movements_during_nonpresences = 0
         return False
  
   def getPossibleWarning(self):