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
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:
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()
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()