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

diff --git a/track-presence.py b/track-presence.py
index 0b25f32..716b34c 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -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:
@@ -317,11 +317,7 @@ class StatusTracker: #(threading.Thread):
       self.updateWhoMightBeHere(who)
       self.lock.acquire()
       self.door_manual_switch_used=(who is None or len(who) == 0)
-      if how is None:
-        #propably used tuerctl remote interface
-        self.door_physically_present = False
-      else:
-        self.door_physically_present=(self.door_manual_switch_used or how.startswith("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()
@@ -341,11 +337,7 @@ class StatusTracker: #(threading.Thread):
       self.updateWhoMightBeHere(who)
       self.lock.acquire()
       self.door_manual_switch_used=(who is None or len(who) == 0)
-      if how is None:
-        #propably used tuerctl remote interface
-        self.door_physically_present = False
-      else:
-        self.door_physically_present=(self.door_manual_switch_used or how.startswith("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()