self.config_parser.set('sensors','remote_socket',"/var/run/powersensordaemon/cmd.sock")
self.config_parser.set('sensors','remote_shell',"usocket")
self.config_parser.add_section('tracker')
- self.config_parser.set('tracker','sec_necessary_to_move_through_door',"10.0")
+ self.config_parser.set('tracker','sec_wait_after_close_using_cardphone',"4.2")
+ self.config_parser.set('tracker','sec_wait_for_movement_before_warning',"60")
+ 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',"950")
- self.config_parser.set('tracker','photo_artif_light',"150")
+ self.config_parser.set('tracker','photo_flashlight',"1020")
+ self.config_parser.set('tracker','photo_artif_light',"970")
self.config_parser.add_section('debug')
self.config_parser.set('debug','enabled',"False")
self.config_mtime=0
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
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()
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: (closed|opened), (opening|waiting|closing|idle), (ajar|shut).*',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()
with door_socklock:
m = RE_STATUS.match(line)
if not m is None:
- status = m.group(1)
- if status == "opened":
- status_tracker.doorOpen(last_who, last_how)
- if status == "closed":
- status_tracker.doorClosed(last_who, last_how)
- last_who = None
- last_how = None
+ (status, current_operation, ajar_status) = m.group(1,2,3)
+ #REALLY: doorOpen/Closed should be called before doorLocked/Unlocked
+ if ajar_status == "ajar":
+ status_tracker.doorOpen()
+ else:
+ status_tracker.doorClosed()
+ if current_operation == "idle":
+ if status == "opened":
+ status_tracker.doorUnlocked(last_who, last_how)
+ if status == "closed":
+ status_tracker.doorLocked(last_who, last_how)
+ last_who = None
+ last_how = None
continue
m = RE_REQUEST.match(line)
if not m is None:
self.uwscfg=uwscfg
self.status_change_handler = None
#State locked by self.lock
- self.door_open_previously=None
- self.door_open=False
+ 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.last_movement_unixts=0
self.last_light_value=0
self.last_light_unixts=0
- self.lock=threading.Lock()
+ self.lock=threading.RLock()
#Notify State locked by self.presence_notify_lock
self.last_somebody_present_result=False
self.last_warning=None
self.count_same_warning=0
- self.presence_notify_lock=threading.Lock()
+ self.who_might_be_here=None
+ self.presence_notify_lock=threading.RLock()
#timer
self.timer=None
-
- def doorOpen(self,who,how):
+ self.timer_timeout=0
+ self.num_movements_during_nonpresences = 0
+
+ def doorOpen(self):
+ logging.debug("doorOpen()")
+ self.door_closed=False
+ #future other stuff
+
+ def doorClosed(self):
+ logging.debug("doorClosed()")
+ self.door_closed=True
+ #future other stuff
+
+ def doorUnlocked(self,who,how):
self.uwscfg.checkConfigUpdates()
self.lock.acquire()
- self.door_open=True
- if self.door_open != self.door_open_previously:
+ self.door_unlocked=True
+ self.door_closed=True
+ if self.door_unlocked != self.door_unlocked_previously:
self.door_who=who
+ self.lock.release()
+ self.updateWhoMightBeHere(who)
+ self.lock.acquire()
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
- if not self.door_open_previously is None:
+ self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
+ if not self.door_unlocked_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
self.checkPresenceStateChangeAndNotify()
self.lock.acquire()
- self.door_open_previously = self.door_open
+ self.door_unlocked_previously = self.door_unlocked
self.lock.release()
+ logging.debug("doorUnlocked: open: %s, who: %s, how: %s, manual_switch: %s; physically_present: %s" % (self.door_unlocked,self.door_who,how,self.door_manual_switch_used,self.door_physically_present))
- def doorClosed(self,who,how):
+ def doorLocked(self,who,how):
self.uwscfg.checkConfigUpdates()
self.lock.acquire()
- self.door_open=False
- if self.door_open != self.door_open_previously:
+ self.door_unlocked=False
+ if self.door_unlocked != self.door_unlocked_previously:
self.door_who=who
+ self.lock.release()
+ self.updateWhoMightBeHere(who)
+ self.lock.acquire()
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
- if not self.door_open_previously is None:
+ self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
+ if not self.door_unlocked_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
self.checkPresenceStateChangeAndNotify()
self.lock.acquire()
- self.door_open_previously = self.door_open
+ self.door_unlocked_previously = self.door_unlocked
self.lock.release()
+ logging.debug("doorLocked: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_unlocked,self.door_who,how,self.door_manual_switch_used,self.door_physically_present))
def movementDetected(self):
self.uwscfg.checkConfigUpdates()
self.lock.acquire()
self.last_movement_unixts=time.time()
self.lock.release()
+ #FIXME: QUICKFIX ignore movement
+ return
self.checkPresenceStateChangeAndNotify()
def currentLightLevel(self, value):
self.uwscfg.checkConfigUpdates()
self.last_light_unixts=time.time()
- self.last_light_value=value;
+ self.last_light_value=value
self.checkPresenceStateChangeAndNotify()
def checkLight(self, somebody_present=None):
else:
return "Light: off"
-
def checkAgainIn(self, sec):
- #~ if not self.timer is None:
- #~ logging.debug("checkAgainIn: canceled previous running Timer")
- #~ self.timer.cancel()
- logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
- self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
- self.timer.start()
+ if sec <= 0.0:
+ return
+ if self.timer_timeout < time.time():
+ logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
+ self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
+ self.timer.start()
+ self.timer_timeout = time.time() + sec
+ else:
+ logging.debug("checkAgainIn: not starting timer, already one scheduled in %fs" % (time.time() - self.timer_timeout))
- #TODO: check brightness level from cam or an arduino sensor
def somebodyPresent(self):
with self.lock:
- if self.door_open:
+ #door unlocked:
+ if self.door_unlocked:
+ 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:
return False
- elif time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
- #start timer, checkPresenceStateChangeAndNotify after tracker_sec_wait_movement
- self.checkAgainIn(float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
- return self.last_somebody_present_result
- elif self.last_movement_unixts > self.last_door_operation_unixts and (self.door_manual_switch_used or ( time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout))):
+ # door locked but still ajar:
+ elif self.door_closed == False: #and elf.door_unlocked == False
+ return True
+ # door not locked 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 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
+ # 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):
with self.lock:
somebody_present=self.last_somebody_present_result
- if self.door_open and not somebody_present and time.time() - self.last_door_operation_unixts >= 2* float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
- return "Door opened recently but nobody present"
- elif self.door_open and not somebody_present:
- self.checkAgainIn(2*float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
+ 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 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
- elif not somebody_present and self.last_light_unixts > self.last_door_operation_unixts and self.last_light_value > int(self.uwscfg.tracker_photo_artif_light):
- return "Nobody here but light is still on"
+# elif not somebody_present and self.last_light_unixts > self.last_door_operation_unixts and self.last_light_value > int(self.uwscfg.tracker_photo_artif_light):
+#return "Nobody here but light is still on"
else:
return None
+ def updateWhoMightBeHere(self, who):
+ with self.presence_notify_lock:
+ self.who_might_be_here = who
+
+ def forgetWhoMightBeHere(self, somebody_present):
+ with self.presence_notify_lock:
+ if not somebody_present:
+ self.who_might_be_here = None
+
def checkPresenceStateChangeAndNotify(self):
+ #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_open=%s, who=%s, light=%s" % (somebody_present,self.door_open,self.door_who, 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:
- self.status_change_handler(somebody_present, door_open=self.door_open, who=self.door_who)
+ self.status_change_handler(somebody_present, door_open=self.door_unlocked, who=self.who_might_be_here)
+ self.forgetWhoMightBeHere(somebody_present)
warning = self.getPossibleWarning()
if warning == self.last_warning:
self.count_same_warning+=1
if not warning is None and self.count_same_warning < 3:
logging.debug("checkPresenceStateChangeAndNotify: warning: " + str(warning))
if not self.status_change_handler is None:
- self.status_change_handler(somebody_present=None, door_open=self.door_open, who=self.door_who, warning=warning)
-
+ self.status_change_handler(somebody_present=None, door_open=self.door_unlocked, who=self.who_might_be_here, warning=warning)
############ Connection Listener ############
class ConnectionListener:
projects / svn42.git / blobdiff