From: Bernhard Tittelbach <xro@realraum.at>
Date: Thu, 2 Dec 2010 19:47:14 +0000 (+0000)
Subject: --bug, physically present was not set on manual open/close -> light
X-Git-Url: https://git.realraum.at/?p=svn42.git;a=commitdiff_plain;h=809aab82431c85f2f73f32c5f1f0747ef636f06f

--bug, physically present was not set on manual open/close -> light
turned off on pyhsical open
---

diff --git a/track-presence.py b/track-presence.py
index 0b25f32..f9bdaa4 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -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()