projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doku for yamaha ir codes
[svn42.git]
/
track-presence.py
diff --git
a/track-presence.py
b/track-presence.py
index
789a75c
..
891ccf7
100755
(executable)
--- a/
track-presence.py
+++ b/
track-presence.py
@@
-178,7
+178,8
@@
def trackSensorStatusThread(uwscfg,status_tracker,connection_listener):
if len(line) < 1:
raise Exception("EOF on Subprocess, daemon seems to have quit, returncode: %d",sshp.returncode)
logging.debug("trackSensorStatusThread: Got Line: " + line)
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()
m = RE_MOVEMENT.match(line)
if not m is None:
status_tracker.movementDetected()
@@
-312,7
+313,7
@@
class StatusTracker: #(threading.Thread):
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
+ self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
@@
-320,6
+321,7
@@
class StatusTracker: #(threading.Thread):
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
+ logging.debug("doorOpen: open: %s, who: %s, how: %s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present));
def doorClosed(self,who,how):
self.uwscfg.checkConfigUpdates()
def doorClosed(self,who,how):
self.uwscfg.checkConfigUpdates()
@@
-328,7
+330,7
@@
class StatusTracker: #(threading.Thread):
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
+ self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
@@
-336,6
+338,8
@@
class StatusTracker: #(threading.Thread):
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
+ logging.debug("doorClosed: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present));
+
def movementDetected(self):
self.uwscfg.checkConfigUpdates()
def movementDetected(self):
self.uwscfg.checkConfigUpdates()