Updates to 1.0.5

mlamoure · Aug 19, 2017 · 79facab · 79facab
1 parent 3dbc795
commit 79facab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/August Home.indigoPlugin/Contents/Info.plist b/August Home.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>ServerApiVersion</key>
 	<string>2.0</string>
 	<key>IwsApiVersion</key>

diff --git a/August Home.indigoPlugin/Contents/Server Plugin/Events.xml b/August Home.indigoPlugin/Contents/Server Plugin/Events.xml
@@ -69,7 +69,7 @@
         <Name>Lock or Unlock by a unknown person</Name>
   		<ConfigUI>
 		<Field type="menu" id="lockUnlock" defaultValue="unlocked">
-			<Label>Popup Menu:</Label>
+			<Label>Lock Status:</Label>
 			<List>
 				<Option value="lock">Locked</Option>
 				<Option value="unlock">Unlocked</Option>

diff --git a/August Home.indigoPlugin/Contents/Server Plugin/plugin.py b/August Home.indigoPlugin/Contents/Server Plugin/plugin.py
@@ -850,6 +850,7 @@ def update_all_from_august_activity_log(self):
 									except ValueError:
 										lastSentIndigoUpdateTime = None
 
+									# IDENTIFY ACTIONS IN THE ACTIVITY LOG THAT CAME FROM INDIGO TO AVOID REDUNDANT PROCESSING
 									if lastSentIndigoUpdateTime is not None:
 										if activityItem.via == "via August App Remotely":
 											if activityItem.dateTime - datetime.timedelta(seconds = ACTIVITY_MATCHING_THRESHOLD) <= lastSentIndigoUpdateTime <= activityItem.dateTime + datetime.timedelta(seconds = ACTIVITY_MATCHING_THRESHOLD):
@@ -898,7 +899,7 @@ def update_all_from_august_activity_log(self):
 								self.logger.debug("Checking if trigger: \"" + trigger.name + "\" has occured. Max latency: " + str(trigger.pluginProps["maxLatency"]) + ", Event delta: " + str(delta_time.total_seconds()))
 								if int(delta_time.total_seconds()) <= int(trigger.pluginProps["maxLatency"]):
 									if trigger.pluginProps["lockUnlock"] == activityItem.action or trigger.pluginProps["lockUnlock"] == "any":
-											if activityItem.callingUser == "Unknown User" and trigger.id == "lockByUnknownPerson":
+											if activityItem.callingUser == "Unknown User" or activityItem.callingUser == "manually":
 												indigo.trigger.execute(trigger)
 
 							self.logger.debug("Completed processing lock triggers")

diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ In addition to the August Lock, you will need either a August Doorbell or August
 | Event                | Description                                                                                                                                                                                                                  |
 |:---------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | doorbell_motion_detected       | Event that fires when a motion_detected, or call_missed.  Requires a doorbell bridge for these events to occur.                                                                                       |
-| lockByPerson       | Event that can trigger upon a lock or unlock event by a known person.  Options are available to exclude remote methods (HomeKid, August App Remote).  Note that HomeKit is not possible to decipher if the user was on the local network or remote.                                                                                       |
-| lockByUnknownPerson       | Event that can trigger upon a lock or unlock event by a known person.                                                                                       |
+| lockByPerson       | Event that can trigger upon a lock or unlock event by a known person.  Options are available to include remote methods (HomeKit, August App Remote).  Note that HomeKit is not possible to decipher if the user was on the local network or remote.                                                                                       |
+| lockByUnknownPerson       | Event that can trigger upon a lock or unlock event by a unknown person.  This will include manual unlocks.                                                                                       |
 | invalidCode       | Event that can trigger when a invalid key code is entered.  Requires the August Keypad.                                                                                       |
 
 # States #