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: (closed|opened), (opening|waiting|closing|idle), (ajar|shut).*',re.I)
- RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)',re.I)
+ RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone|SSH|ssh) )?(.+)',re.I)
RE_ERROR = re.compile(r'Error: (.+)',re.I)
while threads_running:
uwscfg.checkConfigUpdates()
#State locked by self.lock
self.door_unlocked_previously=None
self.door_unlocked=False
+ self.door_closed=True
self.door_manual_switch_used=False
self.door_physically_present=True
self.door_who=None
self.lock.acquire()
self.last_movement_unixts=time.time()
self.lock.release()
+ #FIXME: QUICKFIX ignore movement
+ return
self.checkPresenceStateChangeAndNotify()
def currentLightLevel(self, value):
self.num_movements_during_nonpresences = 0
if self.door_physically_present:
return True
+ #door is ajar and unlocked then we are here for sure:
+ elif self.door_closed == False:
+ return True
elif self.last_movement_unixts > self.last_door_operation_unixts:
return True
else:
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 locked 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 locked 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
+ # door locked from inside, and door not ajar
+ elif self.door_manual_switch_used and self.door_closed:
return True
+# # door locked 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 locked 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
##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
def getPossibleWarning(self):
with self.lock:
somebody_present=self.last_somebody_present_result
- if not self.door_unlocked and not somebody_present and self.door_open:
- return "Nobody here and door locked but still ajar !"
+ if not somebody_present and not self.door_closed:
+ return "Nobody here but door ajar !"
elif self.door_unlocked and not somebody_present and time.time() - self.last_door_operation_unixts >= float(self.uwscfg.tracker_sec_wait_for_movement_before_warning):
- return "Door opened recently but nobody present"
+ return "Door unlocked recently but nobody present"
elif self.door_unlocked and not somebody_present:
self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_for_movement_before_warning))
return None
#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_locked=%s, door_ajar=%s, door_who=%s, who=%s, light=%s" % (somebody_present,not self.door_unlocked, self.door_open, self.door_who,self.who_might_be_here, str(self.last_light_value)))
+ logging.debug("checkPresenceStateChangeAndNotify: somebody_present=%s, door_locked=%s, door_ajar=%s, door_who=%s, who=%s, light=%s" % (somebody_present,not self.door_unlocked, not self.door_closed, 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: